Hello Timothy Asir, Saggi Mizrahi, Aravinda VK, Dan Kenigsberg, Darshan N,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/23650
to review the following change.
Change subject: gluster: interpret and use correct xml elements
......................................................................
gluster: interpret and use correct xml elements
xml output of rebalance and remove-brick status returns filesSkipped
in <skipped> tag and value of <statusStr> tag cleaned up to use it as
proper enum.
Change-Id: I74d91d75950d5cdb61f4056e44474592dd0c9c67
Reviewed-on:
http://gerrit.ovirt.org/19674
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Signed-off-by: Bala.FA <barumuga(a)redhat.com>
---
M vdsm/gluster/cli.py
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/23650/1
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index e3f7c84..cba2062 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -641,27 +641,31 @@
else:
return
+ st = tree.find('aggregate/statusStr').text
+ statusStr = st.replace(' ', '_').replace('-', '_')
status = {
'summary': {
'runtime': tree.find('aggregate/runtime').text,
'filesScanned': tree.find('aggregate/lookups').text,
'filesMoved': tree.find('aggregate/files').text,
'filesFailed': tree.find('aggregate/failures').text,
- 'filesSkipped': tree.find('aggregate/failures').text,
+ 'filesSkipped': tree.find('aggregate/skipped').text,
'totalSizeMoved': tree.find('aggregate/size').text,
- 'status': tree.find('aggregate/statusStr').text.upper()},
+ 'status': statusStr.upper()},
'hosts': []}
for el in tree.findall('node'):
+ st = el.find('statusStr').text
+ statusStr = st.replace(' ', '_').replace('-',
'_')
status['hosts'].append({'name':
el.find('nodeName').text,
'id': el.find('id').text,
'runtime': el.find('runtime').text,
'filesScanned': el.find('lookups').text,
'filesMoved': el.find('files').text,
'filesFailed': el.find('failures').text,
- 'filesSkipped':
el.find('failures').text,
+ 'filesSkipped': el.find('skipped').text,
'totalSizeMoved': el.find('size').text,
- 'status':
el.find('statusStr').text.upper()})
+ 'status': statusStr.upper()})
return status
--
To view, visit
http://gerrit.ovirt.org/23650
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74d91d75950d5cdb61f4056e44474592dd0c9c67
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Bala.FA <barumuga(a)redhat.com>
Gerrit-Reviewer: Aravinda VK <avishwan(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Darshan N <dnarayan(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>