Change in vdsm[master]: [WIP] net tests: make functional tests run again with persis...

danken at redhat.com danken at redhat.com
Thu Feb 18 15:57:27 UTC 2016


Dan Kenigsberg has uploaded a new change for review.

Change subject: [WIP] net tests: make functional tests run again with persistence=ifcfg
......................................................................

[WIP] net tests: make functional tests run again with persistence=ifcfg

We have multiple users that use net_persistence=ifcfg. We must make sure
that Vdsm does not inadvertently breaks them.

This patch only makes the tests run again, after recent changes assuming
unified persistence.

Change-Id: I849172cdab80e760a65ac19d367064b1dbf81b03
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/53713/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 62f06b7..184c5f1 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -232,8 +232,6 @@
     def assertNetworkExists(self, networkName, bridged=None, bridgeOpts=None,
                             hostQos=None, assert_in_running_conf=True):
         netinfo = self.vdsm_net.netinfo
-        running_config = self.vdsm_net.config
-        network_config = running_config.networks[networkName]
         network_netinfo = netinfo.networks[networkName]
         self.assertIn(networkName, netinfo.networks)
         if bridged is not None:
@@ -250,7 +248,13 @@
             reported_qos = network_netinfo['hostQos']
             _cleanup_qos_definition(reported_qos)
             self.assertEqual(reported_qos, hostQos)
-        if assert_in_running_conf and running_config is not None:
+
+        running_config = self.vdsm_net.config
+        if running_config is None:
+            return
+
+        network_config = running_config.networks[networkName]
+        if assert_in_running_conf:
             self.assertIn(networkName, running_config.networks)
             if bridged is not None:
                 self.assertEqual(network_config.get('bridged'), bridged)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I849172cdab80e760a65ac19d367064b1dbf81b03
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list