Change in vdsm[master]: netlink: make the scope string stable across libnl1-3

Antoni Segura Puimedon has uploaded a new change for review.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................

netlink: make the scope string stable across libnl1-3

For globally scoped routes, libnl1 reports 'universe' and libnl3
reports 'global'. This patch makes sure that we only get 'global'.

Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
---
M lib/vdsm/netlink/__init__.py
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/29598/1

diff --git a/lib/vdsm/netlink/__init__.py b/lib/vdsm/netlink/__init__.py
index 4f46b98..b9dc943 100644
--- a/lib/vdsm/netlink/__init__.py
+++ b/lib/vdsm/netlink/__init__.py
@@ -103,7 +103,9 @@
 def _scope_to_str(scope_num):
     """Returns the textual scope representation of the numerical
id"""
     scope = (c_char * CHARBUFFSIZE)()
-    return _rtnl_scope2str(scope_num, scope, sizeof(scope))
+    scope = _rtnl_scope2str(scope_num, scope, sizeof(scope))
+    # libnl1 reports 'universe' instead of 'global'
+    return scope if scope != 'universe' else 'global'
 
 # C function prototypes
 # http://docs.python.org/2/library/ctypes.html#function-prototypes


-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................


Patch Set 2: Code-Review+2

-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................


Patch Set 3:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged/1575/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5560/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/3718/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................


netlink: make the scope string stable across libnl1-3

For globally scoped routes, libnl1 reports 'universe' and libnl3
reports 'global'. This patch makes sure that we only get 'global'.

Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/29598
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/netlink/__init__.py
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Antoni Segura Puimedon: Verified
  Dan Kenigsberg: Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................


Patch Set 2:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10010/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/10795/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/10952/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Antoni Segura Puimedon has posted comments on this change.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................


Patch Set 2: Verified+1

Verified with the previous if, but copying score due to the logical equivalence.

-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................


Patch Set 1: Code-Review-1

(1 comment)

-1 for visibility only

http://gerrit.ovirt.org/#/c/29598/1/lib/vdsm/netlink/__init__.py
File lib/vdsm/netlink/__init__.py:

Line 104:     """Returns the textual scope representation of the numerical
id"""
Line 105:     scope = (c_char * CHARBUFFSIZE)()
Line 106:     scope = _rtnl_scope2str(scope_num, scope, sizeof(scope))
Line 107:     # libnl1 reports 'universe' instead of 'global'
Line 108:     return scope if scope != 'universe' else 'global'
I prefer positive conditions:

  return 'global' if scope == 'universe' else scope

would you not agree?
Line 109: 
Line 110: # C function prototypes
Line 111: # http://docs.python.org/2/library/ctypes.html#function-prototypes
Line 112: # This helps ctypes know the calling conventions it should use to communicate


-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: netlink: make the scope string stable across libnl1-3
......................................................................


Patch Set 1:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/9964/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/10749/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/10906/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/29598
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I700ba3d0997a5c829c460753a300d4529aae2a61
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No