Change in vdsm[master]: networkTests: use IP_MASK, there's no need for prefix2netmask

osvoboda at redhat.com osvoboda at redhat.com
Mon Feb 2 17:08:52 UTC 2015


Ondřej Svoboda has uploaded a new change for review.

Change subject: networkTests: use IP_MASK, there's no need for prefix2netmask
......................................................................

networkTests: use IP_MASK, there's no need for prefix2netmask

Change-Id: Ib47ad4e83c8360b9bbd9a512866c215409e23976
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/37464/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 46ec4d8..076c211 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -44,7 +44,7 @@
 
 from vdsm.constants import EXT_BRCTL, EXT_IFUP, EXT_IFDOWN
 from vdsm.utils import RollbackContext, execCmd, running, CommandPath
-from vdsm.netinfo import (bridges, operstate, prefix2netmask, getRouteDeviceTo,
+from vdsm.netinfo import (bridges, operstate, getRouteDeviceTo,
                           _get_dhclient_ifaces)
 from vdsm import ipwrapper
 from vdsm import sysctl
@@ -1539,8 +1539,7 @@
             status, msg = self.vdsm_net.setupNetworks(
                 {NETWORK_NAME:
                     {'nic': nics[0], 'bridged': bridged, 'ipaddr': IP_ADDRESS,
-                     'netmask': prefix2netmask(int(IP_CIDR)),
-                     'gateway': IP_GATEWAY}},
+                     'netmask': IP_MASK, 'gateway': IP_GATEWAY}},
                 {}, NOCHK)
             self.assertEqual(status, SUCCESS, msg)
             self.assertNetworkExists(NETWORK_NAME, bridged)
@@ -1720,8 +1719,7 @@
                 NETWORK_NAME + '2':
                 {'nic': nic, 'bootproto': 'none', 'ipv6gateway': IPv6_GATEWAY,
                  'ipv6addr': IPv6_ADDRESS_AND_CIDR, 'ipaddr': IP_ADDRESS,
-                 'gateway': IP_GATEWAY,
-                 'netmask': prefix2netmask(int(IP_CIDR))}}
+                 'gateway': IP_GATEWAY, 'netmask': IP_MASK}}
             for network, netdict in networks.iteritems():
                 with self.vdsm_net.pinger():
                     status, msg = self.vdsm_net.setupNetworks(


-- 
To view, visit http://gerrit.ovirt.org/37464
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib47ad4e83c8360b9bbd9a512866c215409e23976
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list