New subject: Change in vdsm[master]: netinfo: there may be up to one network attached directly to...

5 Dec 2012

Mark Wu has uploaded a new change for review.
Change subject: Return the result directly instead of generator when getting network for interface
......................................................................
Return the result directly instead of generator when getting network
for interface
Since one nic could be only used for one non-VLANed bridge or one non-VLANed
bridgeless network, it needn't continue to check other networks after
found one.
Change-Id: I80c47d0f0df70de73993ef0c09f69cbf882f6629
Signed-off-by: Mark Wu wudxw@linux.vnet.ibm.com
---
M vdsm/configNetwork.py
M vdsm/netinfo.py
2 files changed, 17 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/9737/1

diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 09d70ac..dd92bb1 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -858,11 +858,11 @@
                 raise ConfigNetworkError(ne.ERR_USED_NIC,
                                     "nic %s already used by vlans %s" %
                                     (nic, vlansForNic))
-            networksForNic = tuple(_netinfo.getNetworksForIface(nic))
-            if networksForNic:
+            networkForNic = _netinfo.getNetworkForIface(nic)
+            if networkForNic:
                 raise ConfigNetworkError(ne.ERR_USED_NIC,
-                                    "nic %s already used by networks %s" %
-                                    (nic, networksForNic))
+                                    "nic %s already used by network %s" %
+                                    (nic, networkForNic))
         else:
             _validateInterNetworkCompatibility(_netinfo, vlan, nic, bridged)
@@ -1213,9 +1213,7 @@
         logger.debug("Creating/Editing bond %s with attributes %s",
                      bond, bondAttrs)
-        brNets = list(_netinfo.getBridgedNetworksForIface(bond))
-        # Only one bridged-non-VLANed network allowed on same nic/bond
-        bridge = brNets[0] if brNets else None
+        bridge = _netinfo.getBridgedNetworkForIface(bond)
mtu = None
         if bond in _netinfo.bondings:
diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py
index f7d1799..0113688 100644
--- a/vdsm/netinfo.py
+++ b/vdsm/netinfo.py
@@ -432,22 +432,25 @@
             if iface == vdict['iface']:
                 yield v.split('.', 1)[1]
-    def getNetworksForIface(self, iface):
-        """ Return all networks attached to nic/bond """
-        return chain(self.getBridgelessNetworksForIface(iface),
-                     self.getBridgedNetworksForIface(iface))
+    def getNetworkForIface(self, iface):
+        """ Return the network attached to nic/bond """
+        network = self.getBridgelessNetworkForIface(iface)
+        if network is not None:
+            return network
+        else:
+            return self.getBridgedNetworkForIface(iface)
-    def getBridgelessNetworksForIface(self, iface):
-        """ Return all bridgeless networks attached to nic/bond """
+    def getBridgelessNetworkForIface(self, iface):
+        """ Return the bridgeless network attached to nic/bond """
         for network, netdict in self.networks.iteritems():
             if not netdict['bridged'] and iface == netdict['iface']:
-                yield network
+                return network
-    def getBridgedNetworksForIface(self, iface):
+    def getBridgedNetworkForIface(self, iface):
         """ Return all bridged networks attached to nic/bond """
         for bridge, netdict in self.networks.iteritems():
             if netdict['bridged'] and iface in netdict['ports']:
-                yield bridge
+                return bridge
def getBondingsForNic(self, nic):
         for b, bdict in self.bondings.iteritems():
--
To view, visit http://gerrit.ovirt.org/9737
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80c47d0f0df70de73993ef0c09f69cbf882f6629
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com

    

Change in vdsm[master]: Return the result directly instead of generator when getting...