openstack/cinder
Code Issues Proposed changes

Merge "VMAX driver - ignore service level and workload in xml"

Browse Source
This commit is contained in:
Jenkins 2017-02-06 20:51:51 +00:00 committed by Gerrit Code Review
commit acb81e4268
2 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
cinder/tests/unit/volume/drivers/dell_emc/test_vmax.py
View File

@ -347,6 +347,9 @@ class VMAXCommonData(object):
fake_host_2_v3 = 'HostY@Backend#SRP_1+1234567891011'
fake_host_3_v3 = 'HostX@Backend#Bronze+DSS+SRP_1+1234567891011'
fake_host_4_v3 = 'HostX@Backend#Silver+None+SRP_1+1234567891011'
poolInstanceName = {
'InstanceID': 'SRP_1',
'CreationClassName': 'Symm_StorageSystem'}
unit_creationclass = 'CIM_ProtocolControllerForUnit'
storage_type = 'gold'
@ -1771,11 +1774,18 @@ class FakeEcomConnection(object):
def _enum_storagesettings(self):
storagesettings = []
storagesetting = {}
storagesetting['CreationClassName'] = 'CIM_StoragePoolSetting'
storagesetting['InstanceID'] = ('SYMMETRIX-+-000197200056-+-SBronze:'
'DSS-+-F-+-0-+-SR-+-SRP_1')
storagesettings.append(storagesetting)
storagesetting_bronze = {}
storagesetting_bronze['CreationClassName'] = 'CIM_StoragePoolSetting'
storagesetting_bronze['InstanceID'] = (
'SYMMETRIX-+-000197200056-+-SBronze:'
'DSS-+-F-+-0-+-SR-+-SRP_1')
storagesettings.append(storagesetting_bronze)
storagesetting_silver = {}
storagesetting_silver['CreationClassName'] = 'CIM_StoragePoolSetting'
storagesetting_silver['InstanceID'] = (
'SYMMETRIX-+-000197200056-+-SSilver:'
'DSS-+-F-+-0-+-SR-+-SRP_1')
storagesettings.append(storagesetting_silver)
return storagesettings
def _enum_targetMaskingGroup(self):
@ -7044,6 +7054,15 @@ class EMCV3MultiPoolDriverTestCase(test.TestCase):
'SLO': u'Bronze',
'Workload': u'DSS'}]
def array_info_list_without_slo(self):
return [{'EcomServerIp': u'1.1.1.1',
'EcomServerPort': 10,
'EcomUserName': u'user',
'EcomPassword': u'pass',
'PoolName': u'SRP_1',
'PortGroup': u'OS-portgroup-PG',
'SerialNumber': 1234567891011}]
def multiple_array_info_list(self):
return [{'EcomServerIp': u'1.1.1.1',
'EcomServerPort': 10,
@ -7476,6 +7495,42 @@ class EMCV3MultiPoolDriverTestCase(test.TestCase):
pools[1]['location_info'])
self._cleanup_pool_info()
@mock.patch.object(
common.VMAXCommon,
'_find_pool_in_array',
return_value=(VMAXCommonData.poolInstanceName,
VMAXCommonData.storage_system))
def test_get_slo_workload_combinations_with_slo(self, mock_pool):
self.driver.common.multiPoolSupportEnabled = True
final_array_info_list = (
self.driver.common._get_slo_workload_combinations(
self.default_array_info_list()))
bCheckForSilver = False
for array_info in final_array_info_list:
# Check if 'Silver' is present in the final list
if array_info['SLO'] == 'Silver':
bCheckForSilver = True
self.assertTrue(bCheckForSilver)
self._cleanup_pool_info()
@mock.patch.object(
common.VMAXCommon,
'_find_pool_in_array',
return_value=(VMAXCommonData.poolInstanceName,
VMAXCommonData.storage_system))
def test_get_slo_workload_combinations_without_slo(self, mock_pool):
self.driver.common.multiPoolSupportEnabled = True
final_array_info_list = (
self.driver.common._get_slo_workload_combinations(
self.array_info_list_without_slo()))
bCheckForSilver = False
for array_info in final_array_info_list:
# Check if 'Silver' is present in the final list
if array_info['SLO'] == 'Silver':
bCheckForSilver = True
self.assertTrue(bCheckForSilver)
self._cleanup_pool_info()
def _cleanup(self, tempdir, config_file_path):
bExists = os.path.exists(config_file_path)
if bExists:

6
cinder/volume/drivers/dell_emc/vmax/common.py
View File

@ -264,8 +264,12 @@ class VMAXCommon(object):
# only strings
temparrayInfo = arrayInfoList[0].copy()
slo, workload = sloWorkload.split(':')
if temparrayInfo['SLO'] is None:
# Check if we got SLO and workload from the set (from array)
# The previous check was done by mistake against the value
# from XML file
if slo:
temparrayInfo['SLO'] = slo
if workload:
temparrayInfo['Workload'] = workload
finalArrayInfoList.append(temparrayInfo)
except Exception: