From 325aa66a2c32a6889f199628f2aedfaba742cb00 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Wed, 13 Jun 2012 17:44:16 -0400 Subject: [PATCH 13/17] remove flag skipLibvirt Currently, VDSM manage networks by it's own and uses libvirt to store the net definitions, not requiring any additional flag as skipLibvirt. This patch will remove completely skipLibvirt flag. Change-Id: Id87c89f04912976797d629344238749a8562382b Signed-off-by: Douglas Schilling Landgraf Reviewed-on: http://gerrit.ovirt.org/5262 Reviewed-by: Shu Ming Reviewed-by: Dan Kenigsberg Tested-by: Dan Kenigsberg Reviewed-on: http://gerrit.ovirt.org/5555 Tested-by: Federico Simoncelli --- vdsm/configNetwork.py | 29 ++++++++++------------------- vdsm_reg/deployUtil.py.in | 5 ++--- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 97aec7c..effb279 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -238,8 +238,7 @@ class ConfigWriter(object): s += 'NM_CONTROLLED=no\n' BLACKLIST = ['TYPE', 'NAME', 'DEVICE', 'bondingOptions', 'force', 'blockingdhcp', - 'connectivityCheck', 'connectivityTimeout', - 'skipLibvirt'] + 'connectivityCheck', 'connectivityTimeout'] for k in set(kwargs.keys()).difference(set(BLACKLIST)): if re.match('^[a-zA-Z_]\w*$', k): s += '%s=%s\n' % (k.upper(), pipes.quote(kwargs[k])) @@ -493,7 +492,7 @@ def validateVlanId(vlan): def _addNetworkValidation(_netinfo, bridge, vlan, bonding, nics, ipaddr, netmask, gateway, - bondingOptions, bridged=True, skipLibvirt=False): + bondingOptions, bridged=True): if (vlan or bonding) and not nics: raise ConfigNetworkError(ne.ERR_BAD_PARAMS, 'vlan/bonding definition requires nics. got: %r'%(nics,)) @@ -502,12 +501,9 @@ def _addNetworkValidation(_netinfo, bridge, vlan, bonding, nics, ipaddr, netmask validateBridgeName(bridge) if bridge in _netinfo.networks: raise ConfigNetworkError(ne.ERR_USED_BRIDGE, 'Bridge already exists') - elif not skipLibvirt: + if bridge in _netinfo.getBridgelessNetworks(): raise ConfigNetworkError(ne.ERR_USED_BRIDGE, 'network already exists') - else: - raise ConfigNetworkError(ne.ERR_BAD_PARAMS, - 'bridgeless network can not be added when skip libvirt') # vlan if vlan: @@ -576,7 +572,6 @@ def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask gateway=None, force=False, configWriter=None, bondingOptions=None, bridged=True, **options): nics = nics or () _netinfo = NetInfo() - skipLibvirt = utils.tobool(options.get('skipLibvirt', False)) bridged = utils.tobool(bridged) if mtu: @@ -588,7 +583,7 @@ def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask _addNetworkValidation(_netinfo, bridge=network if bridged else None, vlan=vlan, bonding=bonding, nics=nics, ipaddr=ipaddr, netmask=netmask, gateway=gateway, bondingOptions=bondingOptions, - bridged=bridged, skipLibvirt=skipLibvirt) + bridged=bridged) logging.info("Adding network %s with vlan=%s, bonding=%s, nics=%s," " bondingOptions=%s, mtu=%s, bridged=%s, options=%s", @@ -650,8 +645,7 @@ def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask ifup(network) # add libvirt network - if not skipLibvirt: - createLibvirtNetwork(network, bridged, iface) + createLibvirtNetwork(network, bridged, iface) def createLibvirtNetwork(network, bridged=True, iface=None): conn = libvirtconnection.get() @@ -737,15 +731,12 @@ def delNetwork(network, vlan=None, bonding=None, nics=None, force=False, validateBridgeName(network) - if not utils.tobool(options.get('skipLibvirt', False)): - if network not in _netinfo.networks: - raise ConfigNetworkError(ne.ERR_BAD_BRIDGE, - "Cannot delete network %r: It doesn't exist" % network) + if network not in _netinfo.networks: + raise ConfigNetworkError(ne.ERR_BAD_BRIDGE, + "Cannot delete network %r: It doesn't exist" % network) - nics, vlan, bonding = _netinfo.getNicsVlanAndBondingForNetwork(network) - bridged = _netinfo.networks[network]['bridged'] - else: - bridged = True + nics, vlan, bonding = _netinfo.getNicsVlanAndBondingForNetwork(network) + bridged = _netinfo.networks[network]['bridged'] logging.info("Removing network %s with vlan=%s, bonding=%s, nics=%s," "options=%s" % (network, vlan, bonding, nics, options)) diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index 1474196..2f240cc 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -894,7 +894,7 @@ def makeBridge(vdcName, vdsmDir): #Delete existing bridge in oVirt if fReturn and fIsOvirt: try: - out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_DEL), mgtBridge, vlan, bonding, nic] + ['skipLibvirt=True']) + out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_DEL), mgtBridge, vlan, bonding, nic]) if ret: if ret == 17: #ERR_BAD_BRIDGE logging.debug("makeBridge Ignoring error of del existing bridge. out=" + out + "\nerr=" + str(err) + "\nret=" + str(ret)) @@ -909,8 +909,7 @@ def makeBridge(vdcName, vdsmDir): if fReturn: try: lstBridgeOptions.append('blockingdhcp=true') - out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_ADD) , MGT_BRIDGE_NAME, vlan, bonding, nic] + lstBridgeOptions - + ['skipLibvirt=True']) + out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_ADD) , MGT_BRIDGE_NAME, vlan, bonding, nic] + lstBridgeOptions) if ret: fReturn = False logging.debug("makeBridge Failed to add " + MGT_BRIDGE_NAME + " bridge out=" + out + "\nerr=" + str(err) + "\nret=" + str(ret)) -- 1.7.1