openstack
/
murano
Code Issues Proposed changes

Refactor 'wait_for_environment_deploy' function 

This commit deletes wait_for_environment_deploy function from scenario base
and replaces it with the similar function, declared in utils.

Change-Id: I59216bf728dba154534cec8af31f60ea9a9cdac1
This commit is contained in:
Aleksandr Kholkin 2016-08-08 16:40:00 +03:00
parent f85313b368
commit 8501b1872b
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
murano_tempest_tests/tests/scenario/application_catalog/base.py
View File

@ -202,26 +202,17 @@ class BaseApplicationCatalogScenarioTest(base.BaseTestCase):
def deploy_environment(self, environment, session):
self.application_catalog_client.deploy_session(environment['id'],
session['id'])
return self.wait_for_environment_deploy(environment)
def wait_for_environment_deploy(self, environment):
start_time = time.time()
status = self.application_catalog_client.\
get_environment(environment['id'])['status']
while status != 'ready':
status = self.application_catalog_client.\
get_environment(environment['id'])['status']
if time.time() - start_time > 1800:
time.sleep(60)
self.fail(
'Environment deployment is not finished in 1200 seconds')
elif status == 'deploy failure':
time.sleep(60)
self.fail('Environment has incorrect status {0}'.
format(status))
time.sleep(5)
return self.application_catalog_client.\
get_environment(environment['id'])
timeout = 1800
deployed_env = utils.wait_for_environment_deploy(environment,
timeout=timeout)
if deployed_env['status'] == 'ready':
return deployed_env
elif deployed_env['status'] == 'deploying':
self.fail('Environment deployment is not finished in {} seconds'.
format(timeout))
else:
self.fail('Environment has status {}'.format(
deployed_env['status']))
def status_check(self, environment_id, configurations):
for configuration in configurations: