x/cloudpulse
Code Issues Proposed changes

Handle ceph status in luminous

Browse Source 
Change-Id: I824f3f5428e3ba5fc8fb009a0a75e46156975693
This commit is contained in:
Sawan Choudhary 2019-01-21 13:03:13 +00:00 committed by Vinod Pandarinathan
parent 90483be222
commit ad505fe112
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,16 @@ class operator_scenario(base.Scenario):
ceph_str = ceph_data[3].replace(' (stdout) ', '') \ ceph_str = ceph_data[3].replace(' (stdout) ', '') \
.replace('\\n', '') .replace('\\n', '')
ceph_json = simplejson.loads(ceph_str) ceph_json = simplejson.loads(ceph_str)
overall_status = ceph_json['health']['overall_status']
# Handle ceph status in luminous, result should be picked form
# 'status' instead of 'overall_status'
if len(ceph_json['health']['summary']) and \
'summary' in ceph_json['health']['summary'][0].keys() \
and 'mon health preluminous compat warning' in \
ceph_json['health']['summary'][0]['summary']:
overall_status = ceph_json['health']['status']
else:
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': if overall_status == 'HEALTH_OK':