Giuseppe Vallarelli has uploaded a new change for review. Change subject: tests: setupNetworks add one or more vlans. ......................................................................
tests: setupNetworks add one or more vlans. Added a couple of functional tests: * testSetupNetworksAddVlan * testSetupNetworksAddManyVlans covering the behaviour of setupNetworks when adding one or more vlans. Change-Id: I62fa6de1faa7d4e886c45361a001b0009fd92502 Signed-off-by: Giuseppe Vallarelli <[email protected]> --- M tests/functional/networkTests.py 1 file changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/17432/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 4d43859..6f64872 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -321,3 +321,58 @@ nics=nics, opts={'bridged': bridged}) self.assertEqual(status, neterrors.ERR_BAD_BRIDGE, msg) + + @permutations([[True], [False]]) + @RequireDummyMod + @ValidateRunningAsRoot + def testSetupNetworksAddVlan(self, bridged): + with dummyIf(1) as nics: + with self.vdsm_net.pinger(): + nic = nics[0] + attrs = dict(vlan=VLAN_ID, nic=nic, bridged=bridged) + status, msg = self.vdsm_net.setupNetworks({NETWORK_NAME: + attrs}, {}, {}) + + self.assertEqual(status, SUCCESS, msg) + self.assertTrue(self.vdsm_net.networkExists(NETWORK_NAME)) + self.assertTrue(self.vdsm_net.vlanExists('%s.%s' % + (nic, VLAN_ID))) + + status, msg = self.vdsm_net.setupNetworks({NETWORK_NAME: + dict(remove=True)}, + {}, {}) + self.assertEqual(status, SUCCESS, msg) + + @permutations([[True], [False]]) + @RequireDummyMod + @ValidateRunningAsRoot + def testSetupNetworksAddManyVlans(self, bridged): + VLAN_COUNT = 5 + NET_VLANS = [(NETWORK_NAME + str(id), str(id)) + for id in xrange(VLAN_COUNT)] + + with dummyIf(1) as nics: + nic = nics[0] + networks = dict((vlan_net, + {'vlan': str(tag), 'nic': nic, + 'bridged': bridged}) + for vlan_net, tag in NET_VLANS) + + with self.vdsm_net.pinger(): + status, msg = self.vdsm_net.setupNetworks(networks, {}, {}) + self.assertEqual(status, SUCCESS, msg) + + for vlan_net, tag in NET_VLANS: + self.assertTrue(self.vdsm_net.networkExists(vlan_net, + bridged)) + self.assertTrue(self.vdsm_net.vlanExists(nic + '.' + tag)) + + with self.vdsm_net.pinger(): + for vlan_net, tag in NET_VLANS: + status, msg = self.vdsm_net.setupNetworks( + {vlan_net: {'remove': True}}, {}, {}) + self.assertEqual(status, SUCCESS, msg) + self.assertFalse(self.vdsm_net.networkExists(vlan_net, + bridged)) + self.assertFalse( + self.vdsm_net.vlanExists(nic + '.' + tag)) -- To view, visit http://gerrit.ovirt.org/17432 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62fa6de1faa7d4e886c45361a001b0009fd92502 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Giuseppe Vallarelli <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
