Change in vdsm[master]: net: maintain legacy addNetwork/delNetwork APIs

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................

net: maintain legacy addNetwork/delNetwork APIs

commits 43a6b9 and 167b02 changed the signature of addNetwork and
delNetwork respectively. This must not happen, as Engine 3.5 uses
argument names in its API.

With http://www.ovirt.org/Features/HostNetworkingApi implemented in
engine-3.6, no one is going to call Vdsm's addNetwork/delNetwork any
more. However, we must keep backward compatibility as long as engine-3.5
is supported.

Bug-Url: https://bugzilla.redhat.com/1229632
Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/API.py
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/43187/1

diff --git a/vdsm/API.py b/vdsm/API.py
index 89f35ac..eafceb7 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1453,13 +1453,14 @@
         finally:
             self._cif._networkSemaphore.release()
 
-    def addNetwork(self, network, vlan=None, bond=None, nics=None,
+    def addNetwork(self, bridge, vlan=None, bond=None, nics=None,
                    options=None):
         """Add a new network to this vds.
 
         Network topology is network--[vlan--][bond--]nics.
         vlan(number) and bond are optional - pass the empty string to discard
         them.  """
+        network = bridge
         if options is None:
             options = {}
 
@@ -1501,9 +1502,10 @@
         finally:
             self._cif._networkSemaphore.release()
 
-    def delNetwork(self, network, vlan=None, bond=None, nics=None,
+    def delNetwork(self, bridge, vlan=None, bond=None, nics=None,
                    options=None):
         """Delete a network from this vds."""
+        network = bridge
         if options is None:
             options = {}
         self.translateNetOptionsToNew(options)


-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

automation(a)ovirt.org has posted comments on this change.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................


Patch Set 1:

* Update tracker::#1229632::OK
* Check Bug-Url::OK
* Check Public Bug::#1229632::OK, public bug
* Check Product::#1229632::OK, Correct product oVirt
* Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

automation(a)ovirt.org has posted comments on this change.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................


Patch Set 2:

* Update tracker::#1229632::OK
* Check Bug-Url::OK
* Check Public Bug::#1229632::OK, public bug
* Check Product::#1229632::OK, Correct product oVirt
* Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <toni+ovirt(a)midokura.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................


Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <toni+ovirt(a)midokura.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Ido Barkan has posted comments on this change.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................


Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <toni+ovirt(a)midokura.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................


Patch Set 2: Code-Review+2 Verified+1

Passes functional tests (over xmlrpc) with no regression.

-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <toni+ovirt(a)midokura.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................


net: maintain legacy addNetwork/delNetwork APIs

commits 43a6b9 and 167b02 changed the signature of addNetwork and
delNetwork respectively. The name change, from "bridge" to "network"
is
highly reasonable, as we support non-bridged networks. However, it must
not happen, as Engine 3.5 uses argument names in its json-rpc API.

commits 3abcad and 1d015d modified the schema to the new signature, so
they are reverted as well.

With http://www.ovirt.org/Features/HostNetworkingApi implemented in
engine-3.6, no one is going to call Vdsm's addNetwork/delNetwork any
more. However, we must keep backward compatibility as long as engine-3.5
is supported.

Bug-Url: https://bugzilla.redhat.com/1229632
Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Reviewed-on: https://gerrit.ovirt.org/43187
Continuous-Integration: Jenkins CI
Reviewed-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Reviewed-by: Ido Barkan <ibarkan(a)redhat.com&gt;
---
M vdsm/API.py
M vdsm/rpc/vdsmapi-schema.json
2 files changed, 8 insertions(+), 6 deletions(-)

Approvals:
  Piotr Kliczewski: Looks good to me, but someone else must approve
  Ido Barkan: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Verified; Looks good to me, approved



-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <toni+ovirt(a)midokura.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org

automation(a)ovirt.org has posted comments on this change.

Change subject: net: maintain legacy addNetwork/delNetwork APIs
......................................................................


Patch Set 3:

* Update tracker::#1229632::OK
* Check TR::#1229632::ERROR, 3.6.0 should not match .*

-- 
To view, visit https://gerrit.ovirt.org/43187
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <toni+ovirt(a)midokura.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No