Hello Petr Horáček,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/53763
to review the following change.
Change subject: net: api: use running config only with unified persistence
......................................................................
net: api: use running config only with unified persistence
configurator.runningConfig should be used only when unified persistence
is used. If we call it with ifcfg persistence, vdsm explodes.
This patch fixes testBrokenNetworkReplacement.
Change-Id: I76b6c13f97be58a7ad41268a44dee27241c8d2ab
Signed-off-by: Petr Horáček <phora...@redhat.com>
Reviewed-on: https://gerrit.ovirt.org/53744
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg <dan...@redhat.com>
---
M vdsm/network/api.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/53763/1
diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index bba325b..1748682 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -401,7 +401,8 @@
elif not os.path.exists('/sys/class/net/' + netAttr['iface']):
# Bridgeless broken network without underlying device
libvirt.removeNetwork(network)
- configurator.runningConfig.removeNetwork(network)
+ if config.get('vars', 'net_persistence') == 'unified':
+ configurator.runningConfig.removeNetwork(network)
return
_delNetwork(network, configurator=configurator, force=True,
implicitBonding=False, _netinfo=_netinfo)
--
To view, visit https://gerrit.ovirt.org/53763
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b6c13f97be58a7ad41268a44dee27241c8d2ab
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Dan Kenigsberg <dan...@redhat.com>
Gerrit-Reviewer: Petr Horáček <phora...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
