Change in vdsm[ovirt-3.5]: net tests: skip test_setupNetworks_on_external_bond

danken at redhat.com danken at redhat.com
Sun May 24 23:00:58 UTC 2015


Hello Ondřej Svoboda,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/41367

to review the following change.

Change subject: net tests: skip test_setupNetworks_on_external_bond
......................................................................

net tests: skip test_setupNetworks_on_external_bond

commit f80e6162f introduced test_setupNetworks_on_external_bond that
depends on a subtle difference in the semantics of restoreNetworks that
depends on the persistence model. With unified persistence, the
restoration re-creates the network structure in kernel. However, with
ifcfg persistence, only the configuration files are written to disk.

Until this difference is solved, this patch skips the test on when run
with ifcfg persistence.

Bug-Url: https://bugzilla.redhat.com/1223457
Change-Id: I9d34e316ef7c56b0d8f8aa019595341e34646dc6
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/41338
Reviewed-by: Ondřej Svoboda <osvoboda at redhat.com>
Continuous-Integration: Jenkins CI
---
M tests/functional/networkTests.py
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/41367/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 075fac4..ba5e09d 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -40,6 +40,7 @@
                             ruleExists, Route, Rule, addrFlush, LinkType,
                             getLinks, routeShowTable)
 
+import vdsm.config
 from vdsm.constants import EXT_BRCTL, EXT_IFUP
 from vdsm.utils import RollbackContext, execCmd
 from vdsm.netinfo import (bridges, operstate, prefix2netmask, getRouteDeviceTo,
@@ -2155,6 +2156,10 @@
     @cleanupNet
     @ValidateRunningAsRoot
     def test_setupNetworks_on_external_bond(self):
+        if vdsm.config.config.get('vars', 'net_persistence') == 'ifcfg':
+            raise SkipTest(
+                "with ifcfg persistence, vdsm-restore-net-config "
+                "doesn't restore in-kernel state")
         with dummyIf(1) as (nic, ):
             with open(BONDING_MASTERS, 'w') as bonds:
                 bonds.write('+%s\n' % BONDING_NAME)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d34e316ef7c56b0d8f8aa019595341e34646dc6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list