openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Add new check for Operational cluster status" into stable/mitaka

This commit is contained in:
Jenkins 2016-06-07 15:36:21 +00:00 committed by Gerrit Code Review
parent 5abded7ddd df64355611
commit 38ec74630e
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fuelweb_test/models/fuel_web_client.py
View File

@ -881,7 +881,8 @@ class FuelWebClient(object):
@custom_repo
def deploy_cluster_wait(self, cluster_id, is_feature=False,
timeout=help_data.DEPLOYMENT_TIMEOUT, interval=30,
check_services=True, check_tasks=False):
check_services=True, check_tasks=False,
allow_partially_deploy=False):
warn_txt = ('Temporary: flag check_tasks is set to False, '
'until bugs LP#1578218 and LP#1578257 fixed')
logger.warning(warn_txt)
@ -893,6 +894,7 @@ class FuelWebClient(object):
logger.info('Deploy cluster %s', cluster_id)
task = self.deploy_cluster(cluster_id)
self.assert_task_success(task, interval=interval, timeout=timeout)
self.check_cluster_status(cluster_id, allow_partially_deploy)
self.check_deploy_state(cluster_id, check_services, check_tasks)
return
@ -905,11 +907,26 @@ class FuelWebClient(object):
cluster_id, str(retry_number + 1))
task = self.client.deploy_nodes(cluster_id)
self.assert_task_success(task, timeout=timeout, interval=interval)
self.check_cluster_status(cluster_id, allow_partially_deploy)
self.check_deploy_state(cluster_id, check_services, check_tasks)
self.check_cluster_settings(cluster_id, cluster_attributes)
self.check_network_settings(cluster_id, network_settings)
self.check_deployment_info_save_for_task(cluster_id)
def check_cluster_status(self, cluster_id, allow_partially_deploy):
cluster_info = self.client.get_cluster(cluster_id)
cluster_status = cluster_info['status']
error_msg = \
"Cluster is not deployed: some nodes are in the Error state"
check = 'operational' in cluster_status
if not check and allow_partially_deploy:
logger.warning(error_msg)
elif not check:
assert_true(check, error_msg)
else:
logger.info("Cluster with id {} is in Operational state".format(
cluster_id))
@logwrap
def check_cluster_settings(self, cluster_id, cluster_attributes):
task_id = self.get_last_task_id(cluster_id, 'deployment')