openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Add json method for return methods in configdb smoke test. Status code 308 was added to the redirects for keystone session."

This commit is contained in:
Jenkins 2016-08-08 13:26:43 +00:00 committed by Gerrit Code Review
parent 42192c36cc 48268dbbd7
commit 91cc55c2de
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuelweb_test/helpers/common.py
View File

@ -46,6 +46,12 @@ from fuelweb_test.settings import PATH_TO_CERT
from fuelweb_test.settings import VERIFY_SSL
KeystoneSession._REDIRECT_STATUSES =\
KeystoneSession._REDIRECT_STATUSES + (308, )
logger.info("Temprary solution for keystone session class, bug: #1610914."
"Status code 308 was added to the tuple redirects")
class Common(object):
"""Common.""" # TODO documentation

8
fuelweb_test/models/nailgun_client.py
View File

@ -839,6 +839,7 @@ class NailgunClient(object):
'{env_id}/resources/{resource}' \
'/values'.format(env_id=env_id, resource=resource_id)
endpoint = endpoint + '?effective' if effective else endpoint
return self._get(endpoint).json()
@logwrap
@ -855,7 +856,8 @@ class NailgunClient(object):
'{env_id}/resources/{resource}' \
'/values'.format(env_id=env_id, resource=resource_name)
endpoint = endpoint + '?effective' if effective else endpoint
return self._get(endpoint)
return self._get(endpoint).json()
@logwrap
def put_global_resource_value(self, env_id, resource, data):
@ -900,7 +902,7 @@ class NailgunClient(object):
node_id=node_id)
endpoint = endpoint + '?effective' if effective else endpoint
return self._get(endpoint)
return self._get(endpoint).json()
@logwrap
def get_node_resource_name_value(self, env_id, resource_name, node_id,
@ -919,7 +921,7 @@ class NailgunClient(object):
node_id=node_id)
endpoint = endpoint + '?effective' if effective else endpoint
return self._get(endpoint)
return self._get(endpoint).json()
@logwrap
def put_node_resource_value(self, env_id, resource, node_id, data):