Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 10: (1 inline comment) File vdsm/configNetwork.py Line 380: raise ConfigNetworkError(ne.ERR_BAD_NIC, Line 381: Unknown nics in: %r % list(nics)) Line 382: Line 383: Line 384: def _handleBondings(bondings, configurator): No, I couldn't come up with a better idea. My lame attempt was processBonding, so I decided to keep the original. Line 385: Add/Edit/Remove bond interface Line 386: logger = logging.getLogger(_handleBondings) Line 387: Line 388: _netinfo = netinfo.NetInfo() -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 11: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2810/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1998/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2884/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 11: Verified -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Dan Kenigsberg has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 11: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Dan Kenigsberg has submitted this change and it was merged. Change subject: NetReload: netmodels for editBonding/removeBonding .. NetReload: netmodels for editBonding/removeBonding Re-implement the logic of editBonding and removeBonding using netmodels. PatchSet 11: Rebase. Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Signed-off-by: Mark Wu wu...@linux.vnet.ibm.com Signed-off-by: Antoni S. Puimedon asegu...@redhat.com Reviewed-on: http://gerrit.ovirt.org/15356 Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M vdsm/configNetwork.py M vdsm/netconf/ifcfg.py M vdsm/netmodels.py 3 files changed, 54 insertions(+), 87 deletions(-) Approvals: Antoni Segura Puimedon: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 9: (1 inline comment) File vdsm/netmodels.py Line 187: if name and nics: # New bonding or edit bonding. Line 188: slaves = cls._objectivizeSlaves(name, configurator, nics, mtu, Line 189: _netinfo) Line 190: if name in _netinfo.bondings and not options: Line 191: mtu = max(netinfo.getMtu(name), mtu) I believe this slipped past me. Probably the not options should be on a separate if for the following statement. Line 192: options = _netinfo.bondings[name]['cfg'].get('BONDING_OPTS') Line 193: elif name in _netinfo.bondings: # Implicit bonding. Line 194: mtu = max(netinfo.getMtu(name), mtu) Line 195: slaves = [Nic(nic, configurator, mtu=mtu, _netinfo=_netinfo) -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Giuseppe Vallarelli has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 9: Looks good to me, but someone else must approve Good! -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Dan Kenigsberg has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 9: I would prefer that you didn't submit this (2 inline comments) relatively minor question File vdsm/configNetwork.py Line 380: raise ConfigNetworkError(ne.ERR_BAD_NIC, Line 381: Unknown nics in: %r % list(nics)) Line 382: Line 383: Line 384: def _handleBondings(bondings, configurator): A function named handle is not a good sign, usually. But I cannot think of anything better (updateBonding is not really better). Can you? Line 385: Add/Edit/Remove bond interface Line 386: logger = logging.getLogger(_handleBondings) Line 387: Line 388: _netinfo = netinfo.NetInfo() File vdsm/netmodels.py Line 187: if name and nics: # New bonding or edit bonding. Line 188: slaves = cls._objectivizeSlaves(name, configurator, nics, mtu, Line 189: _netinfo) Line 190: if name in _netinfo.bondings and not options: Line 191: mtu = max(netinfo.getMtu(name), mtu) why does maximizing mtu depends on the bonding options? If only we had a unit test where a bond is edited by changing both its options and mtu.. Line 192: options = _netinfo.bondings[name]['cfg'].get('BONDING_OPTS') Line 193: elif name in _netinfo.bondings: # Implicit bonding. Line 194: mtu = max(netinfo.getMtu(name), mtu) Line 195: slaves = [Nic(nic, configurator, mtu=mtu, _netinfo=_netinfo) -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 9: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2752/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1940/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2826/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 9: Verified -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 8: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2702/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1890/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2776/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Mark Wu has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 8: Verified -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 8: Verified; Looks good to me, but someone else must approve I like the further simplification and the following patch (including this one) passes the tests I threw at it just fine. -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Mark Wu has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 6: Verified remove bonding: 1 if the bond is in REQUIRED_BONDINGS, the bond becomes down and no nic enslaved. 2.if it's not in REQUIRED_BONDINGS, the bond is removed. edit bonding: test bond slaves change from eth1, eth2 to eth2, eth3 add bonding: new bonding in REQUIRED_BONDINGS or not can be added successfully. -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 6: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 7: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2684/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1872/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2758/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Mark Wu has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 7: Verified -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 7: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 7: Verified Verified together with http://gerrit.ovirt.org/#/c/15178/ -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 4: Fails Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2629/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1817/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2702/ : FAILURE -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Mark Wu has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 4: Verified remove bonding: 1 if the bond is in REQUIRED_BONDINGS, the bond becomes down and no nic enslaved. 2.if it's not in REQUIRED_BONDINGS, the bond is removed. edit bonding: test bond slaves change from eth1, eth2 to eth2, eth3 add bonding: new bonding in REQUIRED_BONDINGS or not can be added successfully. -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Mark Wu has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 4: (1 inline comment) File vdsm/netmodels.py Line 190: if name in _netinfo.bondings: # Implicit bonding or edit bonding Line 191: mtu = max(netinfo.getMtu(name), mtu) Line 192: slaves = [Nic(nic, configurator, mtu=mtu, _netinfo=_netinfo) Line 193: for nic in _netinfo.getNicsForBonding(name)] Line 194: if not slaves: It could happen when a bond in REQUIRED_BONDINGS is removed, then we can't get its slaves even though it's in bondings. So we need to call _objectivizeSlaves with the given nics. Line 195: slaves = cls._objectivizeSlaves(name, configurator, nics, mtu, Line 196: _netinfo) Line 197: options = _netinfo.bondings[name]['cfg'].get('BONDING_OPTS') Line 198: elif name and nics: -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 4: I would prefer that you didn't submit this (1 inline comment) -1 only for visibility. I believe that the comment I make could simplify the patch a bit. File vdsm/netmodels.py Line 190: if name in _netinfo.bondings: # Implicit bonding or edit bonding Line 191: mtu = max(netinfo.getMtu(name), mtu) Line 192: slaves = [Nic(nic, configurator, mtu=mtu, _netinfo=_netinfo) Line 193: for nic in _netinfo.getNicsForBonding(name)] Line 194: if not slaves: If you first do non implicit (as in line 198) and then in the elif you do the implicit, I believe that lines 194-196 would not be necessary. Line 195: slaves = cls._objectivizeSlaves(name, configurator, nics, mtu, Line 196: _netinfo) Line 197: options = _netinfo.bondings[name]['cfg'].get('BONDING_OPTS') Line 198: elif name and nics: -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Mark Wu has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 4: (1 inline comment) File vdsm/netmodels.py Line 190: if name in _netinfo.bondings: # Implicit bonding or edit bonding Line 191: mtu = max(netinfo.getMtu(name), mtu) Line 192: slaves = [Nic(nic, configurator, mtu=mtu, _netinfo=_netinfo) Line 193: for nic in _netinfo.getNicsForBonding(name)] Line 194: if not slaves: I do it intentionally. For the edit boning case, it passes in both name and nics, and the condition in line 198 holds true for it. But I need it follow into the existing bonding case, then I can get the old slave, and the old slave can be removed in configurator.editBonding. Also the option could be preserved in the new bonding, if no bond options passed in for the editing case. Line 195: slaves = cls._objectivizeSlaves(name, configurator, nics, mtu, Line 196: _netinfo) Line 197: options = _netinfo.bondings[name]['cfg'].get('BONDING_OPTS') Line 198: elif name and nics: -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Assaf Muller amul...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 2: Fails Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2571/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1748/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2644/ : FAILURE -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 3: Fails Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2594/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1776/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2669/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 3: No score Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2594/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2669/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1779/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Giuseppe Vallarelli has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 3: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Antoni Segura Puimedon has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 3: (1 inline comment) File vdsm/configNetwork.py Line 384: _netinfo = netinfo.NetInfo() Line 385: Line 386: for bondName, bondAttrs in bondings.iteritems(): Line 387: bond = Bond.objectivize(bondName, configurator, Line 388: bondAttrs.get('options', None), get method returns None if the key is not found by default, so it is not necessary to specify a default value in this case. Line 389: bondAttrs['nics'], mtu=None, Line 390: _netinfo=_netinfo, Line 391: destroy='remove' in bondAttrs) Line 392: if 'remove' in bondAttrs: -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Giuseppe Vallarelli gvall...@redhat.com Gerrit-Reviewer: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
Mark Wu has uploaded a new change for review. Change subject: NetReload: netmodels for editBonding/removeBonding .. NetReload: netmodels for editBonding/removeBonding Re-implement the logic of editBonding and removeBonding using netmodels. Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Signed-off-by: Mark Wu wu...@linux.vnet.ibm.com --- M vdsm/configNetwork.py M vdsm/netconf/ifcfg.py M vdsm/netmodels.py 3 files changed, 54 insertions(+), 86 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/15356/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 525996c..6f7ba9d 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -376,39 +376,32 @@ Unknown nics in: %r % list(nics)) -def _editBondings(bondings, configurator): - Add/Edit bond interface -logger = logging.getLogger(_editBondings) +def _handleBondings(bondings, configurator): + Add/Edit/Remove bond interface +logger = logging.getLogger(_handleBondings) _netinfo = netinfo.NetInfo() -for bond, bondAttrs in bondings.iteritems(): -logger.debug(Creating/Editing bond %s with attributes %s, - bond, bondAttrs) - -bridge = _netinfo.getBridgedNetworkForIface(bond) - -if bond in _netinfo.bondings: -configurator.editBonding(bond, bondAttrs, bridge, _netinfo) -else: -configurator.configureBonding(bond, nics=bondAttrs['nics'], - bridge=bridge, - bondingOptions=bondAttrs.get( - 'options', None)) - - -def _removeBondings(bondings, configurator): - Remove bond interface -logger = logging.getLogger(_removeBondings) - -_netinfo = netinfo.NetInfo() - -for bond, bondAttrs in bondings.items(): +for bondName, bondAttrs in bondings.iteritems(): +bond = Bond.objectivize(bondName, configurator, +bondAttrs.get('options', None), +nics=None, mtu=None, +_netinfo=_netinfo, +destroy='remove' in bondAttrs) if 'remove' in bondAttrs: -nics = _netinfo.getNicsForBonding(bond) -logger.debug(Removing bond %r with nics = %s, bond, nics) -configurator.removeBonding(bond, nics) -del bondings[bond] +logger.debug(Removing bond %s with attributes %s, bondName, + bondAttrs) +configurator.removeBond(bond) +del bondings[bondName] +del _netinfo.bondings[bondName] +elif bondName in _netinfo.bondings: +logger.debug(Editing bond %s with attributes %s, bondName, + bondAttrs) +configurator.editBonding(bond, bondAttrs, _netinfo) +else: +logger.debug(Creating bond %s with attributes %s, bondName, + bondAttrs) +configurator.configureBond(bond) def _buildBondOptions(bondName, bondings, _netinfo): @@ -509,11 +502,7 @@ else: networksAdded.add(network) -# Remove bonds with 'remove' attribute -_removeBondings(bondings, configurator) - -# Check whether bonds should be resized -_editBondings(bondings, configurator) +_handleBondings(bondings, configurator) # We need to use the newest host info _ni = netinfo.NetInfo() diff --git a/vdsm/netconf/ifcfg.py b/vdsm/netconf/ifcfg.py index 02ee20e..6070053 100644 --- a/vdsm/netconf/ifcfg.py +++ b/vdsm/netconf/ifcfg.py @@ -116,45 +116,14 @@ iface.name) self._libvirtAdded.add(network) -def configureBonding(self, bond, nics, bridge=None, mtu=None, - bondingOptions=None): -self.configWriter.addBonding(bond, bridge=bridge, mtu=mtu, - bondingOptions=bondingOptions) -for nic in nics: -self.configWriter.addNic(nic, bonding=bond, mtu=mtu) -ifup(bond) - -def editBonding(self, bond, bondAttrs, bridge, _netinfo): -# Save MTU for future set on NICs -confParams = netinfo.getIfaceCfg(bond) -mtu = confParams.get('MTU', None) -if mtu: -mtu = int(mtu) - -ifdown(bond) -# Take down all bond's NICs. -for nic in _netinfo.getNicsForBonding(bond): -ifdown(nic) -self.configWriter.removeNic(nic) -if nic not in bondAttrs['nics']: -ifup(nic) - -# Note! In case we have bridge up and connected to the bond -# we will get error in log: -# (ifdown) bridge XXX is still up; can't delete it -# But, we prefer this
Change in vdsm[master]: NetReload: netmodels for editBonding/removeBonding
oVirt Jenkins CI Server has posted comments on this change. Change subject: NetReload: netmodels for editBonding/removeBonding .. Patch Set 1: Fails Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2556/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1733/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2629/ : FAILURE -- To view, visit http://gerrit.ovirt.org/15356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab6fabb01d38c0e23a950bc5b693fe597b7d21c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wu...@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches