Change in vdsm[master]: network: Make vdsmd addNetwork use supervdsmd setupNetworks

asegurap at redhat.com asegurap at redhat.com
Wed Nov 12 14:47:58 UTC 2014


Antoni Segura Puimedon has uploaded a new change for review.

Change subject: network: Make vdsmd addNetwork use supervdsmd setupNetworks
......................................................................

network: Make vdsmd addNetwork use supervdsmd setupNetworks

addNetwork is part of a very old and deprecated API that we have to
eventually shed off in the next major release. It makes sense to
just make an adapter so that we can simplify network.api to keep
a single entry point.

Change-Id: I5bc76dff5add1d29e8e14b86aea358de435a1997
Signed-off-by: Antoni S. Puimedon <asegurap at redhat.com>
---
M vdsm/API.py
1 file changed, 15 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/35090/1

diff --git a/vdsm/API.py b/vdsm/API.py
index 1ef4b00..3cdf789 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1396,7 +1396,7 @@
         finally:
             self._cif._networkSemaphore.release()
 
-    def addNetwork(self, bridge, vlan=None, bond=None, nics=None,
+    def addNetwork(self, network, vlan=None, bond=None, nics=None,
                    options=None):
         """Add a new network to this vds.
 
@@ -1414,13 +1414,24 @@
             self._cif._netConfigDirty = True
             if vlan:
                 options['vlan'] = vlan
+            bonds = {}
             if bond:
                 options['bonding'] = bond
-            if nics:
-                options['nics'] = list(nics)
+                bonds[bond] = {}
+                bond_opts = options.pop('bondingOptions', None)
+                if bond_opts is not None:
+                    bonds[bond]['options'] = bond_opts
+                bonds[bond]['nics'] = list(nics)
+            else:
+                nics = list(nics)
+                if nics:
+                    options['nic'], = nics
 
             try:
-                supervdsm.getProxy().addNetwork(bridge, options)
+                supervdsm.getProxy().setupNetworks(
+                    {network: options},
+                    bonds,
+                    {'connectivityCheck': False})
             except ConfigNetworkError as e:
                 self.log.error(e.message, exc_info=True)
                 return {'status': {'code': e.errCode, 'message': e.message}}


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bc76dff5add1d29e8e14b86aea358de435a1997
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap at redhat.com>


More information about the vdsm-patches mailing list