Petr Horáček has uploaded a new change for review. Change subject: net func test: test network based on a vlan ......................................................................
net func test: test network based on a vlan Change-Id: I654af5a81518c2b51ac8694b1ed307aad004a256 Signed-off-by: Petr Horáček <[email protected]> --- M tests/network/func_net_basic_test.py M tests/network/netfunctestlib.py 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/59622/1 diff --git a/tests/network/func_net_basic_test.py b/tests/network/func_net_basic_test.py index f74ac9e..a4075bf 100644 --- a/tests/network/func_net_basic_test.py +++ b/tests/network/func_net_basic_test.py @@ -26,6 +26,7 @@ from .nettestlib import dummy_device NETWORK_NAME = 'test-network' +VLAN = 10 @attr(type='functional') @@ -46,14 +47,31 @@ self.setupNetworks(NETREMOVE, {}, NOCHK) self.assertNetwork(NETWORK_NAME, NETREMOVE[NETWORK_NAME]) + def test_add_net_based_on_vlan(self): + with dummy_device() as nic: + NETCREATE = {NETWORK_NAME: {'nic': nic, 'vlan': VLAN, + 'switch': self.switch}} + with self.setupNetworks(NETCREATE, {}, NOCHK): + self.assertNetwork(NETWORK_NAME, NETCREATE[NETWORK_NAME]) + + def test_remove_net_based_on_vlan(self): + with dummy_device() as nic: + NETCREATE = {NETWORK_NAME: {'nic': nic, 'vlan': VLAN, + 'switch': self.switch}} + NETREMOVE = {NETWORK_NAME: {'remove': True}} + with self.setupNetworks(NETCREATE, {}, NOCHK): + self.setupNetworks(NETREMOVE, {}, NOCHK) + self.assertNetwork(NETWORK_NAME, NETREMOVE[NETWORK_NAME]) + self.assertNoVlanExists('{}.{}'.format(nic, VLAN)) + @attr(type='functional', switch='legacy') -class NetworkCreateBasicLegacyTest(NetworkBasicTemplate): +class NetworkBasicLegacyTest(NetworkBasicTemplate): __test__ = True switch = 'legacy' @attr(type='functional', switch='ovs') -class NetworkCreateBasicOvsTest(NetworkBasicTemplate): +class NetworkBasicOvsTest(NetworkBasicTemplate): __test__ = True switch = 'ovs' diff --git a/tests/network/netfunctestlib.py b/tests/network/netfunctestlib.py index 85fc3f6..e513b04 100644 --- a/tests/network/netfunctestlib.py +++ b/tests/network/netfunctestlib.py @@ -172,6 +172,9 @@ def assertNoBridgeExists(self, bridge): self.assertNotIn(bridge, self.netinfo.bridges) + def assertNoVlanExists(self, vlan): + self.assertNotIn(vlan, self.netinfo.vlans) + def assertNoNetworkExistsInRunning(self, net): if not USING_UNIFIED_PERSISTENCE: return -- To view, visit https://gerrit.ovirt.org/59622 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I654af5a81518c2b51ac8694b1ed307aad004a256 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/admin/lists/[email protected]
