"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py" between
manila-8.1.3.tar.gz and manila-8.1.4.tar.gz

About: OpenStack Manila provides “Shared Filesystems as a service”.
The "Stein" series (maintained release).

lib_multi_svm.py  (manila-8.1.3):lib_multi_svm.py  (manila-8.1.4)
skipping to change at line 40 skipping to change at line 40
from manila.i18n import _ from manila.i18n import _
from manila.share.drivers.netapp.dataontap.client import client_cmode from manila.share.drivers.netapp.dataontap.client import client_cmode
from manila.share.drivers.netapp.dataontap.cluster_mode import lib_base from manila.share.drivers.netapp.dataontap.cluster_mode import lib_base
from manila.share.drivers.netapp import utils as na_utils from manila.share.drivers.netapp import utils as na_utils
from manila import utils from manila import utils
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
SUPPORTED_NETWORK_TYPES = (None, 'flat', 'vlan') SUPPORTED_NETWORK_TYPES = (None, 'flat', 'vlan')
SEGMENTED_NETWORK_TYPES = ('vlan',) SEGMENTED_NETWORK_TYPES = ('vlan',)
DEFAULT_MTU = 1500 DEFAULT_MTU = 1500
CLUSTER_IPSPACES = ('Cluster', 'Default')
class NetAppCmodeMultiSVMFileStorageLibrary( class NetAppCmodeMultiSVMFileStorageLibrary(
lib_base.NetAppCmodeFileStorageLibrary): lib_base.NetAppCmodeFileStorageLibrary):
@na_utils.trace @na_utils.trace
def check_for_setup_error(self): def check_for_setup_error(self):
if self._have_cluster_creds: if self._have_cluster_creds:
if self.configuration.netapp_vserver: if self.configuration.netapp_vserver:
msg = ('Vserver is specified in the configuration. This is ' msg = ('Vserver is specified in the configuration. This is '
skipping to change at line 388 skipping to change at line 389
vlans = '-'.join(sorted(set(vlans))) if vlans else None vlans = '-'.join(sorted(set(vlans))) if vlans else None
vlan_id = vlans.split('-')[-1] vlan_id = vlans.split('-')[-1]
else: else:
vlan_id = None vlan_id = None
def _delete_vserver_without_lock(): def _delete_vserver_without_lock():
self._client.delete_vserver(vserver, self._client.delete_vserver(vserver,
vserver_client, vserver_client,
security_services=security_services) security_services=security_services)
if ipspace_name and not self._client.ipspace_has_data_vservers( if (ipspace_name and ipspace_name not in CLUSTER_IPSPACES
ipspace_name): and not self._client.ipspace_has_data_vservers(
ipspace_name)):
self._client.delete_ipspace(ipspace_name) self._client.delete_ipspace(ipspace_name)
self._delete_vserver_vlans(interfaces_on_vlans) self._delete_vserver_vlans(interfaces_on_vlans)
@utils.synchronized('netapp-VLAN-%s' % vlan_id, external=True) @utils.synchronized('netapp-VLAN-%s' % vlan_id, external=True)
def _delete_vserver_with_lock(): def _delete_vserver_with_lock():
_delete_vserver_without_lock() _delete_vserver_without_lock()
if needs_lock: if needs_lock:
return _delete_vserver_with_lock() return _delete_vserver_with_lock()
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)