Change in vdsm[master]: netinfo: Retrieve a VLAN's NIC after its ID in getVlanBondin...

osvoboda at redhat.com osvoboda at redhat.com
Tue Dec 16 07:58:26 UTC 2014


Ondřej Svoboda has uploaded a new change for review.

Change subject: netinfo: Retrieve a VLAN's NIC after its ID in getVlanBondingNic
......................................................................

netinfo: Retrieve a VLAN's NIC after its ID in getVlanBondingNic

Obviously, we cannot supply a VLAN's underlying device (eth0) to getVlanID,
it has to be the VLAN (eth0.100) itself.

Change-Id: Iae4c4ed1dc4e72451a6187d8a8c6ae01dafe1aed
Fixes: http://gerrit.ovirt.org/18182
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M lib/vdsm/netinfo.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/36193/1

diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index bc6edbf..97b7327 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -328,7 +328,7 @@
 
 
 def getVlanBondingNic(bridge):
-    """Return the (vlan, bonding, nics) tupple that belongs to bridge."""
+    """Return the (vlan, bonding, nics) tuple that belongs to bridge."""
 
     if bridge not in bridges():
         raise ValueError('unknown bridge %s' % bridge)
@@ -336,8 +336,8 @@
     nics = []
     for iface in ports(bridge):
         if iface in vlans():
-            iface = getVlanDevice(iface)
             vlan = getVlanID(iface)
+            iface = getVlanDevice(iface)
         if iface in bondings():
             bonding = iface
             nics = slaves(iface)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae4c4ed1dc4e72451a6187d8a8c6ae01dafe1aed
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list