Change in vdsm[master]: gluster: add host uuid in volume status

Hello Timothy Asir, Saggi Mizrahi, Aravinda VK, Dan Kenigsberg,

I'd like you to do a code review.  Please visit

http://gerrit.ovirt.org/21596

to review the following change.

Change subject: gluster: add host uuid in volume status
......................................................................

gluster: add host uuid in volume status

This patch adopts newly added host uuid in gluster volume status cli
output

Change-Id: Ib9d92845ffce4ba5a2f9f0f2cca782ef18664bdf
Signed-off-by: Bala.FA 
---
M tests/gluster_cli_tests.py
M vdsm.spec.in
M vdsm/gluster/cli.py
3 files changed, 16 insertions(+), 1 deletion(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/21596/1

diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py
index 72d98ed..d0c8a1c 100644
--- a/tests/gluster_cli_tests.py
+++ b/tests/gluster_cli_tests.py
@@ -212,6 +212,7 @@
         <nodeCount>4</nodeCount>
         <node>
           <hostname>192.168.122.2</hostname>
+          <peerid>f06b108e-a780-4519-bb22-c3083a1e3f8a</peerid>
           <path>/tmp/music-b1</path>
           <port>49152</port>
           <status>1</status>
@@ -219,6 +220,7 @@
         </node>
         <node>
           <hostname>192.168.122.2</hostname>
+          <peerid>f06b108e-a780-4519-bb22-c3083a1e3f8a</peerid>
           <path>/tmp/music-b2</path>
           <port>49153</port>
           <status>1</status>
@@ -227,6 +229,7 @@
         <node>
           <hostname>NFS Server</hostname>
           <path>192.168.122.2</path>
+          <peerid>f06b108e-a780-4519-bb22-c3083a1e3f8a</peerid>
           <port>38467</port>
           <status>1</status>
           <pid>1357</pid>
@@ -234,6 +237,7 @@
         <node>
           <hostname>Self-heal Daemon</hostname>
           <path>192.168.122.2</path>
+          <peerid>f06b108e-a780-4519-bb22-c3083a1e3f8a</peerid>
           <port>0</port>
           <status>1</status>
           <pid>1375</pid>
@@ -247,19 +251,27 @@
         status = gcli._parseVolumeStatus(tree)
         self.assertEquals(status,
                           {'bricks': [{'brick': '192.168.122.2:/tmp/music-b1',
+                                       'hostuuid': \
+                                       'f06b108e-a780-4519-bb22-c3083a1e3f8a',
                                        'pid': '1313',
                                        'port': '49152',
                                        'status': 'ONLINE'},
                                       {'brick': '192.168.122.2:/tmp/music-b2',
+                                       'hostuuid': \
+                                       'f06b108e-a780-4519-bb22-c3083a1e3f8a',
                                        'pid': '1335',
                                        'port': '49153',
                                        'status': 'ONLINE'}],
                            'name': 'music',
                            'nfs': [{'hostname': '192.168.122.2',
+                                    'hostuuid': \
+                                    'f06b108e-a780-4519-bb22-c3083a1e3f8a',
                                     'pid': '1357',
                                     'port': '38467',
                                     'status': 'ONLINE'}],
                            'shd': [{'hostname': '192.168.122.2',
+                                    'hostuuid': \
+                                    'f06b108e-a780-4519-bb22-c3083a1e3f8a',
                                     'pid': '1375',
                                     'status': 'ONLINE'}]})

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 43e47ea..e9628dd 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -217,7 +217,7 @@

# GlusterFS client-side RPMs needed for Gluster SD
 %if 0%{?with_gluster}
-Requires: glusterfs >= 3.4.1
+Requires: glusterfs >= 3.4.2
 Requires: glusterfs-cli
 Requires: glusterfs-api
 Requires: glusterfs-fuse
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index a654b56..639c41d 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -148,16 +148,19 @@

if value['hostname'] == 'NFS Server':
             status['nfs'].append({'hostname': value['path'],
+                                  'hostuuid': value['peerid'],
                                   'port': value['port'],
                                   'status': value['status'],
                                   'pid': value['pid']})
         elif value['hostname'] == 'Self-heal Daemon':
             status['shd'].append({'hostname': value['path'],
+                                  'hostuuid': value['peerid'],
                                   'status': value['status'],
                                   'pid': value['pid']})
         else:
             status['bricks'].append({'brick': '%s:%s' % (value['hostname'],
                                                          value['path']),
+                                     'hostuuid': value['peerid'],
                                      'port': value['port'],
                                      'status': value['status'],
                                      'pid': value['pid']})

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 1: Code-Review-1 Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4864/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5664/ : UNSTABLE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5749/ : FAILURE

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4866/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5666/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5751/ : SUCCESS

Bala.FA has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 2:

Dependent glusterfs patch is still under review at http://review.gluster.org/#/c/6267/.  Wait it gets accepted and new glusterfs release is made.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 3: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6592/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5699/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6505/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/218/ : FAILURE

Bala.FA has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 4: Verified+1

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 4:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6005/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6793/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6899/ : SUCCESS

Timothy Asir has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 4: Code-Review+1

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: gluster: add host uuid in volume status
......................................................................

Patch Set 4: Code-Review+2

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: gluster: add host uuid in volume status
......................................................................

gluster: add host uuid in volume status

This patch adopts newly added host uuid in gluster volume status cli
output

Change-Id: Ib9d92845ffce4ba5a2f9f0f2cca782ef18664bdf
Signed-off-by: Bala.FA 
Reviewed-on: http://gerrit.ovirt.org/21596
Reviewed-by: Timothy Asir 
Reviewed-by: Dan Kenigsberg 
---
M tests/gluster_cli_tests.py
M vdsm/gluster/cli.py
2 files changed, 43 insertions(+), 0 deletions(-)

Approvals:
  Timothy Asir: Looks good to me, but someone else must approve
  Bala.FA: Verified
  Dan Kenigsberg: Looks good to me, approved