Change in vdsm[ovirt-3.5]: net: tests: fix testRestoreNetworksOnlyRestoreUnchangedDevices

ibarkan at redhat.com ibarkan at redhat.com
Mon Jul 13 19:29:36 UTC 2015


Ido Barkan has uploaded a new change for review.

Change subject: net: tests: fix testRestoreNetworksOnlyRestoreUnchangedDevices
......................................................................

net: tests: fix testRestoreNetworksOnlyRestoreUnchangedDevices

iproute2 in el6 does not support deleting a bond, so this is
implemented via writing to sysfs. In master this is not needed
because 'ip link del bond' just works.

Change-Id: I5ecce10840bcdec9d5b07b2d037b6a2e16e12ad8
Label: ovirt-3.5-only
Bug-Url: https://bugzilla.redhat.com/1203422
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/43545/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 26392dd..3de16ea 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1584,7 +1584,8 @@
                 addrFlush(NET_CHANGED)
                 linkSet(NET_MISSING, ['down'])
                 execCmd([EXT_BRCTL, 'delbr', NET_MISSING])
-                linkDel(BOND_MISSING)
+                with open('/sys/class/net/bonding_masters', 'w') as masters:
+                    masters.write('-%s' % BOND_MISSING)
                 self.vdsm_net.refreshNetinfo()
                 self.assertEqual(
                     self.vdsm_net.netinfo.networks[NET_CHANGED]['addr'], '')


-- 
To view, visit https://gerrit.ovirt.org/43545
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ecce10840bcdec9d5b07b2d037b6a2e16e12ad8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>


More information about the vdsm-patches mailing list