Change in vdsm[master]: network: api: get nics, vlan and bonding for removal from ru...

phoracek at redhat.com phoracek at redhat.com
Thu Jan 29 14:38:22 UTC 2015


Petr Horáček has uploaded a new change for review.

Change subject: network: api: get nics, vlan and bonding for removal from running config
......................................................................

network: api: get nics, vlan and bonding for removal from running config

Change-Id: I8ff722c9e78708ddfb6fd4c8477453374bd75476
TODO: tests
Signed-off-by: Petr Horáček <phoracek at redhat.com>
---
M vdsm/network/api.py
1 file changed, 20 insertions(+), 1 deletion(-)


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

diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index f2e21c0..9186eda 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -446,6 +446,24 @@
                 ))
 
 
+def _getNicsVlanBondingForNetwork(network, configurator):
+    _networks = configurator.runningConfig.networks
+    _bonds = configurator.runningConfig.bonds
+
+    vlan = _networks[network].get('vlan')
+    vlan = int(vlan) if vlan else None
+
+    bonding = _networks[network].get('bonding')
+
+    if bonding:
+        assert bonding in _bonds.keys()
+        nics = _bonds[bonding].get('nics')
+    else:
+        nics = list(_networks[network].get('nic'))
+
+    return nics, vlan, bonding
+
+
 @_alterRunningConfig
 def _delNetwork(network, vlan=None, bonding=None, nics=None, force=False,
                 configurator=None, implicitBonding=True, _netinfo=None,
@@ -463,7 +481,8 @@
                            configurator)
         return
 
-    nics, vlan, bonding = _netinfo.getNicsVlanAndBondingForNetwork(network)
+    nics, vlan, bonding = _getNicsVlanBondingForNetwork(network, configurator)
+
     bridged = _netinfo.networks[network]['bridged']
 
     logging.info("Removing network %s with vlan=%s, bonding=%s, nics=%s,"


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ff722c9e78708ddfb6fd4c8477453374bd75476
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek at redhat.com>


More information about the vdsm-patches mailing list