Change in vdsm[master]: net: api: remove _delNonVdsmNetwork

phoracek at redhat.com phoracek at redhat.com
Fri Feb 19 15:50:38 UTC 2016


Petr Horáček has uploaded a new change for review.

Change subject: net: api: remove _delNonVdsmNetwork
......................................................................

net: api: remove _delNonVdsmNetwork

When _delNetwork() is called, network is always in running_config
and therefore _delNonVdsmNetwork() is never triggered. This code
used to be needed only with add/edit/delNetwork() API.

Change-Id: I7a57e28328edc0dc8da76efb1fd935dffad01092
Signed-off-by: Petr Horáček <phoracek at redhat.com>
---
M lib/vdsm/network/api.py
1 file changed, 0 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/53761/1

diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py
index 2929fc6..5a4bad6 100644
--- a/lib/vdsm/network/api.py
+++ b/lib/vdsm/network/api.py
@@ -351,20 +351,6 @@
         _assertBridgeClean(network, vlan, bonding, nics)
 
 
-def _delNonVdsmNetwork(network, vlan, bonding, _netinfo, configurator):
-    if network in bridges.bridges():
-        net_ent = _objectivizeNetwork(bridge=network, vlan_id=vlan,
-                                      bonding=bonding,
-                                      _netinfo=_netinfo,
-                                      configurator=configurator,
-                                      implicitBonding=False)
-        net_ent.remove()
-    else:
-        raise ConfigNetworkError(ne.ERR_BAD_BRIDGE, "Cannot delete network"
-                                 " %r: It doesn't exist in the system" %
-                                 network)
-
-
 def _disconnect_bridge_port(port):
     ipwrapper.linkSet(port, ['nomaster'])
 
@@ -379,12 +365,6 @@
 
     if configurator is None:
         configurator = ConfiguratorClass()
-
-    if network not in _netinfo.networks:
-        logging.info("Network %r: doesn't exist in libvirt database", network)
-        _delNonVdsmNetwork(network, vlan, bonding, _netinfo,
-                           configurator)
-        return
 
     nics, vlan, vlan_id, bonding = _netinfo.getNicsVlanAndBondingForNetwork(
         network)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a57e28328edc0dc8da76efb1fd935dffad01092
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