Change in vdsm[master]: network: tests: rename config to running_config
phoracek at redhat.com
phoracek at redhat.com
Mon Dec 7 13:41:02 UTC 2015
Petr Horáček has uploaded a new change for review.
Change subject: network: tests: rename config to running_config
......................................................................
network: tests: rename config to running_config
Let's be more explicit and call 'config' (= self.vdsm_net.config)
'running_config' because of we call it like that everywhere.
Change-Id: I4333aef51c45d1faef827399d42c5aa4744023e2
Signed-off-by: Petr Horáček <phoracek at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/50004/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index a37f248..8039f10 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -231,7 +231,7 @@
def assertNetworkExists(self, networkName, bridged=None, bridgeOpts=None,
hostQos=None, assert_in_running_conf=True):
netinfo = self.vdsm_net.netinfo
- config = self.vdsm_net.config
+ running_config = self.vdsm_net.config
self.assertIn(networkName, netinfo.networks)
if bridged is not None:
self.assertEqual(bridged, netinfo.networks[networkName]['bridged'])
@@ -247,11 +247,12 @@
reported_qos = netinfo.networks[networkName]['hostQos']
_cleanup_qos_definition(reported_qos)
self.assertEqual(reported_qos, hostQos)
- if assert_in_running_conf and config is not None:
- self.assertIn(networkName, config.networks)
+ if assert_in_running_conf and running_config is not None:
+ self.assertIn(networkName, running_config.networks)
if bridged is not None:
- self.assertEqual(config.networks[networkName].get('bridged'),
- bridged)
+ self.assertEqual(
+ running_config.networks[networkName].get('bridged'),
+ bridged)
def assertNetworkDoesntExist(self, networkName):
netinfo = self.vdsm_net.netinfo
--
To view, visit https://gerrit.ovirt.org/50004
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4333aef51c45d1faef827399d42c5aa4744023e2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek at redhat.com>
More information about the vdsm-patches
mailing list