Change in vdsm[master]: nettests: use a constant dict NOCHK
danken at redhat.com
danken at redhat.com
Thu Feb 6 14:32:14 UTC 2014
Dan Kenigsberg has uploaded a new change for review.
Change subject: nettests: use a constant dict NOCHK
......................................................................
nettests: use a constant dict NOCHK
The options {'connectivityCheck': False} are very common, lets make it
easier to use them.
Change-Id: I06bed9ca60272d94d157f278fdf23e354dbf29dd
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/24166/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 5484e99..9d9fcbc 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -66,6 +66,8 @@
dummyPool = set()
DUMMY_POOL_SIZE = 5
+NOCHK = {'connectivityCheck': False}
+
def setupModule():
"""Persists network configuration."""
@@ -316,7 +318,7 @@
{NETWORK_NAME + '0': {'bonding': BONDING_NAME,
'bridged': False}},
{BONDING_NAME: {'nics': nics}},
- {'connectivityCheck': False})
+ NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertBondExists(BONDING_NAME, nics)
@@ -325,20 +327,20 @@
{NETWORK_NAME:
{'bonding': BONDING_NAME, 'bridged': bridged,
'vlan': VLAN_ID}},
- {}, {'connectivityCheck': False})
+ {}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME, bridged)
status, msg = self.vdsm_net.setupNetworks(
{NETWORK_NAME: {'remove': True},
NETWORK_NAME + '0': {'remove': True}},
- {}, {'connectivityCheck': False})
+ {}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertBondExists(BONDING_NAME, nics)
status, msg = self.vdsm_net.setupNetworks(
{},
- {BONDING_NAME: {'remove': True}}, {'connectivityCheck': False})
+ {BONDING_NAME: {'remove': True}}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
@cleanupNet
@@ -651,20 +653,20 @@
def testSetupNetworksNicless(self):
status, msg = self.vdsm_net.setupNetworks(
{NETWORK_NAME: {'bridged': True}}, {},
- {'connectivityCheck': False})
+ NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME)
status, msg = self.vdsm_net.setupNetworks(
{NETWORK_NAME: dict(remove=True)}, {},
- {'connectivityCheck': False})
+ NOCHK)
self.assertEqual(status, SUCCESS, msg)
@cleanupNet
def testSetupNetworksNiclessBridgeless(self):
status, msg = self.vdsm_net.setupNetworks(
{NETWORK_NAME: {'bridged': False}}, {},
- {'connectivityCheck': False})
+ NOCHK)
self.assertEqual(status, neterrors.ERR_BAD_PARAMS, msg)
@cleanupNet
@@ -672,13 +674,12 @@
@ValidateRunningAsRoot
def testSetupNetworksConvertVlanNetBridgeness(self):
"Convert a bridged networks to a bridgeless one and viceversa"
- opts = {'connectivityCheck': False}
- def setupNetworkBridged(nic, bridged, opts=opts):
+ def setupNetworkBridged(nic, bridged):
networks = {NETWORK_NAME: dict(vlan=VLAN_ID,
nic=nic, bridged=bridged)}
status, msg = self.vdsm_net.setupNetworks(networks, {},
- opts)
+ NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME, bridged)
@@ -689,7 +690,7 @@
status, msg = self.vdsm_net.setupNetworks({NETWORK_NAME:
dict(remove=True)},
- {}, opts)
+ {}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
@@ -1408,7 +1409,7 @@
{'nic': nics[0], 'bridged': bridged, 'ipaddr': IP_ADDRESS,
'netmask': prefix2netmask(int(IP_CIDR)),
'gateway': IP_GATEWAY}},
- {}, {'connectivityCheck': False})
+ {}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME, bridged)
@@ -1431,7 +1432,7 @@
status, msg = self.vdsm_net.setupNetworks(
{NETWORK_NAME: {'remove': True}},
- {}, {'connectivityCheck': False})
+ {}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
# Assert that routes and rules don't exist
@@ -1637,7 +1638,7 @@
'vlan': VLAN_ID, 'mtu': BIG_MTU}},
{BONDING_NAME:
{'nics': nics}},
- {'connectivityCheck': False})
+ NOCHK)
deviceLinks = getLinks()
deviceNames = [device.name for device in deviceLinks]
@@ -1663,7 +1664,7 @@
status, msg = self.vdsm_net.setupNetworks(
{NETWORK_NAME: {'remove': True}},
{BONDING_NAME: {'remove': True}},
- {'connectivityCheck': False})
+ NOCHK)
@cleanupNet
@RequireVethMod
@@ -1675,14 +1676,13 @@
with dnsmasqDhcp(left):
network = {NETWORK_NAME: {'nic': right, 'bridged': False,
'bootprot': 'dhcp'}}
- options = {'connectivityCheck': 0}
- status, msg = self.vdsm_net.setupNetworks(network, {}, options)
+ status, msg = self.vdsm_net.setupNetworks(network, {}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME)
network = {NETWORK_NAME: {'remove': True}}
- status, msg = self.vdsm_net.setupNetworks(network, {}, options)
+ status, msg = self.vdsm_net.setupNetworks(network, {}, NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkDoesntExist(NETWORK_NAME)
@@ -1728,18 +1728,18 @@
network = {NETWORK_NAME: {'nic': nic, 'vlan': VLAN_ID,
'bridged': False}}
status, msg = self.vdsm_net.setupNetworks(network, {},
- {'connectivityCheck': 0})
+ NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME)
ipwrapper.linkDel(nic + '.' + VLAN_ID)
self.vdsm_net.refreshNetinfo()
self.assertNotIn(NETWORK_NAME, self.vdsm_net.netinfo.networks)
status, msg = self.vdsm_net.setupNetworks(network, {},
- {'connectivityCheck': 0})
+ NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME)
network[NETWORK_NAME] = {'remove': True}
status, msg = self.vdsm_net.setupNetworks(network, {},
- {'connectivityCheck': 0})
+ NOCHK)
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkDoesntExist(NETWORK_NAME)
--
To view, visit http://gerrit.ovirt.org/24166
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06bed9ca60272d94d157f278fdf23e354dbf29dd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
More information about the vdsm-patches
mailing list