summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-18 14:56:42 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-26 19:02:04 +0200
commitb4ad10bea52cac7f2995fc5896318e6e5381588d (patch)
tree10ce10ad21e0406118963f85b38252aa9dfb14c8
parent113c307aa01460e21893901e6df10e3af5ffc705 (diff)
Force a GET operations on cloudify API
Cloudify is considered as running by the client but sometimes it failed when listing secrets right after. It adds that check in cloudify.py. Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/functest/core/singlevm.py", line 391, in run if not self.execute(): File "/usr/lib/python2.7/site-packages/functest/opnfv_tests/vnf/ims/cloudify_ims.py", line 119, in execute secrets_list = self.cfy_client.secrets.list() File "/usr/lib/python2.7/site-packages/cloudify_rest_client/secrets.py", line 113, in list response = self.api.get('/secrets', params=params) File "/usr/lib/python2.7/site-packages/cloudify_rest_client/client.py", line 252, in get timeout=timeout) File "/usr/lib/python2.7/site-packages/cloudify_rest_client/client.py", line 233, in do_request 'SSL, but the client does'.format(e) ConnectionError: ('Connection aborted.', BadStatusLine("''",)) Change-Id: Ie1b25ff529cfbf9f7476821499da369a46126e81 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c4c3a33b9e6ae87c15331bf95e5544f0f680e4f0)
-rw-r--r--functest/core/cloudify.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/functest/core/cloudify.py b/functest/core/cloudify.py
index 954491f6c..b048ed1d4 100644
--- a/functest/core/cloudify.py
+++ b/functest/core/cloudify.py
@@ -65,6 +65,8 @@ class Cloudify(singlevm.SingleVm2):
"The current manager status is %s", cfy_status)
if str(cfy_status) != 'running':
raise Exception("Cloudify Manager isn't up and running")
+ self.cfy_client.secrets.list()
+ self.__logger.debug("Secrets API successfully reached")
break
except Exception: # pylint: disable=broad-except
self.__logger.info(