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

This commit is contained in:
Zuul 2020-07-30 19:42:38 +00:00 committed by Gerrit Code Review
commit 2e59572d42
2 changed files with 13 additions and 2 deletions

View File

@ -37,6 +37,7 @@ LOG = log.getLogger(__name__)
SUPPORTED_NETWORK_TYPES = (None, 'flat', 'vlan')
SEGMENTED_NETWORK_TYPES = ('vlan',)
DEFAULT_MTU = 1500
CLUSTER_IPSPACES = ('Cluster', 'Default')
class NetAppCmodeMultiSVMFileStorageLibrary(
@ -365,8 +366,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)

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.