Change in vdsm[ovirt-3.4]: nettests: use a constant dict NOCHK

danken at redhat.com danken at redhat.com
Sun Mar 30 21:15:02 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>
Reviewed-on: http://gerrit.ovirt.org/24166
Reviewed-by: Antoni Segura Puimedon <asegurap 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/23/26223/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 9a14b6a..0f7a618 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -64,6 +64,8 @@
 dummyPool = set()
 DUMMY_POOL_SIZE = 5
 
+NOCHK = {'connectivityCheck': False}
+
 
 def setupModule():
     """Persists network configuration."""
@@ -302,7 +304,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)
 
@@ -311,20 +313,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
@@ -675,20 +677,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
@@ -696,13 +698,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)
 
@@ -713,7 +714,7 @@
 
             status, msg = self.vdsm_net.setupNetworks({NETWORK_NAME:
                                                        dict(remove=True)},
-                                                      {}, opts)
+                                                      {}, NOCHK)
 
         self.assertEqual(status, SUCCESS, msg)
 
@@ -1428,7 +1429,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)
 
@@ -1451,7 +1452,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
@@ -1657,7 +1658,7 @@
                         'vlan': VLAN_ID, 'mtu': BIG_MTU}},
                 {BONDING_NAME:
                     {'nics': nics}},
-                {'connectivityCheck': False})
+                NOCHK)
             deviceLinks = getLinks()
             deviceNames = [device.name for device in deviceLinks]
 
@@ -1683,7 +1684,7 @@
             status, msg = self.vdsm_net.setupNetworks(
                 {NETWORK_NAME: {'remove': True}},
                 {BONDING_NAME: {'remove': True}},
-                {'connectivityCheck': False})
+                NOCHK)
 
     @cleanupNet
     @RequireVethMod
@@ -1695,14 +1696,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)
 
@@ -1726,18 +1726,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/26223
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06bed9ca60272d94d157f278fdf23e354dbf29dd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list