openstack
/
manila
Code Issues Proposed changes

Merge "[NetApp] Fix ipspace naming is confusing"

This commit is contained in:
Zuul 2023-09-21 20:37:53 +00:00 committed by Gerrit Code Review
parent 45b24d2b87 ce13de0044
commit 7eef91446b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,7 +428,7 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
# NOTE(cknight): Neutron needs cDOT IP spaces because it can provide
# overlapping IP address ranges for different subnets. That is not
# believed to be an issue for any of Manila's other network plugins.
ipspace_id = network_info.get('neutron_subnet_id')
ipspace_id = network_info.get('neutron_net_id')
if not ipspace_id:
return client_cmode.DEFAULT_IPSPACE

2
manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_multi_svm.py
View File

@ -930,7 +930,7 @@ class NetAppFileStorageLibraryTestCase(test.TestCase):
result = self.library._create_ipspace(fake.NETWORK_INFO)
expected = self.library._get_valid_ipspace_name(
fake.NETWORK_INFO['neutron_subnet_id'])
fake.NETWORK_INFO['neutron_net_id'])
self.assertEqual(expected, result)
self.library._client.create_ipspace.assert_called_once_with(expected)

6
releasenotes/notes/bug-2007560-fix-netapp-ipspace-naming-7c097743e187b920.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
NetApp driver: Fixed NetApp ipspace naming to follow the neutron network id,
instead of the neutron subnet id as before. For more details please refer to
`launchpad bug #2007560 <https://bugs.launchpad.net/manila/+bug/2007560>`.