From 48268dbbd7a5f3beb32f4bd3f0d395493be00b28 Mon Sep 17 00:00:00 2001 From: Mikhail Samoylov Date: Fri, 5 Aug 2016 12:39:11 +0300 Subject: [PATCH] Add json method for return methods in configdb smoke test. Status code 308 was added to the redirects for keystone session. Closes bug: #1609811 Related bug: #1610914 Change-Id: I38341e48f75c9408db7677d132e9436508cc5fc2 --- fuelweb_test/helpers/common.py | 6 ++++++ fuelweb_test/models/nailgun_client.py | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fuelweb_test/helpers/common.py b/fuelweb_test/helpers/common.py index dfbb0c0a8..0490b65dd 100644 --- a/fuelweb_test/helpers/common.py +++ b/fuelweb_test/helpers/common.py @@ -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 diff --git a/fuelweb_test/models/nailgun_client.py b/fuelweb_test/models/nailgun_client.py index 9865ba3cb..6a4d32798 100644 --- a/fuelweb_test/models/nailgun_client.py +++ b/fuelweb_test/models/nailgun_client.py @@ -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):