openstack
/
manila
Code Issues Proposed changes

Merge "[NetApp] Fix default ipspace deletion issue" into stable/ussuri

changes/15/743615/1
Zuul 2020-07-21 21:07:05 +00:00 committed by Gerrit Code Review
parent eb0de241b3 2fe7452b1b
commit 0c3b58398e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
View File

@ -40,6 +40,7 @@ LOG = log.getLogger(__name__)
SUPPORTED_NETWORK_TYPES = (None, 'flat', 'vlan')
SEGMENTED_NETWORK_TYPES = ('vlan',)
DEFAULT_MTU = 1500
CLUSTER_IPSPACES = ('Cluster', 'Default')
class NetAppCmodeMultiSVMFileStorageLibrary(
@ -393,8 +394,9 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
vserver_client,
security_services=security_services)
if ipspace_name and not self._client.ipspace_has_data_vservers(
ipspace_name):
if (ipspace_name and ipspace_name not in CLUSTER_IPSPACES
and not self._client.ipspace_has_data_vservers(
ipspace_name)):
self._client.delete_ipspace(ipspace_name)
self._delete_vserver_vlans(interfaces_on_vlans)

9
releasenotes/notes/bug-1880747-netapp-fix-do-not-delete-default-ipspace-aee638279e0f8e93.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
NetApp ONTAP driver is now fixed to avoid the deletion of `Cluster` and
`Default` ipspaces when deleting a share server. This issue was happening
only when operating in `driver_handles_share_servers` enabled mode and
creating shares using `flat` network type. See
`Launchpad bug 1880747 <https://launchpad.net/bugs/1880747>`_ for more
details.