From f2446b4f9049064b09c5b63a563b0ebaaacd3498 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Tue, 19 May 2020 10:48:11 -0400
Subject: [PATCH] Move make_initiator_target_all2all_map out of vutils

This is only used by one driver -- move it there.

Change-Id: I7c17d915389de79f686804f5f9d2b2eb5ab26334
---
 cinder/tests/unit/test_volume_utils.py           | 13 -------------
 .../drivers/inspur/instorage/test_fc_driver.py   | 13 +++++++++++++
 .../drivers/inspur/instorage/instorage_fc.py     | 16 +++++++++++++---
 cinder/volume/volume_utils.py                    | 11 -----------
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/cinder/tests/unit/test_volume_utils.py b/cinder/tests/unit/test_volume_utils.py
index 6a122fa620b..26893a23584 100644
--- a/cinder/tests/unit/test_volume_utils.py
+++ b/cinder/tests/unit/test_volume_utils.py
@@ -1083,19 +1083,6 @@ class VolumeUtilsTestCase(test.TestCase):
             else:
                 self.assertEqual(float(max_over_subscription_ratio), mosr)
 
-    def test_make_initiator_target_all2all_map(self):
-        initiator_wwpns = ['ff00000000000000', 'ff00000000000001']
-        target_wwpns = ['bb00000000000000', 'bb00000000000001']
-
-        expected = {
-            'ff00000000000000': ['bb00000000000000', 'bb00000000000001'],
-            'ff00000000000001': ['bb00000000000000', 'bb00000000000001']
-        }
-
-        ret = volume_utils.make_initiator_target_all2all_map(initiator_wwpns,
-                                                             target_wwpns)
-        self.assertEqual(ret, expected)
-
     def test_check_image_metadata(self):
         image_meta = {'id': 1, 'min_disk': 3, 'status': 'active',
                       'size': 1 * units.Gi}
diff --git a/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py b/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
index b57005aa6b0..d4c732b211c 100644
--- a/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
+++ b/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
@@ -594,3 +594,16 @@ class InStorageMCSFcDriverTestCase(test.TestCase):
         volume = self._generate_vol_info(None, None)
         self.fc_driver.create_volume(volume)
         self.fc_driver.add_vdisk_copy(volume['name'], 'fake-pool', None)
+
+    def test_make_initiator_target_all2all_map(self):
+        initiator_wwpns = ['ff00000000000000', 'ff00000000000001']
+        target_wwpns = ['bb00000000000000', 'bb00000000000001']
+
+        expected = {
+            'ff00000000000000': ['bb00000000000000', 'bb00000000000001'],
+            'ff00000000000001': ['bb00000000000000', 'bb00000000000001']
+        }
+
+        ret = self.fc_driver.make_initiator_target_all2all_map(initiator_wwpns,
+                                                               target_wwpns)
+        self.assertEqual(ret, expected)
diff --git a/cinder/volume/drivers/inspur/instorage/instorage_fc.py b/cinder/volume/drivers/inspur/instorage/instorage_fc.py
index 7e771e0ab06..0de27f1805a 100644
--- a/cinder/volume/drivers/inspur/instorage/instorage_fc.py
+++ b/cinder/volume/drivers/inspur/instorage/instorage_fc.py
@@ -28,7 +28,6 @@ from cinder import interface
 from cinder import utils as cinder_utils
 from cinder.volume import driver
 from cinder.volume.drivers.inspur.instorage import instorage_common
-from cinder.volume import volume_utils
 from cinder.zonemanager import utils as fczm_utils
 
 LOG = logging.getLogger(__name__)
@@ -57,6 +56,17 @@ class InStorageMCSFCDriver(instorage_common.InStorageMCSCommonDriver,
         super(InStorageMCSFCDriver, self).__init__(*args, **kwargs)
         self.protocol = 'FC'
 
+    @staticmethod
+    def make_initiator_target_all2all_map(initiator_wwpns, target_wwpns):
+        """Build a simplistic all-to-all mapping."""
+        i_t_map = {}
+        for i_wwpn in initiator_wwpns:
+            i_t_map[str(i_wwpn)] = []
+            for t_wwpn in target_wwpns:
+                i_t_map[i_wwpn].append(t_wwpn)
+
+        return i_t_map
+
     @cinder_utils.trace
     @coordination.synchronized('instorage-host'
                                '{self._state[system_id]}'
@@ -141,7 +151,7 @@ class InStorageMCSFCDriver(instorage_common.InStorageMCSCommonDriver,
 
             properties['target_wwn'] = conn_wwpns
 
-            i_t_map = volume_utils.make_initiator_target_all2all_map(
+            i_t_map = self.make_initiator_target_all2all_map(
                 connector['wwpns'], conn_wwpns)
             properties['initiator_target_map'] = i_t_map
 
@@ -224,7 +234,7 @@ class InStorageMCSFCDriver(instorage_common.InStorageMCSCommonDriver,
                     for node in self._state['storage_nodes'].values():
                         target_wwpns.extend(node['WWPN'])
                     init_targ_map = (
-                        volume_utils.make_initiator_target_all2all_map(
+                        self.make_initiator_target_all2all_map(
                             connector['wwpns'],
                             target_wwpns))
                     info['data'] = {'initiator_target_map': init_targ_map}
diff --git a/cinder/volume/volume_utils.py b/cinder/volume/volume_utils.py
index 52485e809fc..cb091acdbc4 100644
--- a/cinder/volume/volume_utils.py
+++ b/cinder/volume/volume_utils.py
@@ -1047,17 +1047,6 @@ def get_max_over_subscription_ratio(str_value, supports_auto=False):
     return mosr
 
 
-def make_initiator_target_all2all_map(initiator_wwpns, target_wwpns):
-    """Build a simplistic all-to-all mapping."""
-    i_t_map = {}
-    for i_wwpn in initiator_wwpns:
-        i_t_map[str(i_wwpn)] = []
-        for t_wwpn in target_wwpns:
-            i_t_map[i_wwpn].append(t_wwpn)
-
-    return i_t_map
-
-
 def check_image_metadata(image_meta, vol_size):
     """Validates the image metadata."""
     # Check whether image is active