Ondřej Svoboda has uploaded a new change for review.
Change subject: testSetupNetworksAddDelDhcp: shorten before adding checks for
gateways
......................................................................
testSetupNetworksAddDelDhcp: shorten before adding checks for gateways
Change-Id: I9c58858481b10b6adc0faa35568f678328cce554
Signed-off-by: Ondřej Svoboda <osvob...@redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/37679/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 36774cb..7297bcd 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1791,24 +1791,18 @@
if bridged:
self.assertEqual(test_net['cfg']['BOOTPROTO'],
bootproto)
-
devs = self.vdsm_net.netinfo.bridges
- self.assertIn(NETWORK_NAME, devs)
- self.assertEqual(
- devs[NETWORK_NAME]['cfg']['BOOTPROTO'], bootproto)
- self.assertEqual(devs[NETWORK_NAME]['dhcpv4'], dhcpv4)
- self.assertEqual(devs[NETWORK_NAME]['dhcpv6'], dhcpv6)
device_name = NETWORK_NAME
-
else:
devs = self.vdsm_net.netinfo.nics
- self.assertIn(right, devs)
- self.assertEqual(devs[right]['cfg']['BOOTPROTO'],
- bootproto)
- self.assertEqual(devs[right]['dhcpv4'], dhcpv4)
- self.assertEqual(devs[right]['dhcpv6'], dhcpv6)
device_name = right
+ self.assertIn(device_name, devs)
+ net_attrs = devs[device_name]
+ self.assertEqual(net_attrs['cfg']['BOOTPROTO'], bootproto)
+ self.assertEqual(net_attrs['dhcpv4'], dhcpv4)
+ self.assertEqual(net_attrs['dhcpv6'], dhcpv6)
+
if dhcpv4:
# TODO: source routing not ready for IPv6
ip_addr = test_net['addr']
--
To view, visit http://gerrit.ovirt.org/37679
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c58858481b10b6adc0faa35568f678328cce554
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvob...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
