Change in vdsm[master]: net: switch type switch
Petr Horáček has posted comments on this change. Change subject: net: switch type switch .. Patch Set 13: Verified+1 Passed all network/*_test.py OK -- To view, visit https://gerrit.ovirt.org/62330 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia090277ee3c4995f0a313a032ae651ba55dc8989 Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0.5]: net: edit nic detached from bridge but still attached to a vlan
Hello Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/65760 to review the following change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. net: edit nic detached from bridge but still attached to a vlan Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1372798 Reviewed-on: https://gerrit.ovirt.org/65231 Reviewed-by: Dan Kenigsberg Continuous-Integration: Jenkins CI (cherry picked from commit 0970a9e90bc229d1fc95210153aacf564353516d) Reviewed-on: https://gerrit.ovirt.org/65232 --- M lib/vdsm/network/configurators/ifcfg.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/65760/1 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index f49693a..f04a7f3 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -281,6 +281,11 @@ if set_mtu is not None: ipwrapper.linkSet(nic.name, ['mtu', str(set_mtu)]) +# If the nic was bridged, we must remove BRIDGE parameter from its +# ifcfg configuration file. +if nic.bridge: +self.configApplier.dropBridgeParameter(nic.name) + def _getFilePath(self, fileType, device): return os.path.join(NET_CONF_DIR, '%s-%s' % (fileType, device)) -- To view, visit https://gerrit.ovirt.org/65760 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0.5 Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: support nameserver address with %iface tail
Petr Horáček has posted comments on this change. Change subject: net: support nameserver address with %iface tail .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/65693 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iea4d2eea2af8004435dae54ad56588739e028ba2 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Dominik Holler Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: support nameserver address with %iface tail
Petr Horáček has posted comments on this change. Change subject: net: support nameserver address with %iface tail .. Patch Set 3: Code-Review-1 We should add a test to func_dns_test.py, to check if both ifcfg and our caps reporting are OK with this usage. -- To view, visit https://gerrit.ovirt.org/65693 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iea4d2eea2af8004435dae54ad56588739e028ba2 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Dominik Holler Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: network: supervdsm: configure container networks
Petr Horáček has posted comments on this change. Change subject: network: supervdsm: configure container networks .. Patch Set 51: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/54998/51/vdsm/API.py File vdsm/API.py: Line 1513: Line 1514: try: Line 1515: self._cif._netConfigDirty = True Line 1516: supervdsm.getProxy().setupNetworks(networks, bondings, options) Line 1517: containersconnection.setup_networks(networks) this breaks setupNetworks rollback. if this line raises exception, API.setupNetworks fails, but networks configured by previous line are left on the host (they should be rolled back to initial state). i think we should move it to vdsm.network.api under rollback trigger. if it is possible that this will break host connectivity, we must also do some refactoring. if container network setup is dependent on switch type (linux bridge/ovs bridge), then we should place it in vdsm.network.netswitch (that would allow us to setup docker networks before connectivity check). Line 1518: return {'status': doneCode} Line 1519: except ConfigNetworkError as e: Line 1520: self.log.error(e.message, exc_info=True) Line 1521: return {'status': {'code': e.errCode, 'message': e.message}} -- To view, visit https://gerrit.ovirt.org/54998 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I338ca2d3abb0b1447c5a18c97afb9e14314f4107 Gerrit-PatchSet: 51 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make toolBondingTests pass
Petr Horáček has posted comments on this change. Change subject: py3: make toolBondingTests pass .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/65666/1/lib/vdsm/network/netinfo/bonding.py File lib/vdsm/network/netinfo/bonding.py: Line 258: Line 259: Line 260: def _bond_opts_name2numeric_scan(opt_path): Line 261: vals = {} Line 262: with open(opt_path, 'w') as opt_file: why do we use open as a context manager if we close it ourselves anyways? won't be better to create open_ignoring_flush_error that will do open and ignoring close? Line 263: for numeric_val in range(32): Line 264: name, numeric = _bond_opts_name2numeric_getval(opt_path, opt_file, Line 265: numeric_val) Line 266: if name is None: -- To view, visit https://gerrit.ovirt.org/65666 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4487b787c3a14ca9508847572622f431f1188e7f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan KenigsbergGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Leon Goldberg Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has restored this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Restored -- To view, visit https://gerrit.ovirt.org/65232 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has restored this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Restored -- To view, visit https://gerrit.ovirt.org/65233 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has abandoned this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Abandoned -- To view, visit https://gerrit.ovirt.org/65233 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has abandoned this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Abandoned -- To view, visit https://gerrit.ovirt.org/65232 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has posted comments on this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Patch Set 4: I cannot check the ifcfg for BRIDGE, it works OK when I use dummies, have no idea why is there a difference with physical NIC. The difference is there even outside tests, reproduced via vdscli. -- To view, visit https://gerrit.ovirt.org/65231 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Change classmethod to staticmethod in IPv4 and IPv6 cla...
Petr Horáček has posted comments on this change. Change subject: net: Change classmethod to staticmethod in IPv4 and IPv6 classes .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/65609 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I061a33c6404198c7691d853d683e8535c38442e6 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Validate nameservers setup
Petr Horáček has posted comments on this change. Change subject: net: Validate nameservers setup .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/65613 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68b8a834eabd9775178e395f643d555a18eecc81 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make ovs_test pass
Petr Horáček has posted comments on this change. Change subject: py3: make ovs_test pass .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/65599 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan KenigsbergGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Change classmethod to staticmethod in IPv4 and IPv6 cla...
Petr Horáček has posted comments on this change. Change subject: net: Change classmethod to staticmethod in IPv4 and IPv6 classes .. Patch Set 2: Why don't we just extract them into standalone functions? -- To view, visit https://gerrit.ovirt.org/65609 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I061a33c6404198c7691d853d683e8535c38442e6 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Change classmethod to staticmethod in IPv4 and IPv6 cla...
Petr Horáček has posted comments on this change. Change subject: net: Change classmethod to staticmethod in IPv4 and IPv6 classes .. Patch Set 2: this way we just abuse staticmethods to use IPvX as a module. -- To view, visit https://gerrit.ovirt.org/65609 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I061a33c6404198c7691d853d683e8535c38442e6 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has posted comments on this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Patch Set 4: Verified+1 Manually tested with physical nic. Passed network/*_test.py and functional/networkTests.py -- To view, visit https://gerrit.ovirt.org/65231 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has posted comments on this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Patch Set 2: Verified-1 (1 comment) https://gerrit.ovirt.org/#/c/65231/2/tests/network/func_net_basic_test.py File tests/network/func_net_basic_test.py: Line 38: class NetworkBasicTemplate(NetFuncTestCase): Line 39: __test__ = False Line 40: Line 41: @contextmanager Line 42: def _test_detach_used_nic_from_bridge(self): test always passes (even without the fix) on dummies, it fails when nic is system nic (eth1) Line 43: with dummy_device() as nic: Line 44: NETCREATE = { Line 45: NETWORK1_NAME: {'nic': nic, 'switch': self.switch}, Line 46: NETWORK2_NAME: {'nic': nic, 'vlan': VLAN2, -- To view, visit https://gerrit.ovirt.org/65231 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: fix remaining references to monitor.MonitorError as ite...
Petr Horáček has posted comments on this change. Change subject: py3: fix remaining references to monitor.MonitorError as iterable .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64929 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic991c1a017f09431d4b38f58e529d0a6ec45a896 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan KenigsbergGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Leon Goldberg Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: remove default route before adding a new one
Petr Horáček has posted comments on this change. Change subject: net: remove default route before adding a new one .. Patch Set 2: If you are talking about the 'setting default route for non-management networks' problem, it is caused by missing implementation of source routing. this takes care only of management networks static default route. -- To view, visit https://gerrit.ovirt.org/65056 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie59c07845898630404ce517e5cc52048e50ed2dd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: canonicalize IPv4 prefix to netmask
Petr Horáček has posted comments on this change. Change subject: net: canonicalize IPv4 prefix to netmask .. Patch Set 3: Verified+1 (1 comment) Passed network/*_test.py and functional/networkTests.py OK. I added task to implement unit tests for canonicalization. https://gerrit.ovirt.org/#/c/64507/2//COMMIT_MSG Commit Message: Line 11: canonicalize.py. Line 12: Line 13: It also adds missing 'prefix' to setupNetworks documentation. Line 14: Line 15: Change-Id: I344eef120b4c19f90d4dd20c7857bb73ab259e9b > Missing some lines to indicate it is a backport. Done Line 16: Bug-Url: https://bugzilla.redhat.com/1374194 Line 17: Signed-off-by: Petr HoráčekLine 18: Reviewed-on: https://gerrit.ovirt.org/64494 Line 19: Continuous-Integration: Jenkins CI -- To view, visit https://gerrit.ovirt.org/64507 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I344eef120b4c19f90d4dd20c7857bb73ab259e9b Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net tests: minor libvirt_tests style refactoring
Petr Horáček has posted comments on this change. Change subject: net tests: minor libvirt_tests style refactoring .. Patch Set 6: Verified+1 libvirt test passed OK -- To view, visit https://gerrit.ovirt.org/65091 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I64dedb9859d204082a1516574e9b8650a3e4ffe5 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net tests: separate ifcfg and libvirt unit tests
Petr Horáček has posted comments on this change. Change subject: net tests: separate ifcfg and libvirt unit tests .. Patch Set 6: Verified+1 (2 comments) Both tests passed. https://gerrit.ovirt.org/#/c/65090/5/tests/Makefile.am File tests/Makefile.am: Line 195: network/iproute2_test.py \ Line 196: network/ipwrapper_test.py \ Line 197: network/link_iface_test.py \ Line 198: network/netlink_test.py \ Line 199: network/netinfo_test.py \ > link_bond is not related to this patch. Done Line 200: network/ovs_driver_test.py \ Line 201: network/ovs_info_test.py \ Line 202: network/ovs_test.py \ Line 203: network/tc_test.py \ https://gerrit.ovirt.org/#/c/65090/5/tests/network/libvirt_test.py File tests/network/libvirt_test.py: Line 38: Line 39: aXml = ET.tostring(ET.fromstring(a)) Line 40: bXml = ET.tostring(ET.fromstring(b)) Line 41: Line 42: aXmlNrml = re.sub(b'>\s*\n\s*<', b'><', aXml).strip() > just rebase my merged https://gerrit.ovirt.org/64928 Done Line 43: bXmlNrml = re.sub(b'>\s*\n\s*<', b'><', bXml).strip() Line 44: Line 45: self.assertEqual(aXmlNrml, bXmlNrml, msg) Line 46: -- To view, visit https://gerrit.ovirt.org/65090 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieca34a3f361586346d76ec22b11554c4a7c6e84d Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has posted comments on this change. Change subject: net: edit nic detached from bridge but still attached to a vlan .. Patch Set 1: I tried to, but it does not fail with dummy (only with system NIC), I don't know why, i tried to precreate ifcfg config for the dummy but it did not help. -- To view, visit https://gerrit.ovirt.org/65231 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has uploaded a new change for review. Change subject: net: edit nic detached from bridge but still attached to a vlan .. net: edit nic detached from bridge but still attached to a vlan Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1381880 --- M vdsm/network/configurators/ifcfg.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/65233/1 diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index bf93697..bc1c4c2 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -250,6 +250,11 @@ if set_mtu is not None: ipwrapper.linkSet(nic.name, ['mtu', str(set_mtu)]) +# If the nic was bridged, we must remove BRIDGE parameter from its +# ifcfg configuration file. +if nic.bridge: +self.configApplier.dropBridgeParameter(nic.name) + def _getFilePath(self, fileType, device): return os.path.join(netinfo.NET_CONF_DIR, '%s-%s' % (fileType, device)) -- To view, visit https://gerrit.ovirt.org/65233 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has uploaded a new change for review. Change subject: net: edit nic detached from bridge but still attached to a vlan .. net: edit nic detached from bridge but still attached to a vlan Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1372798 --- M lib/vdsm/network/configurators/ifcfg.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/65232/1 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index f49693a..f04a7f3 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -281,6 +281,11 @@ if set_mtu is not None: ipwrapper.linkSet(nic.name, ['mtu', str(set_mtu)]) +# If the nic was bridged, we must remove BRIDGE parameter from its +# ifcfg configuration file. +if nic.bridge: +self.configApplier.dropBridgeParameter(nic.name) + def _getFilePath(self, fileType, device): return os.path.join(NET_CONF_DIR, '%s-%s' % (fileType, device)) -- To view, visit https://gerrit.ovirt.org/65232 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit nic detached from bridge but still attached to a vlan
Petr Horáček has uploaded a new change for review. Change subject: net: edit nic detached from bridge but still attached to a vlan .. net: edit nic detached from bridge but still attached to a vlan Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1372798 --- M lib/vdsm/network/configurators/ifcfg.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/65231/1 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index aac39d1..427d150 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -283,6 +283,11 @@ if set_mtu is not None: ipwrapper.linkSet(nic.name, ['mtu', str(set_mtu)]) +# If the nic was bridged, we must remove BRIDGE parameter from its +# ifcfg configuration file. +if nic.bridge: +self.configApplier.dropBridgeParameter(nic.name) + def _getFilePath(self, fileType, device): return os.path.join(NET_CONF_DIR, '%s-%s' % (fileType, device)) -- To view, visit https://gerrit.ovirt.org/65231 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: net: edit bond detached from bridge but still attached to a ...
Petr Horáček has posted comments on this change. Change subject: net: edit bond detached from bridge but still attached to a vlan .. Patch Set 2: Verified+1 Passed functional/networkTests.py and manual testing (add untagged net, tagged net, both attached to a bond; change untagged to tagged; check if BRIDGE= was removed from bond ifcfg) -- To view, visit https://gerrit.ovirt.org/65219 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0f Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: net: edit bond detached from bridge but still attached to a ...
Hello Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/65219 to review the following change. Change subject: net: edit bond detached from bridge but still attached to a vlan .. net: edit bond detached from bridge but still attached to a vlan Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0f Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1372798 Reviewed-on: https://gerrit.ovirt.org/63723 Reviewed-by: Edward Haas Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg --- M vdsm/network/configurators/ifcfg.py 1 file changed, 26 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/65219/1 diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index 4e7d4ab..fb58ca5 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -230,8 +230,15 @@ if set_mtu is not None: ipwrapper.linkSet(bonding.name, ['mtu', str(set_mtu)]) -def removeNic(self, nic): -to_be_removed = self._ifaceDownAndCleanup(nic) +# If the bond was bridged, we must remove BRIDGE parameter from its +# ifcfg configuration file. +if bonding.bridge: +self.configApplier.dropBridgeParameter(bonding.name) + +def removeNic(self, nic, remove_even_if_used=False): +if not self.owned_device(nic.name): +self.normalize_device_filename(nic.name) +to_be_removed = self._ifaceDownAndCleanup(nic, remove_even_if_used) if to_be_removed: self.configApplier.removeNic(nic.name) if nic.name in netinfo.nics(): @@ -733,6 +740,23 @@ for slave in slaves: self.setIfaceMtu(slave, newmtu) +def dropBridgeParameter(self, iface_name): +iface_conf_path = netinfo.NET_CONF_PREF + iface_name + +if not os.path.isfile(iface_conf_path): +return + +with open(iface_conf_path) as f: +config_lines = f.readlines() + +config_lines_without_comments_and_bridge = [ +line for line in config_lines +if (not line.startswith('#') and +not line.startswith('BRIDGE'))] + +self.writeConfFile(iface_conf_path, + ''.join(config_lines_without_comments_and_bridge)) + def stop_devices(device_ifcfgs): for dev in reversed(_sort_device_ifcfgs(device_ifcfgs)): -- To view, visit https://gerrit.ovirt.org/65219 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: Revert "virt net: Change graphics type from network to address"
Petr Horáček has uploaded a new change for review. Change subject: Revert "virt net: Change graphics type from network to address" .. Revert "virt net: Change graphics type from network to address" Now we save even OVS networks in libvirt database. This change is not needed anymore. TODO: get rid of migration hooking This reverts commit 114e4805196f200f894d70c75cc4a001430f7bc4. Change-Id: I1683997318df0188bc180328af15282ed2099ed0 --- M vdsm/virt/vmdevices/graphics.py 1 file changed, 5 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/65098/1 diff --git a/vdsm/virt/vmdevices/graphics.py b/vdsm/virt/vmdevices/graphics.py index 62a1868..0b441e2 100644 --- a/vdsm/virt/vmdevices/graphics.py +++ b/vdsm/virt/vmdevices/graphics.py @@ -18,9 +18,10 @@ # Refer to the README and COPYING files for full details of the license # +import logging + import libvirt -from vdsm import supervdsm from vdsm.network import api as net_api from vdsm import utils from vdsm.config import config @@ -140,17 +141,7 @@ graphics.appendChildWithArgs('channel', name=chan, mode='secure') -# For the listen type IP to be used, the display network must be OVS. -# We assume that the cluster in which the host operates is OVS enabled -# and all other hosts in the cluster have the migration hook installed. -# The migration hook is responsible to convert ip to net and vice versa -display_network = self.specParams.get('displayNetwork') -display_ip = self.specParams.get('displayIp', '0') -if (display_network and display_ip != '0' and -supervdsm.getProxy().ovs_bridge(display_network)): -graphics.appendChildWithArgs( -'listen', type='address', address=display_ip) -elif display_network: +if self.specParams.get('displayNetwork'): graphics.appendChildWithArgs( 'listen', type='network', network=net_api.netname_o2l( @@ -220,16 +211,11 @@ def _getNetworkIp(network): try: nets = net_api.libvirt_networks() -# On a legacy based network, the device is the iface specified in the -# network report (supporting real bridgeless networks). -# In case the report or the iface key is missing, -# the device is defaulted to the network name (i.e. northbound port). -device = (nets[network]['iface'] or network - if network in nets else network) +device = nets[network]['iface'] or network ip, _, _, _ = net_api.ip_addrs_info(device) except (libvirt.libvirtError, KeyError, IndexError): ip = config.get('addresses', 'guests_gateway_ip') -finally: if ip == '': ip = '0' +logging.info('network %s: using %s', network, ip) return ip -- To view, visit https://gerrit.ovirt.org/65098 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1683997318df0188bc180328af15282ed2099ed0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net libvirt: make network/libvirt.py suitable for OVS
Petr Horáček has uploaded a new change for review. Change subject: net libvirt: make network/libvirt.py suitable for OVS .. net libvirt: make network/libvirt.py suitable for OVS Make network/libvirt.py suitable for OVS (add support for vlan and virtualport). Change-Id: I6de49e456d8c49f0309690a7fc2bee995f9846bb Signed-off-by: Petr Horáček--- M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/configurators/iproute2.py M lib/vdsm/network/configurators/pyroute_two.py M lib/vdsm/network/legacy_switch.py M lib/vdsm/network/libvirt.py M lib/vdsm/network/netinfo/cache.py M lib/vdsm/network/netswitch.py M tests/network/libvirt_test.py M vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py 9 files changed, 141 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/65065/4 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index aac39d1..b9d093f 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -370,7 +370,9 @@ def createLibvirtNetwork(self, network, bridged=True, iface=None, skipBackup=False): -netXml = libvirt.createNetworkDef(network, bridged, iface) +netXml = libvirt.createNetworkDef(network, + bridge=network if bridged else None, + iface=iface if not bridged else None) if not skipBackup: self._networkBackup(network) libvirt.createNetwork(netXml) diff --git a/lib/vdsm/network/configurators/iproute2.py b/lib/vdsm/network/configurators/iproute2.py index 4a96966..317dc5a 100644 --- a/lib/vdsm/network/configurators/iproute2.py +++ b/lib/vdsm/network/configurators/iproute2.py @@ -333,7 +333,9 @@ f.write(value) def createLibvirtNetwork(self, network, bridged=True, iface=None): -netXml = libvirt.createNetworkDef(network, bridged, iface) +netXml = libvirt.createNetworkDef(network, + bridge=network if bridged else None, + iface=iface if not bridged else None) libvirt.createNetwork(netXml) def removeLibvirtNetwork(self, network): diff --git a/lib/vdsm/network/configurators/pyroute_two.py b/lib/vdsm/network/configurators/pyroute_two.py index 8aece53..ff0b95f 100644 --- a/lib/vdsm/network/configurators/pyroute_two.py +++ b/lib/vdsm/network/configurators/pyroute_two.py @@ -164,7 +164,9 @@ f.write(value) def createLibvirtNetwork(self, network, bridged=True, iface=None): -netXml = libvirt.createNetworkDef(network, bridged, iface) +netXml = libvirt.createNetworkDef(network, + bridge=network if bridged else None, + iface=iface if not bridged else None) libvirt.createNetwork(netXml) def removeLibvirtNetwork(self, network): diff --git a/lib/vdsm/network/legacy_switch.py b/lib/vdsm/network/legacy_switch.py index 139ddfc..24d13cb 100644 --- a/lib/vdsm/network/legacy_switch.py +++ b/lib/vdsm/network/legacy_switch.py @@ -398,6 +398,7 @@ """ _netinfo = CachingNetInfo() _netinfo.networks[network] = netAttr +_netinfo.networks[network]['bridged'] = netAttr['bridge'] is not None _netinfo.networks[network]['dhcpv4'] = False if _netinfo.networks[network]['bridged']: diff --git a/lib/vdsm/network/libvirt.py b/lib/vdsm/network/libvirt.py index 12271d7..e80ba54 100644 --- a/lib/vdsm/network/libvirt.py +++ b/lib/vdsm/network/libvirt.py @@ -42,7 +42,8 @@ raise -def createNetworkDef(network, bridged=True, iface=None): +def createNetworkDef(network, bridge=None, vlan=None, iface=None, + virtualport=None): """ Creates Network Xml e.g.: @@ -58,6 +59,9 @@ or interface subelement. """ +if bridge and iface: +raise AttributeError('Cannot set both bridge and iface at once') + netName = LIBVIRT_NET_PREFIX + network def EtreeElement(tagName, text=None, **attrs): @@ -70,16 +74,25 @@ return elem root = etree.Element('network') -nameElem = EtreeElement('name', netName) + +root.append(EtreeElement('name', netName)) + forwardElem = EtreeElement( -'forward', mode='bridge' if bridged else 'passthrough' -) -root.append(nameElem) +'forward', mode='bridge' if bridge else 'passthrough') root.append(forwardElem) -if bridged: -root.append(EtreeElement('bridge', name=network)) -else: +if iface: forwardElem.append(EtreeElement('interface', dev=iface)) +elif bridge: +root.append(EtreeElement('bridge', name=bridge)) + +if vlan is not None: +vlanElem = EtreeElement('vlan') +
Change in vdsm[master]: net tests: minor libvirt_tests style refactoring
Petr Horáček has posted comments on this change. Change subject: net tests: minor libvirt_tests style refactoring .. Patch Set 1: Verified+1 Tests passed. -- To view, visit https://gerrit.ovirt.org/65091 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I64dedb9859d204082a1516574e9b8650a3e4ffe5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net tests: separate ifcfg and libvirt unit tests
Petr Horáček has uploaded a new change for review. Change subject: net tests: separate ifcfg and libvirt unit tests .. net tests: separate ifcfg and libvirt unit tests Change-Id: Ieca34a3f361586346d76ec22b11554c4a7c6e84d --- M tests/network/conf_test.py A tests/network/libvirt_test.py 2 files changed, 68 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/65090/1 diff --git a/tests/network/conf_test.py b/tests/network/conf_test.py index d94b5e6..e648c43 100644 --- a/tests/network/conf_test.py +++ b/tests/network/conf_test.py @@ -23,11 +23,9 @@ from __future__ import absolute_import import os import pwd -import re import shutil import subprocess import tempfile -import xml.etree.ElementTree as ET from vdsm.network import libvirt from vdsm.network.configurators import ifcfg @@ -64,19 +62,6 @@ with open(fn) as f: restoredContent = f.read() self.assertEqual(content, restoredContent) - -def assertEqualXml(self, a, b, msg=None): -""" -Compare two xml strings for equality. -""" - -aXml = ET.tostring(ET.fromstring(a)) -bXml = ET.tostring(ET.fromstring(b)) - -aXmlNrml = re.sub('>\s*\n\s*<', '><', aXml).strip() -bXmlNrml = re.sub('>\s*\n\s*<', '><', bXml).strip() - -self.assertEqual(aXmlNrml, bXmlNrml, msg) def setUp(self): self._tempdir = tempfile.mkdtemp() @@ -134,26 +119,3 @@ self._cw.restorePersistentBackup() self._assertFilesRestored() - -def testCreateNetXmlBridged(self): -expectedDoc = """ - vdsm-awesome_net - - - """ -actualDoc = libvirt.createNetworkDef('awesome_net', bridged=True) - -self.assertEqualXml(expectedDoc, actualDoc) - -def testCreateNetXml(self): -iface = "dummy" -expectedDoc = (""" -vdsm-awesome_net - - - - """ % iface) -actualDoc = libvirt.createNetworkDef('awesome_net', bridged=False, - iface=iface) - -self.assertEqualXml(expectedDoc, actualDoc) diff --git a/tests/network/libvirt_test.py b/tests/network/libvirt_test.py new file mode 100644 index 000..95cc240 --- /dev/null +++ b/tests/network/libvirt_test.py @@ -0,0 +1,68 @@ +# Copyright 2016 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# +from __future__ import absolute_import + +import re +import xml.etree.ElementTree as ET + +from vdsm.network import libvirt + +from nose.plugins.attrib import attr +from testlib import VdsmTestCase as TestCaseBase + + +@attr(type='unit') +class LibvirtTests(TestCaseBase): + +def assertEqualXml(self, a, b, msg=None): +""" +Compare two xml strings for equality. +""" + +aXml = ET.tostring(ET.fromstring(a)) +bXml = ET.tostring(ET.fromstring(b)) + +aXmlNrml = re.sub('>\s*\n\s*<', '><', aXml).strip() +bXmlNrml = re.sub('>\s*\n\s*<', '><', bXml).strip() + +self.assertEqual(aXmlNrml, bXmlNrml, msg) + +def testCreateNetXmlBridged(self): +expectedDoc = """ + vdsm-awesome_net + + + """ +actualDoc = libvirt.createNetworkDef('awesome_net', bridged=True) + +self.assertEqualXml(expectedDoc, actualDoc) + +def testCreateNetXml(self): +iface = "dummy" +expectedDoc = (""" +vdsm-awesome_net + + + + """ % iface) +actualDoc = libvirt.createNetworkDef('awesome_net', bridged=False, + iface=iface) + +self.assertEqualXml(expectedDoc, actualDoc) -- To view, visit https://gerrit.ovirt.org/65090 To unsubscribe, visit
Change in vdsm[master]: net tests: separate ifcfg and libvirt unit tests
Petr Horáček has posted comments on this change. Change subject: net tests: separate ifcfg and libvirt unit tests .. Patch Set 1: Verified+1 Both tests passed. -- To view, visit https://gerrit.ovirt.org/65090 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieca34a3f361586346d76ec22b11554c4a7c6e84d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Petr Horáček Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net tests: minor libvirt_tests style refactoring
Petr Horáček has uploaded a new change for review. Change subject: net tests: minor libvirt_tests style refactoring .. net tests: minor libvirt_tests style refactoring Change-Id: I64dedb9859d204082a1516574e9b8650a3e4ffe5 --- M tests/network/libvirt_test.py 1 file changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/65091/1 diff --git a/tests/network/libvirt_test.py b/tests/network/libvirt_test.py index 95cc240..b62351a 100644 --- a/tests/network/libvirt_test.py +++ b/tests/network/libvirt_test.py @@ -28,41 +28,41 @@ from testlib import VdsmTestCase as TestCaseBase +NETWORK = 'awesome_net' +LIBVIRT_NETWORK = 'vdsm-' + NETWORK +IFACE = 'dummy' + + @attr(type='unit') class LibvirtTests(TestCaseBase): -def assertEqualXml(self, a, b, msg=None): -""" -Compare two xml strings for equality. -""" +def assertEqualXml(self, a, b): +"""Compare two xml strings for equality""" -aXml = ET.tostring(ET.fromstring(a)) -bXml = ET.tostring(ET.fromstring(b)) +a_xml = ET.tostring(ET.fromstring(a)) +b_xml = ET.tostring(ET.fromstring(b)) -aXmlNrml = re.sub('>\s*\n\s*<', '><', aXml).strip() -bXmlNrml = re.sub('>\s*\n\s*<', '><', bXml).strip() +a_xml_normalized = re.sub('>\s*\n\s*<', '><', a_xml).strip() +b_xml_normalized = re.sub('>\s*\n\s*<', '><', b_xml).strip() -self.assertEqual(aXmlNrml, bXmlNrml, msg) +self.assertEqual(a_xml_normalized, b_xml_normalized) -def testCreateNetXmlBridged(self): -expectedDoc = """ - vdsm-awesome_net - - - """ -actualDoc = libvirt.createNetworkDef('awesome_net', bridged=True) +def test_create_net_xml_with_bridge(self): +expected_doc = """ +{} + + + """.format(LIBVIRT_NETWORK, NETWORK) +actual_doc = libvirt.createNetworkDef(NETWORK, bridged=True) +self.assertEqualXml(expected_doc, actual_doc) -self.assertEqualXml(expectedDoc, actualDoc) - -def testCreateNetXml(self): -iface = "dummy" -expectedDoc = (""" -vdsm-awesome_net +def test_create_net_xml_with_iface(self): +expected_doc = """ +{} - + - """ % iface) -actualDoc = libvirt.createNetworkDef('awesome_net', bridged=False, - iface=iface) - -self.assertEqualXml(expectedDoc, actualDoc) + """.format(LIBVIRT_NETWORK, IFACE) +actual_doc = libvirt.createNetworkDef( +NETWORK, bridged=False, iface=IFACE) +self.assertEqualXml(expected_doc, actual_doc) -- To view, visit https://gerrit.ovirt.org/65091 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64dedb9859d204082a1516574e9b8650a3e4ffe5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net test: fix ovs_test:test_dry_run
Petr Horáček has posted comments on this change. Change subject: net test: fix ovs_test:test_dry_run .. Patch Set 1: Verified+1 Passed ovs_test.py -- To view, visit https://gerrit.ovirt.org/65058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieb5c70c1498bbe85c5fdd9b0cec63761f2cf7c0d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net test: fix ovs_test:test_dry_run
Petr Horáček has uploaded a new change for review. Change subject: net test: fix ovs_test:test_dry_run .. net test: fix ovs_test:test_dry_run The test was using NetsAdditionSetup.add() as a standard function although it is a context manager. Therefore it only returned context manager object and no underlying code was executed. Change-Id: Ieb5c70c1498bbe85c5fdd9b0cec63761f2cf7c0d Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1379115 --- M tests/network/ovs_test.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/65058/1 diff --git a/tests/network/ovs_test.py b/tests/network/ovs_test.py index f6d589e..000811d 100644 --- a/tests/network/ovs_test.py +++ b/tests/network/ovs_test.py @@ -216,4 +216,5 @@ net_rem_setup.remove({}) net_add_setup = ovs_switch.NetsAdditionSetup(self.ovsdb, ovs_info) -net_add_setup.add({}) +with net_add_setup.add({}): +pass -- To view, visit https://gerrit.ovirt.org/65058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb5c70c1498bbe85c5fdd9b0cec63761f2cf7c0d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: remove default route before adding a new one
Petr Horáček has posted comments on this change. Change subject: net: remove default route before adding a new one .. Patch Set 2: Verified+1 Passed network/*_test.py OK. -- To view, visit https://gerrit.ovirt.org/65056 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie59c07845898630404ce517e5cc52048e50ed2dd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: remove default route before adding a new one
Hello Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/65056 to review the following change. Change subject: net: remove default route before adding a new one .. net: remove default route before adding a new one Change-Id: Ie59c07845898630404ce517e5cc52048e50ed2dd Signed-off-by: Petr HoráčekReviewed-on: https://gerrit.ovirt.org/63220 Continuous-Integration: Jenkins CI Reviewed-by: Edward Haas Reviewed-by: Dan Kenigsberg --- M lib/vdsm/network/ip/address.py 1 file changed, 22 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/65056/1 diff --git a/lib/vdsm/network/ip/address.py b/lib/vdsm/network/ip/address.py index 634925a..04aec93 100644 --- a/lib/vdsm/network/ip/address.py +++ b/lib/vdsm/network/ip/address.py @@ -18,6 +18,8 @@ # from __future__ import absolute_import +from contextlib import contextmanager +import logging import socket import struct @@ -173,28 +175,42 @@ def add(iface, ipv4, ipv6): if ipv4.address: -ipwrapper.addrAdd(iface, ipv4.address, ipv4.netmask) -if ipv4.gateway and ipv4.defaultRoute: -ipwrapper.routeAdd(['default', 'via', ipv4.gateway]) +_add_ipv4_address(iface, ipv4) if ipv6: _add_ipv6_address(iface, ipv6) elif ipv6_supported(): sysctl.disable_ipv6(iface) +def _add_ipv4_address(iface, ipv4): +ipwrapper.addrAdd(iface, ipv4.address, ipv4.netmask) +if ipv4.gateway and ipv4.defaultRoute: +_set_default_route(ipv4.gateway, family=4) + + def _add_ipv6_address(iface, ipv6): if ipv6.address: ipv6addr, ipv6netmask = ipv6.address.split('/') ipwrapper.addrAdd(iface, ipv6addr, ipv6netmask, family=6) -if ipv6.gateway: -ipwrapper.routeAdd(['default', 'via', ipv6.gateway], - dev=iface, family=6) +if ipv6.gateway and ipv6.defaultRoute: +_set_default_route(ipv6.gateway, family=6, dev=iface) if ipv6.ipv6autoconf is not None: with open('/proc/sys/net/ipv6/conf/%s/autoconf' % iface, 'w') as ipv6_autoconf: ipv6_autoconf.write('1' if ipv6.ipv6autoconf else '0') +@contextmanager +def _set_default_route(gateway, family, dev=None): +try: +ipwrapper.routeAdd(['default', 'via', gateway], family=family, dev=dev) +except ipwrapper.IPRoute2Error: # there already is a default route +logging.warning( +'Existing default route will be removed so a new one can be set.') +ipwrapper.routeDel('default', family=family) +ipwrapper.routeAdd(['default', 'via', gateway], family=family, dev=dev) + + def flush(iface, family='both'): ipwrapper.addrFlush(iface, family) -- To view, visit https://gerrit.ovirt.org/65056 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie59c07845898630404ce517e5cc52048e50ed2dd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: canonicalize IPv4 prefix to netmask
Petr Horáček has posted comments on this change. Change subject: net: canonicalize IPv4 prefix to netmask .. Patch Set 2: Verified+1 Passed network/*_test.py and functional/networkTests.py -- To view, visit https://gerrit.ovirt.org/64507 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I344eef120b4c19f90d4dd20c7857bb73ab259e9b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net ifcfg: fix bond rollback
Petr Horáček has posted comments on this change. Change subject: net ifcfg: fix bond rollback .. Patch Set 1: Verified+1 With this patch, network/*_test.py passed OK. It did no break functional/networkTests.py -- To view, visit https://gerrit.ovirt.org/64509 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5cea6ec71c913d74d95317ff7318259d64b40969 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net ifcfg: fix bond rollback
Hello Dan Kenigsberg, Edward Haas, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/64509 to review the following change. Change subject: net ifcfg: fix bond rollback .. net ifcfg: fix bond rollback When setupNetworks(NET, BOND) fails on NET configuration, BOND ifcfg file is removed, but it still exists in the system. We have to remove it manually like we do in removeBonding(). This must be backported to fix new functional tests on 4.0. Change-Id: I5cea6ec71c913d74d95317ff7318259d64b40969 Signed-off-by: Petr HoráčekReviewed-on: https://gerrit.ovirt.org/59940 Reviewed-by: Edward Haas Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg Bug-Url: https://bugzilla.redhat.com/1374194 --- M lib/vdsm/network/configurators/ifcfg.py 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/64509/1 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index ea09dc3..93fae0b 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -723,6 +723,10 @@ if os.path.exists('/sys/class/net/%s/bridge' % dev): # ifdown is not enough to remove nicless bridges commands.execCmd([constants.EXT_BRCTL, 'delbr', dev]) +if _is_bond_name(dev): +if _is_running_bond(dev): +with open(netinfo_bonding.BONDING_MASTERS, 'w') as f: +f.write("-%s\n" % dev) def start_devices(device_ifcfgs): @@ -730,10 +734,8 @@ try: # this is an ugly way to check if this is a bond but picking into # the ifcfg files is even worse. -if dev.startswith('bond') and '.' not in dev: -with open(netinfo_bonding.BONDING_MASTERS) as info: -names = info.read().split() -if dev not in names: +if _is_bond_name(dev): +if not _is_running_bond(dev): with open(netinfo_bonding.BONDING_MASTERS, 'w') as masters: masters.write('+%s\n' % dev) _exec_ifup_by_name(dev) @@ -742,6 +744,16 @@ exc_info=True) +def _is_bond_name(dev): +return dev.startswith('bond') and '.' not in dev + + +def _is_running_bond(bond): +with open(netinfo_bonding.BONDING_MASTERS) as info: +names = info.read().split() +return bond in names + + def _sort_device_ifcfgs(device_ifcfgs): devices = {'Bridge': [], 'Vlan': [], -- To view, visit https://gerrit.ovirt.org/64509 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cea6ec71c913d74d95317ff7318259d64b40969 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: canonicalize IPv4 prefix to netmask
Petr Horáček has uploaded a new change for review. Change subject: net: canonicalize IPv4 prefix to netmask .. net: canonicalize IPv4 prefix to netmask In order to fix OVS switch, this patch moves canonicalization of passed IPv4 prefix into netmask from legacy_switch.py to canonicalize.py. It also adds missing 'prefix' to setupNetworks documentation. Change-Id: I344eef120b4c19f90d4dd20c7857bb73ab259e9b Bug-Url: https://bugzilla.redhat.com/1374194 Signed-off-by: Petr Horáček--- M lib/vdsm/network/api.py M lib/vdsm/network/canonicalize.py M lib/vdsm/network/legacy_switch.py M tests/network/func_static_ip_test.py M tests/network/netfunctestlib.py 5 files changed, 30 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/64507/1 diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py index 799686f..1b5ab48 100644 --- a/lib/vdsm/network/api.py +++ b/lib/vdsm/network/api.py @@ -209,7 +209,7 @@ bonding="" | nic="" (bonding and nics are mutually exclusive) ipaddr="" -netmask="" +netmask="" | prefix= gateway="" bootproto="..." ipv6addr="[/]" diff --git a/lib/vdsm/network/canonicalize.py b/lib/vdsm/network/canonicalize.py index b0bc983..3468796 100644 --- a/lib/vdsm/network/canonicalize.py +++ b/lib/vdsm/network/canonicalize.py @@ -22,6 +22,7 @@ import six from .netinfo import bridges, mtus, bonding, dns +from .netinfo.addresses import prefix2netmask from vdsm import utils from .errors import ConfigNetworkError @@ -47,6 +48,7 @@ _canonicalize_switch_type_net(attrs) _canonicalize_ip_default_route(attrs) _canonicalize_nameservers(attrs) +_canonicalize_prefix(attrs) def canonicalize_bondings(bonds): @@ -138,3 +140,15 @@ data['nameservers'] = dns.get_host_nameservers() else: data['nameservers'] = [] + + +def _canonicalize_prefix(data): +prefix = data.pop('prefix', None) +if prefix: +if 'netmask' in data: +raise ConfigNetworkError( +ne.ERR_BAD_PARAMS, 'Both PREFIX and NETMASK supplied') +try: +data['netmask'] = prefix2netmask(int(prefix)) +except ValueError as ve: +raise ConfigNetworkError(ne.ERR_BAD_ADDR, 'Bad prefix: %s' % ve) diff --git a/lib/vdsm/network/legacy_switch.py b/lib/vdsm/network/legacy_switch.py index 05a62c2..8d426ec 100644 --- a/lib/vdsm/network/legacy_switch.py +++ b/lib/vdsm/network/legacy_switch.py @@ -30,7 +30,6 @@ from vdsm.network import kernelconfig from vdsm.network import libvirt from vdsm.network.netinfo import NET_PATH -from vdsm.network.netinfo import addresses from vdsm.network.netinfo import bridges from vdsm.network.netinfo import mtus from vdsm.network.netinfo import nics as netinfo_nics @@ -187,7 +186,7 @@ @_alter_running_config def _add_network(network, configurator, nameservers, vlan=None, bonding=None, nic=None, ipaddr=None, - netmask=None, prefix=None, mtu=None, gateway=None, + netmask=None, mtu=None, gateway=None, dhcpv6=None, ipv6addr=None, ipv6gateway=None, ipv6autoconf=None, bridged=True, _netinfo=None, hostQos=None, defaultRoute=None, blockingdhcp=False, **options): @@ -201,16 +200,6 @@ if network == '': raise ConfigNetworkError(ne.ERR_BAD_BRIDGE, 'Empty network names are not valid') -if prefix: -if netmask: -raise ConfigNetworkError(ne.ERR_BAD_PARAMS, - 'Both PREFIX and NETMASK supplied') -else: -try: -netmask = addresses.prefix2netmask(int(prefix)) -except ValueError as ve: -raise ConfigNetworkError(ne.ERR_BAD_ADDR, 'Bad prefix: %s' % - ve) logging.debug('Validating network...') if network in _netinfo.networks: diff --git a/tests/network/func_static_ip_test.py b/tests/network/func_static_ip_test.py index 136a44c..e9bfdb2 100644 --- a/tests/network/func_static_ip_test.py +++ b/tests/network/func_static_ip_test.py @@ -108,6 +108,17 @@ with self.setupNetworks(netcreate, bondcreate, NOCHK): self.assertNetworkIp(NETWORK_NAME, netcreate[NETWORK_NAME]) +def test_add_net_with_prefix(self): +with dummy_device() as nic: +network_attrs = {'nic': nic, + 'ipaddr': IPv4_ADDRESS, + 'prefix': IPv4_PREFIX_LEN, + 'switch': self.switch} +netcreate = {NETWORK_NAME: network_attrs} + +with
Change in vdsm[master]: net: canonicalize IPv4 prefix to netmask
Petr Horáček has posted comments on this change. Change subject: net: canonicalize IPv4 prefix to netmask .. Patch Set 3: Verified+1 Passed network/*_test.py and functional/networkTests.py OK. -- To view, visit https://gerrit.ovirt.org/64494 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I344eef120b4c19f90d4dd20c7857bb73ab259e9b Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Ignore missing graphics from VM conf on target host
Petr Horáček has posted comments on this change. Change subject: net: Ignore missing graphics from VM conf on target host .. Patch Set 1: Code-Review-1 (2 comments) https://gerrit.ovirt.org/#/c/64300/1//COMMIT_MSG Commit Message: PS1, Line 10: fir ? https://gerrit.ovirt.org/#/c/64300/1/vdsm/virt/vm_migrate_hook.py File vdsm/virt/vm_migrate_hook.py: Line 82: raise VmMigrationHookError('No devices entity in VM conf') Line 83: Line 84: try: Line 85: _set_graphics(devices, target_vm_conf) Line 86: except VmMigrationMissingDisplayConf: Add TODO to drop the code when we stop supporting version ? Line 87: # Due to a bug in Engine, there can be a scenario where the domxml Line 88: # includes a graphics section, however, the VM config on target does Line 89: # not. In such cases, ignore and do not touch this section. Line 90: pass -- To view, visit https://gerrit.ovirt.org/64300 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8cc730c6448b1f70500c86b3ab39af21fa23bd5a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: canonicalize IPv4 prefix to netmask
Petr Horáček has uploaded a new change for review. Change subject: net: canonicalize IPv4 prefix to netmask .. net: canonicalize IPv4 prefix to netmask In order to simplify static IP handling and fix OVS switch, this patch introduces canonicalization of passed IPv4 prefix into netmask. It also adds missing 'prefix' to setupNetworks documentation. Change-Id: I344eef120b4c19f90d4dd20c7857bb73ab259e9b Bug-Url: https://bugzilla.redhat.com/1374194 Signed-off-by: Petr Horáček--- M lib/vdsm/network/api.py M lib/vdsm/network/canonicalize.py M tests/network/func_static_ip_test.py M tests/network/netfunctestlib.py 4 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/64494/1 diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py index 9350efe..9eae392 100644 --- a/lib/vdsm/network/api.py +++ b/lib/vdsm/network/api.py @@ -209,7 +209,7 @@ bonding="" | nic="" (bonding and nics are mutually exclusive) ipaddr="" -netmask="" +netmask="" | prefix= gateway="" bootproto="..." ipv6addr="[/]" diff --git a/lib/vdsm/network/canonicalize.py b/lib/vdsm/network/canonicalize.py index b0bc983..655db7b 100644 --- a/lib/vdsm/network/canonicalize.py +++ b/lib/vdsm/network/canonicalize.py @@ -22,6 +22,7 @@ import six from .netinfo import bridges, mtus, bonding, dns +from .netinfo.addresses import prefix2netmask from vdsm import utils from .errors import ConfigNetworkError @@ -47,6 +48,7 @@ _canonicalize_switch_type_net(attrs) _canonicalize_ip_default_route(attrs) _canonicalize_nameservers(attrs) +_canonicalize_netmask(attrs) def canonicalize_bondings(bonds): @@ -138,3 +140,9 @@ data['nameservers'] = dns.get_host_nameservers() else: data['nameservers'] = [] + + +def _canonicalize_netmask(data): +prefix = data.pop('prefix', None) +if prefix: +data['netmask'] = prefix2netmask(int(prefix)) diff --git a/tests/network/func_static_ip_test.py b/tests/network/func_static_ip_test.py index 529e01e..d16c56e 100644 --- a/tests/network/func_static_ip_test.py +++ b/tests/network/func_static_ip_test.py @@ -122,6 +122,17 @@ with self.setupNetworks(netcreate, bondcreate, NOCHK): self.assertNetworkIp(NETWORK_NAME, netcreate[NETWORK_NAME]) +def test_add_net_with_prefix(self): +with dummy_device() as nic: +network_attrs = {'nic': nic, + 'ipaddr': IPv4_ADDRESS, + 'prefix': IPv4_PREFIX_LEN, + 'switch': self.switch} +netcreate = {NETWORK_NAME: network_attrs} + +with self.setupNetworks(netcreate, {}, NOCHK): +self.assertNetworkIp(NETWORK_NAME, netcreate[NETWORK_NAME]) + @attr(type='functional', switch='legacy') class NetworkStaticIpBasicLegacyTest(NetworkStaticIpBasicTemplate): diff --git a/tests/network/netfunctestlib.py b/tests/network/netfunctestlib.py index 2d238aa..cdf8d78 100644 --- a/tests/network/netfunctestlib.py +++ b/tests/network/netfunctestlib.py @@ -32,6 +32,7 @@ from vdsm.network.ip import dhclient from vdsm.network.ip.address import ipv6_supported from vdsm.network.link.iface import is_oper_up +from vdsm.network.netinfo.addresses import prefix2netmask from testlib import VdsmTestCase @@ -289,7 +290,8 @@ def assertStaticIPv4(self, netattrs, ipinfo): requires_ipaddress() address = netattrs['ipaddr'] -netmask = netattrs['netmask'] +netmask = (netattrs.get('netmask') or + prefix2netmask(int(netattrs.get('prefix' self.assertEqual(address, ipinfo['addr']) self.assertEqual(netmask, ipinfo['netmask']) ipv4 = ipaddress.IPv4Interface( -- To view, visit https://gerrit.ovirt.org/64494 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I344eef120b4c19f90d4dd20c7857bb73ab259e9b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Log a setup networks transaction failure when using ovs...
Petr Horáček has posted comments on this change. Change subject: net: Log a setup networks transaction failure when using ovs switch .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64415 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I157a93a1cb800d47587eec5fef5a7c3eb08df58d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Setup validation for OVS - Check nics usage
Petr Horáček has posted comments on this change. Change subject: net: Setup validation for OVS - Check nics usage .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64414 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie1ed8805f7e1b84e784feef14c5378b41af1cbf1 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Delete an OVS bridge when the last SB is detached.
Petr Horáček has posted comments on this change. Change subject: net: Delete an OVS bridge when the last SB is detached. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64413 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If1c3ba116be59e3e8716bfc949e2c7ee5b9990f8 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Split OVS setup transaction to adjust for bond setup
Petr Horáček has posted comments on this change. Change subject: net: Split OVS setup transaction to adjust for bond setup .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64412 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0bd351e755be9d5dcaf5a05e5b79345e6f7bcfe8 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Use Linux bonds with OVS networks
Petr Horáček has posted comments on this change. Change subject: net: Use Linux bonds with OVS networks .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64411 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6aeff335949a6e2996f7c3faa524df784dff1b01 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Relocate sysfs_bond_permission to nettestlib
Petr Horáček has posted comments on this change. Change subject: net: Relocate sysfs_bond_permission to nettestlib .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64410 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5016d8453d021d663fe293e17edf87b24c215d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Remove OVS bond implementation.
Petr Horáček has posted comments on this change. Change subject: net: Remove OVS bond implementation. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64409 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3e3d6ba6ecd64bbf22d4be88af6a69ed2f476cea Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: test ovs info with southbound nic
Petr Horáček has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Disable IPv6 on OVS southbound iface (nic or bonding)
Petr Horáček has posted comments on this change. Change subject: net: Disable IPv6 on OVS southbound iface (nic or bonding) .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64407 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id14d37397e0baf5a3fb55bb530ac9dbd1f295013 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Link setup module - includes bond setup logic.
Petr Horáček has posted comments on this change. Change subject: net: Link setup module - includes bond setup logic. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64406 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib8f01a401cb1b96e357bc462e528a2a547c59c24 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Bond - preserve original slaves link state.
Petr Horáček has posted comments on this change. Change subject: net: Bond - preserve original slaves link state. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64405 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia98d01512322f88bf9819532afb2ea337cee7749 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Bond - add refresh method to update bond config
Petr Horáček has posted comments on this change. Change subject: net: Bond - add refresh method to update bond config .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64404 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6f36cc24833b0fc612c3af033c54c7bca4742a5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Bond - Add logging to the bond driver.
Petr Horáček has posted comments on this change. Change subject: net: Bond - Add logging to the bond driver. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64403 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I043a6232d59cd87f6b973d856df297322f4be387 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Bond - adding a transaction context.
Petr Horáček has posted comments on this change. Change subject: net: Bond - adding a transaction context. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64402 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8d015ed235c3620c04131e57ad079a2ec1a0ecc Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Bond - Expose the (kernel) bond list.
Petr Horáček has posted comments on this change. Change subject: net: Bond - Expose the (kernel) bond list. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64401 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3ba2b9d5ec712b268cc3775682506ec83aabbdb8 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Fix reference to CONFFILE_HEADER_BASE which was moved
Petr Horáček has posted comments on this change. Change subject: net: Fix reference to CONFFILE_HEADER_BASE which was moved .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64445 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0e1bd308edbe334e62606572e3edf734cd73fd51 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Expose owned_device method through the configurator
Petr Horáček has posted comments on this change. Change subject: net: Expose owned_device method through the configurator .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64095 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie1febd494c5a01ceecd894e8542c1adb3cda704a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: dhclient - address flush before starting and on shutdown
Petr Horáček has posted comments on this change. Change subject: net: dhclient - address flush before starting and on shutdown .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64400 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6e72f2aeb9f557a4cef49200fe195e6879490dcc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: dhclient kill - early exit if iface does not exists
Petr Horáček has posted comments on this change. Change subject: net: dhclient kill - early exit if iface does not exists .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64399 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ba37ce248f1daeec8e79bd192261c1840417310 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Introduce iface.exists and start using it in ip.dhclient
Petr Horáček has posted comments on this change. Change subject: net: Introduce iface.exists and start using it in ip.dhclient .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64398 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifcece92726e7ef354b4792aee73bfc90fa5f3133 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: ifcfg - dhclient should always be stopped
Petr Horáček has posted comments on this change. Change subject: net: ifcfg - dhclient should always be stopped .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64397 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib60930670b335d02e3878743409fd2e5f4b3e26b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Expose disable IPv6 through ip.address module
Petr Horáček has posted comments on this change. Change subject: net: Expose disable IPv6 through ip.address module .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64396 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0673da939d575ab43d53cdb1fced4273db05e6c7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Use is_link_up instead of operstate in netfunctestlib
Petr Horáček has posted comments on this change. Change subject: net: Use is_link_up instead of operstate in netfunctestlib .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64395 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If32f528ad3afc58394f4071465b321c0012841fd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: For IP-less networks, wait for link-up on ifup execution
Petr Horáček has posted comments on this change. Change subject: net: For IP-less networks, wait for link-up on ifup execution .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64394 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id489fb3b021e6b0658691b1a9a6d6652e75c22ad Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Relocating wait-for-event under its own module.
Petr Horáček has posted comments on this change. Change subject: net: Relocating wait-for-event under its own module. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64393 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie99c93083fd4db7a2d20518c06e70da5bc333a71 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net tests: Set dummy ifaces up by default.
Petr Horáček has posted comments on this change. Change subject: net tests: Set dummy ifaces up by default. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64392 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I217645d2f3a06adec28d3bb30b9cd12f290e2914 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net func tests: Cleanup ifcfg files after each func test.
Petr Horáček has posted comments on this change. Change subject: net func tests: Cleanup ifcfg files after each func test. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64391 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c2757278bb5069aa5138af5c0897ced5f402367 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Adding bond api with sysfs driver under link
Petr Horáček has posted comments on this change. Change subject: net: Adding bond api with sysfs driver under link .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64390 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I75f4f6b370f29411158e288610a1677b52998546 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Adding the 'link' package with an iface module
Petr Horáček has posted comments on this change. Change subject: net: Adding the 'link' package with an iface module .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icb723b8d893575ef14e71cacb6b6e391a6a84831 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: dhclient command - iface name should appear at the tail
Petr Horáček has posted comments on this change. Change subject: net: dhclient command - iface name should appear at the tail .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64388 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied08e77816633c8595482909ef0d5ceb62405dd9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Define netlink netdev flags constants under netlink.link
Petr Horáček has posted comments on this change. Change subject: net: Define netlink netdev flags constants under netlink.link .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64387 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I338c3ad27426fcd67457026c84565a59bf2a6e77 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net test: sourceroute thread crashes due to a test race
Petr Horáček has posted comments on this change. Change subject: net test: sourceroute thread crashes due to a test race .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64386 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f4db3b9dbd846c46c29af8ce097e9942609ce0e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net test: Rename link_test module to netlink_test
Petr Horáček has posted comments on this change. Change subject: net test: Rename link_test module to netlink_test .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64385 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iefcf2789544b2106a5edcc0401195bc8830c5aa8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: net: Consume ifcfg files that have a non vdsm standard name
Petr Horáček has posted comments on this change. Change subject: net: Consume ifcfg files that have a non vdsm standard name .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64096 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0bf70ba936d5de1f17a90742644719216018f674 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Edward HaasGerrit-Reviewer: Anonymous Coward #1001177 Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit bond detached from bridge but still attached to a ...
Petr Horáček has posted comments on this change. Change subject: net: edit bond detached from bridge but still attached to a vlan .. Patch Set 15: Verified+1 Just renamed test class. -- To view, visit https://gerrit.ovirt.org/63723 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0f Gerrit-PatchSet: 15 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net tests: bond tests fails on CI with ctypes.AttributeError
Petr Horáček has uploaded a new change for review. Change subject: net tests: bond tests fails on CI with ctypes.AttributeError .. net tests: bond tests fails on CI with ctypes.AttributeError Change-Id: I6c88dd66056cbb1f65f77e8b1a7cf1f03e4fb80a --- M tests/network/link_bond_test.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/64345/1 diff --git a/tests/network/link_bond_test.py b/tests/network/link_bond_test.py index a610f63..7eb8b00 100644 --- a/tests/network/link_bond_test.py +++ b/tests/network/link_bond_test.py @@ -20,12 +20,15 @@ from contextlib import contextmanager +import ctypes + from nose.plugins.attrib import attr from nose.plugins.skip import SkipTest from testlib import VdsmTestCase as TestCaseBase from .nettestlib import dummy_devices +from testValidation import broken_on_ci from vdsm.network.link import iface from vdsm.network.link.bond import Bond @@ -41,16 +44,19 @@ @attr(type='integration') class LinkBondTests(TestCaseBase): +@broken_on_ci(exception=ctypes.ArgumentError) def test_bond_without_slaves(self): with bond_device() as bond: self.assertFalse(iface.is_up(bond.master)) +@broken_on_ci(exception=ctypes.ArgumentError) def test_bond_with_slaves(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as bond: bond.add_slaves((nic1, nic2)) self.assertFalse(iface.is_up(bond.master)) +@broken_on_ci(exception=ctypes.ArgumentError) def test_bond_devices_are_up(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as bond: @@ -60,6 +66,7 @@ self.assertTrue(iface.is_up(nic2)) self.assertTrue(iface.is_up(bond.master)) +@broken_on_ci(exception=ctypes.ArgumentError) def test_bond_exists(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as _bond: @@ -77,6 +84,7 @@ expected_bond_set = set([b1.master, b2.master, b3.master]) self.assertLessEqual(expected_bond_set, actual_bond_set) +@broken_on_ci(exception=ctypes.ArgumentError) def test_bond_create_failure_on_slave_add(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as base_bond: @@ -89,6 +97,7 @@ broken_bond.add_slaves((nic1, nic2)) self.assertFalse(Bond(bond_name).exists()) +@broken_on_ci(exception=ctypes.ArgumentError) def test_bond_edit_failure_on_slave_add(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as base_bond, bond_device() as edit_bond: -- To view, visit https://gerrit.ovirt.org/64345 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c88dd66056cbb1f65f77e8b1a7cf1f03e4fb80a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net test: shared nic between bond and network
Petr Horáček has posted comments on this change. Change subject: net test: shared nic between bond and network .. Patch Set 3: Verified+1 Passed network/*_test.py OK. -- To view, visit https://gerrit.ovirt.org/64206 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice4ead640d45d0717d2a30bd01398cbbfff3f88a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit bond detached from bridge but still attached to a ...
Petr Horáček has posted comments on this change. Change subject: net: edit bond detached from bridge but still attached to a vlan .. Patch Set 14: Verified+1 Passed network/*_test.py OK. -- To view, visit https://gerrit.ovirt.org/63723 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0f Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit bond detached from bridge but still attached to a ...
Petr Horáček has posted comments on this change. Change subject: net: edit bond detached from bridge but still attached to a vlan .. Patch Set 11: (1 comment) https://gerrit.ovirt.org/#/c/63723/11/tests/network/func_net_bond_test.py File tests/network/func_net_bond_test.py: > Can you rename this to func_net_with_bond_test ? Done Line 1: # Copyright 2016 Red Hat, Inc. Line 2: # Line 3: # This program is free software; you can redistribute it and/or modify Line 4: # it under the terms of the GNU General Public License as published by -- To view, visit https://gerrit.ovirt.org/63723 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0f Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net test: shared nic between bond and network
Petr Horáček has posted comments on this change. Change subject: net test: shared nic between bond and network .. Patch Set 1: -Verified (3 comments) https://gerrit.ovirt.org/#/c/64206/1/tests/network/func_net_bond_test.py File tests/network/func_net_bond_test.py: PS1, Line 60: test_add_the_same_nic_to_net_and_bond > test_add_the_same_nic_to_net_and_bond_in_one_step Done PS1, Line 69: test_attach_nic_attached_to_a_network_to_a_bond > test_add_bond_with_nic_that_is_already_used_by_network Done PS1, Line 79: test_attach_nic_attached_to_a_bond_to_a_network > test_add_network_with_nic_that_is_already_used_by_bond Done -- To view, visit https://gerrit.ovirt.org/64206 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice4ead640d45d0717d2a30bd01398cbbfff3f88a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Consume ifcfg files that have a non vdsm standard name
Petr Horáček has posted comments on this change. Change subject: net: Consume ifcfg files that have a non vdsm standard name .. Patch Set 4: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/63990/4/lib/vdsm/network/configurators/ifcfg.py File lib/vdsm/network/configurators/ifcfg.py: Line 236: DynamicSourceRoute.addInterfaceTracking(netEnt) Line 237: Line 238: def removeBond(self, bonding): Line 239: if not self.owned_device(bonding.name): Line 240: self.normalize_device_filename(bonding.name) > As far as I know, network caps is generated from actual kernel settings, an For networks I guess it would be somehow 'emergency' removed. Not sure about bonds. I can't imagine a situation where would the additional check hurt. Line 241: to_be_removed = self._ifaceDownAndCleanup(bonding) Line 242: if to_be_removed: Line 243: self.configApplier.removeBonding(bonding.name) Line 244: if bonding.on_removal_just_detach_from_network: -- To view, visit https://gerrit.ovirt.org/63990 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0bf70ba936d5de1f17a90742644719216018f674 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michael Burman Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Consume ifcfg files that have a non vdsm standard name
Petr Horáček has posted comments on this change. Change subject: net: Consume ifcfg files that have a non vdsm standard name .. Patch Set 4: Code-Review-1 (2 comments) https://gerrit.ovirt.org/#/c/63990/4/lib/vdsm/network/configurators/ifcfg.py File lib/vdsm/network/configurators/ifcfg.py: Line 236: DynamicSourceRoute.addInterfaceTracking(netEnt) Line 237: Line 238: def removeBond(self, bonding): Line 239: if not self.owned_device(bonding.name): Line 240: self.normalize_device_filename(bonding.name) do we need to handle removals and editations? if we acquired iface in configure*, it must be already renamed. Line 241: to_be_removed = self._ifaceDownAndCleanup(bonding) Line 242: if to_be_removed: Line 243: self.configApplier.removeBonding(bonding.name) Line 244: if bonding.on_removal_just_detach_from_network: https://gerrit.ovirt.org/#/c/63990/4/tests/network/func_net_basic_test.py File tests/network/func_net_basic_test.py: Line 71: class NetworkBasicLegacyTest(NetworkBasicTemplate): Line 72: __test__ = True Line 73: switch = 'legacy' Line 74: Line 75: def test_add_net_based_on_device_with_non_standard_ifcfg_file(self): please add a TODO, we need this also for ifacquire (OVS) Line 76: with dummy_device() as nic: Line 77: NETCREATE = {NETWORK_NAME: {'nic': nic, 'switch': self.switch}} Line 78: NETREMOVE = {NETWORK_NAME: {'remove': True}} Line 79: with self.setupNetworks(NETCREATE, {}, NOCHK): -- To view, visit https://gerrit.ovirt.org/63990 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0bf70ba936d5de1f17a90742644719216018f674 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michael Burman Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Setup validation for OVS - Check nics usage
Petr Horáček has posted comments on this change. Change subject: net: Setup validation for OVS - Check nics usage .. Patch Set 5: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/64212/4/lib/vdsm/network/ovs/validator.py File lib/vdsm/network/ovs/validator.py: PS4, Line 80: get('nic') > Nope, that will not work when key exists with value of None. aha, sorry, i see now -- To view, visit https://gerrit.ovirt.org/64212 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie1ed8805f7e1b84e784feef14c5378b41af1cbf1 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Log a setup networks transaction failure when using ovs...
Petr Horáček has posted comments on this change. Change subject: net: Log a setup networks transaction failure when using ovs switch .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64242 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I157a93a1cb800d47587eec5fef5a7c3eb08df58d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Setup validation for OVS - Check nics usage
Petr Horáček has posted comments on this change. Change subject: net: Setup validation for OVS - Check nics usage .. Patch Set 4: Code-Review-1 (3 comments) https://gerrit.ovirt.org/#/c/64212/4/lib/vdsm/network/netswitch.py File lib/vdsm/network/netswitch.py: PS4, Line 182: ovs_nets = ovs_info.create_netinfo(_ovs_info)['networks'] : ovs_switch.validator.validate_nic_usage( : nets2add, bonds2add, : _get_kernel_nets_nics(ovs_nets), _get_kernel_bonds_slaves()) cant we move most if this to validator and keep just 'ovs_switch.validator.validate_nic_usage(nets2add, bonds2add) here? it's a mess https://gerrit.ovirt.org/#/c/64212/4/lib/vdsm/network/ovs/validator.py File lib/vdsm/network/ovs/validator.py: PS4, Line 43: new_bond this matches not only new bonds, but also ones we want to edit. is this change related to validate_nic_usage? PS4, Line 80: get('nic') or get('nic', []), but i guess your code is more explicit -- To view, visit https://gerrit.ovirt.org/64212 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie1ed8805f7e1b84e784feef14c5378b41af1cbf1 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Delete an OVS bridge when the last SB is detached.
Petr Horáček has posted comments on this change. Change subject: net: Delete an OVS bridge when the last SB is detached. .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64192 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If1c3ba116be59e3e8716bfc949e2c7ee5b9990f8 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Split OVS setup transaction to adjust for bond setup
Petr Horáček has posted comments on this change. Change subject: net: Split OVS setup transaction to adjust for bond setup .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/64118 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0bd351e755be9d5dcaf5a05e5b79345e6f7bcfe8 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net test: shared nic between bond and network
Petr Horáček has posted comments on this change. Change subject: net test: shared nic between bond and network .. Patch Set 1: Verified-1 Fails for OVS, we must fix verification and exception raising. -- To view, visit https://gerrit.ovirt.org/64206 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice4ead640d45d0717d2a30bd01398cbbfff3f88a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Split OVS setup transaction to adjust for bond setup
Petr Horáček has posted comments on this change. Change subject: net: Split OVS setup transaction to adjust for bond setup .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/64118/4/lib/vdsm/network/netswitch.py File lib/vdsm/network/netswitch.py: Line 202: Line 203: def _add_networks(nets2add, ovs_info, config, acq): Line 204: net_add_setup = ovs_switch.create_network_addition_setup(ovs_info) Line 205: net_add_setup.add(nets2add) Line 206: acq.acquire(net_add_setup.acquired_ifaces) > net_add_setup.add(nets2add) is done in a transaction, so we save it was suc before we gathered ifaces to be acquired, acquired them and then transaction was commited. thanks to that, we marked ifaces as ours before system changes (no time for NM to break it) Line 207: for net, attrs in six.iteritems(nets2add): Line 208: config.setNetwork(net, attrs) Line 209: Line 210: -- To view, visit https://gerrit.ovirt.org/64118 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0bd351e755be9d5dcaf5a05e5b79345e6f7bcfe8 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net test: shared nic between bond and network
Petr Horáček has uploaded a new change for review. Change subject: net test: shared nic between bond and network .. net test: shared nic between bond and network Change-Id: Ice4ead640d45d0717d2a30bd01398cbbfff3f88a Signed-off-by: Petr Horáček--- M tests/network/func_net_bond_test.py 1 file changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/64206/1 diff --git a/tests/network/func_net_bond_test.py b/tests/network/func_net_bond_test.py index 0605396..e13140a 100644 --- a/tests/network/func_net_bond_test.py +++ b/tests/network/func_net_bond_test.py @@ -22,9 +22,10 @@ from nose.plugins.attrib import attr +from vdsm.network import errors as ne from vdsm.network.configurators.ifcfg import ifup, ifdown -from .netfunctestlib import NetFuncTestCase, NOCHK +from .netfunctestlib import NetFuncTestCase, SetupNetworksError, NOCHK from .nettestlib import dummy_device NETWORK1_NAME = 'test-network1' @@ -56,6 +57,35 @@ self.assertBond(BOND_NAME, BONDCREATE[BOND_NAME]) +def test_add_the_same_nic_to_net_and_bond(self): +with dummy_device() as nic: +NETCREATE = {NETWORK1_NAME: {'nic': nic, 'switch': self.switch}} +BONDCREATE = {BOND_NAME: {'nics': [nic], 'switch': self.switch}} + +with self.assertRaises(SetupNetworksError) as e: +self.setupNetworks(NETCREATE, BONDCREATE, NOCHK) +self.assertEqual(e.exception.status, ne.ERR_USED_NIC) + +def test_attach_nic_attached_to_a_network_to_a_bond(self): +with dummy_device() as nic: +NETCREATE = {NETWORK1_NAME: {'nic': nic, 'switch': self.switch}} +BONDCREATE = {BOND_NAME: {'nics': [nic], 'switch': self.switch}} + +with self.setupNetworks(NETCREATE, {}, NOCHK): +with self.assertRaises(SetupNetworksError) as e: +self.setupNetworks({}, BONDCREATE, NOCHK) +self.assertEqual(e.exception.status, ne.ERR_USED_NIC) + +def test_attach_nic_attached_to_a_bond_to_a_network(self): +with dummy_device() as nic: +NETCREATE = {NETWORK1_NAME: {'nic': nic, 'switch': self.switch}} +BONDCREATE = {BOND_NAME: {'nics': [nic], 'switch': self.switch}} + +with self.setupNetworks({}, BONDCREATE, NOCHK): +with self.assertRaises(SetupNetworksError) as e: +self.setupNetworks(NETCREATE, {}, NOCHK) +self.assertEqual(e.exception.status, ne.ERR_USED_NIC) + @attr(type='functional', switch='legacy') class BondBasicLegacyTest(BondBasicTemplate): -- To view, visit https://gerrit.ovirt.org/64206 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice4ead640d45d0717d2a30bd01398cbbfff3f88a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: edit bond detached from bridge but still attached to a ...
Petr Horáček has posted comments on this change. Change subject: net: edit bond detached from bridge but still attached to a vlan .. Patch Set 9: Verified-1 Test is not using both switches -- To view, visit https://gerrit.ovirt.org/63723 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0f Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Delete an OVS bridge when the last SB is detached.
Petr Horáček has posted comments on this change. Change subject: net: Delete an OVS bridge when the last SB is detached. .. Patch Set 1: Code-Review+1 Really nice -- To view, visit https://gerrit.ovirt.org/64192 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If1c3ba116be59e3e8716bfc949e2c7ee5b9990f8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Split OVS setup transaction to adjust for bond setup
Petr Horáček has posted comments on this change. Change subject: net: Split OVS setup transaction to adjust for bond setup .. Patch Set 4: (3 comments) https://gerrit.ovirt.org/#/c/64118/4/lib/vdsm/network/netswitch.py File lib/vdsm/network/netswitch.py: Line 202: Line 203: def _add_networks(nets2add, ovs_info, config, acq): Line 204: net_add_setup = ovs_switch.create_network_addition_setup(ovs_info) Line 205: net_add_setup.add(nets2add) Line 206: acq.acquire(net_add_setup.acquired_ifaces) but we should acquire before we commit add(), right? Line 207: for net, attrs in six.iteritems(nets2add): Line 208: config.setNetwork(net, attrs) Line 209: Line 210: https://gerrit.ovirt.org/#/c/64118/4/lib/vdsm/network/ovs/switch.py File lib/vdsm/network/ovs/switch.py: Line 122: # FIXME: What about an existing bond? Line 123: if nic is not None and vlan is None: Line 124: self._copy_nic_hwaddr_to_nb(net, nic) Line 125: Line 126: self._ovs_info.northbounds_by_sb.setdefault(sb, set()) .add(net) won't fit here? Line 127: self._ovs_info.northbounds_by_sb[sb].add(net) Line 128: Line 129: @property Line 130: def acquired_ifaces(self): Line 197: """ Line 198: return [ovsdb.del_br(bridge) for bridge in _unused_bridges()] Line 199: Line 200: Line 201: # TODO: we can just check for bridges with no NB port can we address this? we detach both NICs and bonds from bridge when not used anymore. Line 202: def _unused_bridges(): Line 203: unused_bridges = set() Line 204: ovs_info = info.OvsInfo() Line 205: for bridge, attrs in six.iteritems(ovs_info.bridges): -- To view, visit https://gerrit.ovirt.org/64118 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0bd351e755be9d5dcaf5a05e5b79345e6f7bcfe8 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: net: Use Linux bonds with OVS networks
Petr Horáček has posted comments on this change. Change subject: net: Use Linux bonds with OVS networks .. Patch Set 31: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63119 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6aeff335949a6e2996f7c3faa524df784dff1b01 Gerrit-PatchSet: 31 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org