Change in vdsm[master]: testSetupNetworksAddDelDhcp: Check for DHCPv4 also on the de...
osvoboda at redhat.com
osvoboda at redhat.com
Tue Dec 9 00:16:54 UTC 2014
Ondřej Svoboda has uploaded a new change for review.
Change subject: testSetupNetworksAddDelDhcp: Check for DHCPv4 also on the device (or bridge)
......................................................................
testSetupNetworksAddDelDhcp: Check for DHCPv4 also on the device (or bridge)
Change-Id: Ib4c2651d12727727ead8a283b67de23340d98426
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/35982/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 37597fd..36e8728 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1741,8 +1741,9 @@
veth.setIP(left, IP_ADDRESS, IP_CIDR)
veth.setLinkUp(left)
with dnsmasqDhcp(left):
+ dhcpv4 = 'dhcp'
network = {NETWORK_NAME: {'nic': right, 'bridged': bridged,
- 'bootproto': 'dhcp',
+ 'bootproto': dhcpv4,
'blockingdhcp': True}}
status, msg = self.vdsm_net.setupNetworks(network, {}, NOCHK)
@@ -1750,21 +1751,23 @@
self.assertNetworkExists(NETWORK_NAME)
vdsm_net = self.vdsm_net.netinfo.networks[NETWORK_NAME]
- self.assertEqual(vdsm_net['bootproto4'], 'dhcp')
+ self.assertEqual(vdsm_net['bootproto4'], dhcpv4)
if bridged:
- self.assertEqual(vdsm_net['cfg']['BOOTPROTO'], 'dhcp')
+ self.assertEqual(vdsm_net['cfg']['BOOTPROTO'], dhcpv4)
devs = self.vdsm_net.netinfo.bridges
self.assertIn(NETWORK_NAME, devs)
self.assertEqual(devs[NETWORK_NAME]['cfg']['BOOTPROTO'],
- 'dhcp')
+ dhcpv4)
+ self.assertEqual(devs[NETWORK_NAME]['bootproto4'], dhcpv4)
device_name = NETWORK_NAME
else:
devs = self.vdsm_net.netinfo.nics
self.assertIn(right, devs)
- self.assertEqual(devs[right]['cfg']['BOOTPROTO'], 'dhcp')
+ self.assertEqual(devs[right]['cfg']['BOOTPROTO'], dhcpv4)
+ self.assertEqual(devs[right]['bootproto4'], dhcpv4)
device_name = right
ip_addr = self.vdsm_net.netinfo.networks[NETWORK_NAME]['addr']
--
To view, visit http://gerrit.ovirt.org/35982
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4c2651d12727727ead8a283b67de23340d98426
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