Ido Barkan has uploaded a new change for review. Change subject: be smarter about forcing bridge removal ......................................................................
be smarter about forcing bridge removal Change-Id: I2b68cae78370ab357dbdbc74d3d7c0311b28cf15 Signed-off-by: ibarkan <[email protected]> --- M vdsm/network/api.py 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/35926/1 diff --git a/vdsm/network/api.py b/vdsm/network/api.py index 5184996..1a02eb3 100755 --- a/vdsm/network/api.py +++ b/vdsm/network/api.py @@ -683,6 +683,16 @@ return bondings, networks, options +def _should_force_bridge_removal(marked_for_removal, currently_bridged, + should_be_bridged): + if marked_for_removal: + return True + if currently_bridged and not should_be_bridged: + return True + + return False + + def setupNetworks(networks, bondings, **options): """Add/Edit/Remove configuration for networks and bondings. @@ -748,9 +758,14 @@ for network, attrs in networks.items(): if network in _netinfo.networks: logger.debug("Removing network %r", network) + force_bridge_removal = _should_force_bridge_removal( + marked_for_removal='remove' in attrs, + currently_bridged=_netinfo.networks[network]['bridged'], + should_be_bridged=attrs.get('bridged')) + delNetwork(network, configurator=configurator, force=force, implicitBonding=False, _netinfo=_netinfo, - force_bridge_removal=('remove' in attrs)) + force_bridge_removal=force_bridge_removal) _netinfo.updateDevices() del _netinfo.networks[network] elif network in libvirt_nets: -- To view, visit http://gerrit.ovirt.org/35926 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b68cae78370ab357dbdbc74d3d7c0311b28cf15 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
