Change in vdsm[master]: net: test ovs info with southbound nic
gerrit-hooks has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 4: * Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master 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: 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 ovs info with southbound nic
Dan Kenigsberg has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 3: Code-Review+2 raising -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master 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: 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 ovs info with southbound nic
Dan Kenigsberg has submitted this change and it was merged. Change subject: net: test ovs info with southbound nic .. net: test ovs info with southbound nic We will remove OVS bonding support in a following patch. This patch changes ovs_info_test.py to test OVS network with attached southbound nic. Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Signed-off-by: Petr Horáček Reviewed-on: https://gerrit.ovirt.org/63999 Continuous-Integration: Jenkins CI Reviewed-by: Edward Haas Reviewed-by: Dan Kenigsberg --- M tests/network/ovs_info_test.py 1 file changed, 89 insertions(+), 116 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Dan Kenigsberg: Looks good to me, approved Edward Haas: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master 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 ___ 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 ovs info with southbound nic
Edward Haas has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master 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: 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 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 3: Verified+1 (1 comment) Passed network/*_test.py OK https://gerrit.ovirt.org/#/c/63999/2//COMMIT_MSG Commit Message: PS2, Line 10: te > drop Done -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master 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: test ovs info with southbound nic
gerrit-hooks has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 3: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI 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 ovs info with southbound nic
Edward Haas has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 2: Code-Review-1 (1 comment) small nit https://gerrit.ovirt.org/#/c/63999/2//COMMIT_MSG Commit Message: PS2, Line 10: is drop -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI 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 ovs info with southbound nic
gerrit-hooks has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 2: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: net: test ovs info with southbound nic
gerrit-hooks has posted comments on this change. Change subject: net: test ovs info with southbound nic .. Patch Set 1: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/63999 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: net: test ovs info with southbound nic
Petr Horáček has uploaded a new change for review. Change subject: net: test ovs info with southbound nic .. net: test ovs info with southbound nic We will remove OVS bonding support in a following patch. This patch changes ovs_info_test.py to is test OVS network with attached southbound nic. Change-Id: Idd3ab225172a0edfda9bb998c509ed3c2e318401 Signed-off-by: Petr Horáček --- M tests/network/ovs_info_test.py 1 file changed, 88 insertions(+), 124 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/63999/1 diff --git a/tests/network/ovs_info_test.py b/tests/network/ovs_info_test.py index 34e6f1f..e5f70f6 100644 --- a/tests/network/ovs_info_test.py +++ b/tests/network/ovs_info_test.py @@ -24,7 +24,7 @@ from nose.plugins.attrib import attr from .nettestlib import dummy_device -from .ovsnettestlib import OvsService, TEST_BRIDGE, TEST_BOND +from .ovsnettestlib import OvsService, TEST_BRIDGE from monkeypatch import MonkeyPatch from testValidation import ValidateRunningAsRoot from testlib import VdsmTestCase @@ -37,26 +37,23 @@ TEST_ADDRESS = '192.168.1.10' TEST_NETMASK = '255.255.255.0' TEST_ADDRESS_WITH_PREFIX = '192.168.1.10/24' +TEST_NIC = 'eth0' TEST_VLAN = 10 -TEST_VLANED_BOND = '%s.%s' % (TEST_BOND, TEST_VLAN) +TEST_VLANED_NIC = '%s.%s' % (TEST_NIC, TEST_VLAN) TEST_VLANED_NETWORK = 'test-network' + str(TEST_VLAN) @contextmanager -def _setup_ovs_network(ovsdb, nic1, nic2): +def _setup_ovs_network(ovsdb, sb_iface): def _bridge(): return ovsdb.add_br(TEST_BRIDGE) -def _bond(): +def _attach_southbound(): commands = [] -commands.append(ovsdb.add_bond(TEST_BRIDGE, TEST_BOND, [nic1, nic2])) +commands.append(ovsdb.add_port(TEST_BRIDGE, sb_iface)) commands.append(ovsdb.set_port_attr( -TEST_BOND, 'bond_mode', 'active-backup')) -commands.append(ovsdb.set_port_attr( -TEST_BOND, 'other_config:bond-detect-mode', 'carrier')) -commands.append(ovsdb.set_port_attr( -TEST_BOND, 'other_config:vdsm_level', info.SOUTHBOUND)) +sb_iface, 'other_config:vdsm_level', info.SOUTHBOUND)) return commands def _northbound_port(): @@ -72,7 +69,7 @@ with ovsdb.transaction() as t: t.add(_bridge()) -t.add(*_bond()) +t.add(*_attach_southbound()) t.add(*_northbound_port()) try: @@ -93,51 +90,36 @@ def tearDown(self): self.ovs_service.teardown() -def test_ovs_info(self): -with dummy_device() as nic1, dummy_device() as nic2: -with _setup_ovs_network(self.ovsdb, nic1, nic2): +def test_ovs_info_with_sb_nic(self): +with dummy_device() as nic: +with _setup_ovs_network(self.ovsdb, nic): expected_bridges = { TEST_BRIDGE: { 'stp': False, 'ports': { -TEST_BOND: { -'bond': { -'fake_iface': False, -'lacp': None, -'bond_mode': 'active-backup', -'other_config:bond-detect-mode': 'carrier', -'other_config:bond-miimon-interval': None, -'slaves': sorted([nic1, nic2]) -}, -'level': info.SOUTHBOUND, -'tag': None -}, TEST_VLANED_NETWORK: { -'bond': None, 'level': info.NORTHBOUND, 'tag': TEST_VLAN }, TEST_BRIDGE: { -'bond': None, 'level': None, +'tag': None +}, +nic: { +'level': info.SOUTHBOUND, 'tag': None } } } } -expected_bridges_by_sb = {TEST_BOND: TEST_BRIDGE} ovs_info = info.OvsInfo() obtained_bridges = ovs_info.bridges -# Normalize obtained_bridges (remove 'active_slave') -obtained_bridges[TEST_BRIDGE]['ports'][TEST_BOND]['bond'].pop( -'active_slave') self.assertEqual(obtained_bridges, expected_bridges) obtained_bridges_by_sb = ovs_info.bridges_by_sb -self.assertEqual( -obtained_bridges_by_sb, expected_bridges_by_sb) +self.assertEqual(obtained_br