Edward Haas has uploaded a new change for review.
Change subject: net tests: Set dummy ifaces up by default.
......................................................................
net tests: Set dummy ifaces up by default.
Dummy interfaces should be up when created, removing the need from the
individual tests to raise them.
This change showed several problems with existing tests, which have been
resolved as part of this patch.
Change-Id: I217645d2f3a06adec28d3bb30b9cd12f290e2914
Signed-off-by: Edward Haas <edwa...@redhat.com>
---
M tests/network/netinfo_test.py
M tests/network/nettestlib.py
M tests/network/ovs_info_test.py
3 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/62834/1
diff --git a/tests/network/netinfo_test.py b/tests/network/netinfo_test.py
index f0c3a6f..b0b9641 100644
--- a/tests/network/netinfo_test.py
+++ b/tests/network/netinfo_test.py
@@ -400,9 +400,7 @@
ipwrapper.addrAdd(dev, '2001::88', '64', family=6)
ip_addrs = addresses.getIpAddrs()[dev]
self.assertEqual(True, addresses.is_ipv6_local_auto(dev))
- self.assertEqual(
- 1, len(ip_addrs),
- 'too many addresses %s' % (ip_addrs, ))
+ self.assertEqual(2, len(ip_addrs))
self.assertTrue(addresses.is_ipv6(ip_addrs[0]))
self.assertTrue(not addresses.is_dynamic(ip_addrs[0]))
diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py
index 3069f92..f762125 100644
--- a/tests/network/nettestlib.py
+++ b/tests/network/nettestlib.py
@@ -38,6 +38,7 @@
from vdsm.network.ipwrapper import (
addrAdd, linkSet, linkAdd, linkDel, IPRoute2Error, netns_add, netns_delete,
netns_exec)
+from vdsm.network.link import iface as linkiface
from vdsm.network.netlink import monitor
from vdsm.commands import execCmd
from vdsm.utils import CommandPath, random_iface_name
@@ -312,6 +313,7 @@
dummy_interface = Dummy(prefix, max_length)
dummy_name = dummy_interface.create()
try:
+ linkiface.up(dummy_name)
yield dummy_name
finally:
dummy_interface.remove()
diff --git a/tests/network/ovs_info_test.py b/tests/network/ovs_info_test.py
index a74f58b..16ec00e 100644
--- a/tests/network/ovs_info_test.py
+++ b/tests/network/ovs_info_test.py
@@ -102,7 +102,6 @@
'ports': {
TEST_BOND: {
'bond': {
- 'active_slave': None,
'fake_iface': False,
'lacp': None,
'bond_mode': 'active-backup',
@@ -131,6 +130,9 @@
ovs_info = info.OvsInfo()
obtained_bridges = ovs_info.bridges
+ # Normalize obtained_bridges (remove 'active_slave')
+ obtained_bridges[TEST_BRIDGE]['ports'][TEST_BOND]['bond'].pop(
+ 'active_slave')
self.assertEqual(obtained_bridges, expected_bridges)
obtained_bridges_by_sb = ovs_info.bridges_by_sb
--
To view, visit https://gerrit.ovirt.org/62834
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I217645d2f3a06adec28d3bb30b9cd12f290e2914
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwa...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
