Antoni Segura Puimedon has uploaded a new change for review.
Change subject: Make _addNetwork and _delNetwork private
......................................................................
Make _addNetwork and _delNetwork private
Change-Id: Ie043a26c795a8c8d71a6142d4df45f6584120338
Signed-off-by: Antoni S. Puimedon <asegu...@redhat.com>
---
M vdsm/network/api.py
M vdsm/supervdsmServer
2 files changed, 26 insertions(+), 35 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/35311/1
diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index 1b09c6c..079c97a 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -227,7 +227,7 @@
if nics:
attrs['nic'], = nics
- if func.__name__ == 'delNetwork':
+ if func.__name__ == '_delNetwork':
configurator.runningConfig.removeNetwork(attrs.pop('network'))
else:
configurator.runningConfig.setNetwork(attrs.pop('network'), attrs)
@@ -238,12 +238,12 @@
@_alterRunningConfig
-def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None,
- netmask=None, prefix=None, mtu=None, gateway=None, dhcpv6=None,
- ipv6addr=None, ipv6gateway=None, ipv6autoconf=None, force=False,
- configurator=None, bondingOptions=None, bridged=True,
- _netinfo=None, qosOutbound=None, defaultRoute=None,
- blockingdhcp=False, **options):
+def _addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None,
+ netmask=None, prefix=None, mtu=None, gateway=None, dhcpv6=None,
+ ipv6addr=None, ipv6gateway=None, ipv6autoconf=None,
+ force=False, configurator=None, bondingOptions=None,
+ bridged=True, _netinfo=None, qosOutbound=None,
+ defaultRoute=None, blockingdhcp=False, **options):
nics = nics or ()
if _netinfo is None:
_netinfo = netinfo.NetInfo()
@@ -378,8 +378,8 @@
libvirt.removeNetwork(network)
configurator.runningConfig.removeNetwork(network)
return
- delNetwork(network, configurator=configurator, force=True,
- implicitBonding=False, _netinfo=_netinfo)
+ _delNetwork(network, configurator=configurator, force=True,
+ implicitBonding=False, _netinfo=_netinfo)
def _validateDelNetwork(network, vlan, bonding, nics, bridged, _netinfo):
@@ -406,9 +406,9 @@
@_alterRunningConfig
-def delNetwork(network, vlan=None, bonding=None, nics=None, force=False,
- configurator=None, implicitBonding=True, _netinfo=None,
- **options):
+def _delNetwork(network, vlan=None, bonding=None, nics=None, force=False,
+ configurator=None, implicitBonding=True, _netinfo=None,
+ **options):
if _netinfo is None:
_netinfo = netinfo.NetInfo()
@@ -470,13 +470,13 @@
def editNetwork(oldBridge, newBridge, vlan=None, bonding=None, nics=None,
**options):
with ConfiguratorClass() as configurator:
- delNetwork(oldBridge, configurator=configurator, **options)
- addNetwork(newBridge, vlan=vlan, bonding=bonding, nics=nics,
- configurator=configurator, **options)
+ _delNetwork(oldBridge, configurator=configurator, **options)
+ _addNetwork(newBridge, vlan=vlan, bonding=bonding, nics=nics,
+ configurator=configurator, **options)
if utils.tobool(options.get('connectivityCheck', False)):
if not clientSeen(int(options.get('connectivityTimeout',
CONNECTIVITY_TIMEOUT_DEFAULT))):
- delNetwork(newBridge, force=True)
+ _delNetwork(newBridge, force=True)
raise ConfigNetworkError(ne.ERR_LOST_CONNECTION,
'connectivity check failed')
@@ -672,8 +672,8 @@
for network, networkAttrs in networks.items():
if network in _netinfo.networks:
logger.debug("Removing network %r", network)
- delNetwork(network, configurator=configurator, force=force,
- implicitBonding=False, _netinfo=_netinfo)
+ _delNetwork(network, configurator=configurator, force=force,
+ implicitBonding=False, _netinfo=_netinfo)
if 'remove' in networkAttrs:
del networks[network]
del libvirt_nets[network]
@@ -711,8 +711,8 @@
logger.debug("Adding network %r", network)
try:
- addNetwork(network, configurator=configurator,
- implicitBonding=True, _netinfo=_netinfo, **d)
+ _addNetwork(network, configurator=configurator,
+ implicitBonding=True, _netinfo=_netinfo, **d)
except ConfigNetworkError as cne:
if cne.errCode == ne.ERR_FAILED_IFUP:
logger.debug("Adding network %r failed. Running "
@@ -732,9 +732,9 @@
# If the new added network was created on top of
# existing bond, we need to keep the bond on rollback
# flow, else we will break the new created bond.
- delNetwork(network, force=True,
- implicitBonding=networks[network].
- get('bonding') in bondings)
+ _delNetwork(network, force=True,
+ implicitBonding=networks[network].
+ get('bonding') in bondings)
raise ConfigNetworkError(ne.ERR_LOST_CONNECTION,
'connectivity check failed')
@@ -799,13 +799,13 @@
del kwargs['vlan']
if 'bonding' in kwargs and kwargs['bonding'] == '':
del kwargs['bonding']
- addNetwork(bridge, **kwargs)
+ _addNetwork(bridge, **kwargs)
elif sys.argv[1] == 'del':
bridge = sys.argv[2]
kwargs = _parseKwargs(sys.argv[3:])
if 'nics' in kwargs:
kwargs['nics'] = kwargs['nics'].split(',')
- delNetwork(bridge, **kwargs)
+ _delNetwork(bridge, **kwargs)
elif sys.argv[1] == 'edit':
oldBridge = sys.argv[2]
newBridge = sys.argv[3]
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 9a447d3..54c86fe 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -57,8 +57,7 @@
from parted_utils import getDevicePartedInfo as _getDevicePartedInfo
from network import sourceroutethread
-from network.api import (addNetwork, delNetwork, editNetwork, setupNetworks,
- setSafeNetworkConfig)
+from network.api import (editNetwork, setupNetworks, setSafeNetworkConfig)
from storage import hba
from network.tc import setPortMirroring, unsetPortMirroring
@@ -196,14 +195,6 @@
@logDecorator
def restoreNetworks(self):
return restore_nets.restore()
-
- @logDecorator
- def addNetwork(self, bridge, options):
- return addNetwork(bridge, **options)
-
- @logDecorator
- def delNetwork(self, bridge, options):
- return delNetwork(bridge, **options)
@logDecorator
def editNetwork(self, oldBridge, newBridge, options):
--
To view, visit http://gerrit.ovirt.org/35311
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie043a26c795a8c8d71a6142d4df45f6584120338
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegu...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
