openstack
/
cinder
Code Issues Proposed changes

Merge "Move make_initiator_target_all2all_map out of vutils"

This commit is contained in:
Zuul 2020-07-08 18:48:14 +00:00 committed by Gerrit Code Review
parent a323a026f4 f2446b4f90
commit 098d0c2317
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cinder/tests/unit/test_volume_utils.py
View File

@ -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}

13
cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
View File

@ -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)

16
cinder/volume/drivers/inspur/instorage/instorage_fc.py
View File

@ -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}

11
cinder/volume/volume_utils.py
View File

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