From 32af81713160996e75635bc32112e1ca6bf8c6cd Mon Sep 17 00:00:00 2001 From: Anand Shanmugam Date: Tue, 29 Sep 2015 14:57:09 -0700 Subject: [PATCH] Adding tag 2015.2.3 Change-Id: Iff5427532d180076a29b70e301cd1adfb876364d --- .../plugins/operator_tests/operator.py | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/cloudpulse/scenario/plugins/operator_tests/operator.py b/cloudpulse/scenario/plugins/operator_tests/operator.py index 36fc33d..93239f1 100644 --- a/cloudpulse/scenario/plugins/operator_tests/operator.py +++ b/cloudpulse/scenario/plugins/operator_tests/operator.py @@ -86,11 +86,29 @@ class operator_scenario(base.Scenario): node_status = res['contacted'][ res['contacted'].keys()[0]]['stdout'] node_status_string = node_status.replace('\n', '') + + nodes = [] + running_nodes = [] mathobj = re.search( - r'running_nodes,(.*?)}', node_status_string, re.M | re.I) - nodes = mathobj.group(1) - return (200, "Active Nodes : %s" % nodes, - ['RabbitMQ-server Running']) + r'nodes,\[{disc,\[(.*?)\]', node_status_string, re.M | re.I) + if mathobj: + nodes = [x.rstrip("'").lstrip("'") + for x in mathobj.group(1).split(",")] + + mathobj = re.search( + r'running_nodes,\[(.*?)\]}', node_status_string, re.M | re.I) + + if mathobj: + running_nodes = [x.rstrip("'").lstrip("'") + for x in mathobj.group(1).split(",")] + + diffnodes = list(set(nodes) - set(running_nodes)) + if diffnodes: + return(404, ("Failed Nodes : %s" % + str(diffnodes))) + else: + return (200, "Running Nodes : %s" % str(nodes), + ['RabbitMQ-server Running']) else: return (404, ("RabbitMQ-server test failed :%s" % res['status_message']), []) @@ -140,8 +158,12 @@ class operator_scenario(base.Scenario): overall_status = ceph_json['health']['overall_status'] num_of_osd = ceph_json['osdmap']['osdmap']['num_osds'] num_up_osds = ceph_json['osdmap']['osdmap']['num_up_osds'] - return (200, "Overall Status = %s, Cluster status = %s/%s" % - (overall_status, num_up_osds, num_of_osd)) + if overall_status == 'HEALTH_OK': + return (200, "Overall Status = %s, Cluster status = %s/%s" % + (overall_status, num_up_osds, num_of_osd)) + else: + return (404, "Overall Status = %s, Cluster status = %s/%s" % + (overall_status, num_up_osds, num_of_osd)) else: return (404, ("Ceph cluster Test Failed: %s" % results['status_message']), [])