Igor Lvovsky has uploaded a new change for review.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000 ......................................................................
BZ#848299 - Fix delete VLANed network with MTU=9000
Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Signed-off-by: Igor Lvovsky ilvovsky@redhat.com --- M vdsm/configNetwork.py 1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/7214/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 9dffcdd..1f494c5 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -551,8 +551,8 @@ return
if bonding: - # FIXME! Check whether we need to care of bridgeless too - _, vlans = _netinfo.getBridgedNetworksAndVlansForIface(bonding) + iface_bridged = _netinfo.getBridgedNetworksAndVlansForIface(bonding) + vlans = [v for (_, v) in iface_bridged] delvlan = bonding + '.' + delvlan else: vlans = _netinfo.getVlansForNic(nics[0]) @@ -562,7 +562,7 @@ for vlan in vlans: if vlan == delvlan: continue - cf = self.NET_CONF_PREF + vlan + cf = self.NET_CONF_PREF + delvlan mtu = self._getConfigValue(cf, 'MTU') newmtu = max(newmtu, mtu)
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000 ......................................................................
Patch Set 1:
Build Failed
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/459/ : FAILURE
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000 ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/460/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Mark Wu has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000 ......................................................................
Patch Set 1: I would prefer that you didn't submit this
(1 inline comment)
.................................................... File vdsm/configNetwork.py Line 561: newmtu = None Line 562: for vlan in vlans: Line 563: if vlan == delvlan: Line 564: continue Line 565: cf = self.NET_CONF_PREF + delvlan My understanding is that it should be changed to delvlan and vlan is right. Line 566: mtu = self._getConfigValue(cf, 'MTU') Line 567: newmtu = max(newmtu, mtu) Line 568: Line 569: if newmtu != currmtu:
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Igor Lvovsky has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000 ......................................................................
Patch Set 1: (1 inline comment)
.................................................... File vdsm/configNetwork.py Line 561: newmtu = None Line 562: for vlan in vlans: Line 563: if vlan == delvlan: Line 564: continue Line 565: cf = self.NET_CONF_PREF + delvlan No, delvlan already has right value. Look above at lines 559/556 Line 566: mtu = self._getConfigValue(cf, 'MTU') Line 567: newmtu = max(newmtu, mtu) Line 568: Line 569: if newmtu != currmtu:
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Mark Wu has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000 ......................................................................
Patch Set 1: (1 inline comment)
.................................................... File vdsm/configNetwork.py Line 561: newmtu = None Line 562: for vlan in vlans: Line 563: if vlan == delvlan: Line 564: continue Line 565: cf = self.NET_CONF_PREF + delvlan Sorry, I still can't follow it. delvlan is the vlan under the network to be updated, while vlan represents each vlan created on the nic or bonding. This code is finding the biggest MTU, so it should read each vlan's configuration, not the current one, delvaln Line 566: mtu = self._getConfigValue(cf, 'MTU') Line 567: newmtu = max(newmtu, mtu) Line 568: Line 569: if newmtu != currmtu:
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Igor Lvovsky has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000 ......................................................................
Patch Set 1: (1 inline comment)
.................................................... File vdsm/configNetwork.py Line 561: newmtu = None Line 562: for vlan in vlans: Line 563: if vlan == delvlan: Line 564: continue Line 565: cf = self.NET_CONF_PREF + delvlan Ah, sorry. I misunderstood your first comment. I'll send a new patch Line 566: mtu = self._getConfigValue(cf, 'MTU') Line 567: newmtu = max(newmtu, mtu) Line 568: Line 569: if newmtu != currmtu:
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/473/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Livnat Peer has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 2:
adding a test to catch such issues would be very useful. Igor maybe also add a test for this?
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/516/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 3: I would prefer that you didn't submit this
(1 inline comment)
.................................................... File vdsm/configNetwork.py Line 582: for vlan in vlans: Line 583: if vlan == delvlan: Line 584: continue Line 585: iface = iface + '.' + vlan Line 586: cf = netinfo.NET_CONF_DIR + iface this has to be NET_CONF_PREF. who is going to add "ifcfg-" to the file name? Line 587: mtu = self._getConfigValue(cf, 'MTU') Line 588: newmtu = max(newmtu, mtu) Line 589: Line 590: if newmtu != currmtu:
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 4:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/519/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 5:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/524/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 5: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
Patch Set 5: Verified
just verified that you can now remove a network defined with an MTU.
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has submitted this change and it was merged.
Change subject: BZ#848299 - Fix delete VLANed network with custom MTU ......................................................................
BZ#848299 - Fix delete VLANed network with custom MTU
Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Signed-off-by: Igor Lvovsky ilvovsky@redhat.com --- M vdsm/configNetwork.py M vdsm/netinfo.py 2 files changed, 7 insertions(+), 7 deletions(-)
Approvals: Dan Kenigsberg: Verified; Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/7214 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org