[NetApp] Fix ipspace naming is confusing

This patch resolves the NetApp ipspace naming to use
neutron_net_id rather than neutron_subnet_id manila driver.

Closes-Bug: #2007560

Change-Id: Id5f2d35dac755aa9ae47a4e42af5d6c3fc5e6f2e

manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py

@@ -427,7 +427,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
 

manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_multi_svm.py

@@ -929,7 +929,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)
 

releasenotes/notes/bug-2007560-fix-netapp-ipspace-naming-7c097743e187b920.yaml

@@ -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>`.