Dan Kenigsberg has uploaded a new change for review.
Change subject: deployUtil: expect integer vlan id from new netinfo ......................................................................
deployUtil: expect integer vlan id from new netinfo
Commit 8b2bbe6e5 changed netinfo.getVlanID() to return the vlan id as an integer, istead of a string. This makes a lot of sense, but breaks compatibility with ancient deployUtil code.
Change-Id: Ibc1c5875e0d13b110f61f9eabf6d1964fc4c1237 Bug-Url: https://bugzilla.redhat.com/1037277 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M vdsm_reg/deployUtil.py.in 1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/21948/1
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index 2d379f6..ba45d64 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -1061,6 +1061,7 @@ else: vlan, bonding, nic = _getRHELBridgeParams(mgtIface, bridgeName=bridgeName) + vlan = str(vlan) fReturn = (nic is not None)
#Delete existing bridge in oVirt
oVirt Jenkins CI Server has posted comments on this change.
Change subject: deployUtil: expect integer vlan id from new netinfo ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5870/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5074/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5962/ : SUCCESS
Amador Pahim has posted comments on this change.
Change subject: deployUtil: expect integer vlan id from new netinfo ......................................................................
Patch Set 1: Code-Review+1
Antoni Segura Puimedon has posted comments on this change.
Change subject: deployUtil: expect integer vlan id from new netinfo ......................................................................
Patch Set 1: Code-Review+1
Dan Kenigsberg has submitted this change and it was merged.
Change subject: deployUtil: expect integer vlan id from new netinfo ......................................................................
deployUtil: expect integer vlan id from new netinfo
Commit 8b2bbe6e5 changed netinfo.getVlanID() to return the vlan id as an integer, istead of a string. This makes a lot of sense, but breaks compatibility with ancient deployUtil code.
Change-Id: Ibc1c5875e0d13b110f61f9eabf6d1964fc4c1237 Bug-Url: https://bugzilla.redhat.com/1037277 Signed-off-by: Dan Kenigsberg danken@redhat.com Reviewed-on: http://gerrit.ovirt.org/21948 Reviewed-by: Amador Pahim apahim@redhat.com Reviewed-by: Antoni Segura Puimedon asegurap@redhat.com --- M vdsm_reg/deployUtil.py.in 1 file changed, 1 insertion(+), 0 deletions(-)
Approvals: Antoni Segura Puimedon: Looks good to me, but someone else must approve Amador Pahim: Looks good to me, but someone else must approve Dan Kenigsberg: Verified; Looks good to me, approved
Dan Kenigsberg has posted comments on this change.
Change subject: deployUtil: expect integer vlan id from new netinfo ......................................................................
Patch Set 1: Verified+1 Code-Review+2
Verified by author Vladimir Tananko.
vdsm-patches@lists.fedorahosted.org