x/cloudpulse
Code Issues Proposed changes

Adding tag 2015.2.3

Browse Source 
Change-Id: Iff5427532d180076a29b70e301cd1adfb876364d
This commit is contained in:
Anand Shanmugam
2015-09-29 14:57:09 -07:00
parent a3816f496f
commit 32af817131
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cloudpulse/scenario/plugins/operator_tests/operator.py
View File

@@ -86,10 +86,28 @@ class operator_scenario(base.Scenario):
node_status = res['contacted'][ node_status = res['contacted'][
res['contacted'].keys()[0]]['stdout'] res['contacted'].keys()[0]]['stdout']
node_status_string = node_status.replace('\n', '') node_status_string = node_status.replace('\n', '')
nodes = []
running_nodes = []
mathobj = re.search( mathobj = re.search(
r'running_nodes,(.*?)}', node_status_string, re.M | re.I) r'nodes,\[{disc,\[(.*?)\]', node_status_string, re.M | re.I)
nodes = mathobj.group(1) if mathobj:
return (200, "Active Nodes : %s" % nodes, 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']) ['RabbitMQ-server Running'])
else: else:
return (404, ("RabbitMQ-server test failed :%s" % return (404, ("RabbitMQ-server test failed :%s" %
@@ -140,8 +158,12 @@ class operator_scenario(base.Scenario):
overall_status = ceph_json['health']['overall_status'] overall_status = ceph_json['health']['overall_status']
num_of_osd = ceph_json['osdmap']['osdmap']['num_osds'] num_of_osd = ceph_json['osdmap']['osdmap']['num_osds']
num_up_osds = ceph_json['osdmap']['osdmap']['num_up_osds'] num_up_osds = ceph_json['osdmap']['osdmap']['num_up_osds']
if overall_status == 'HEALTH_OK':
return (200, "Overall Status = %s, Cluster status = %s/%s" % return (200, "Overall Status = %s, Cluster status = %s/%s" %
(overall_status, num_up_osds, num_of_osd)) (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: else:
return (404, ("Ceph cluster Test Failed: %s" % return (404, ("Ceph cluster Test Failed: %s" %
results['status_message']), []) results['status_message']), [])