openstack/cinder
Code Issues Proposed changes

Merge "VMAX driver - retype fix where workload is None"

Browse Source
This commit is contained in:
Zuul 2018-01-22 01:57:41 +00:00 committed by Gerrit Code Review
commit f578ce0505
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ class VMAXCommonData(object):
failed_resource = 'OS-failed-resource' failed_resource = 'OS-failed-resource'
fake_host = 'HostX@Backend#Diamond+DSS+SRP_1+000197800123' fake_host = 'HostX@Backend#Diamond+DSS+SRP_1+000197800123'
new_host = 'HostX@Backend#Silver+OLTP+SRP_1+000197800123' new_host = 'HostX@Backend#Silver+OLTP+SRP_1+000197800123'
none_host = 'HostX@Backend#Diamond+None+SRP_1+000197800123'
version = '3.1.0' version = '3.1.0'
volume_wwn = '600000345' volume_wwn = '600000345'
remote_array = '000197800124' remote_array = '000197800124'
@ -4650,6 +4651,17 @@ class VMAXCommonTest(test.TestCase):
self.data.srp, volume_name, False) self.data.srp, volume_name, False)
self.assertEqual(ref_return, return_val) self.assertEqual(ref_return, return_val)
def test_is_valid_for_storage_assisted_migration_none(self):
device_id = self.data.device_id
host = {'host': self.data.none_host}
volume_name = self.data.test_volume.name
# Testing for 'NONE' Workload
ref_return = (True, 'Diamond', 'NONE')
return_val = self.common._is_valid_for_storage_assisted_migration(
device_id, host, self.data.array,
self.data.srp, volume_name, False)
self.assertEqual(ref_return, return_val)
def test_find_volume_group(self): def test_find_volume_group(self):
group = self.data.test_group_1 group = self.data.test_group_1
array = self.data.array array = self.data.array

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

@ -2366,6 +2366,9 @@ class VMAXCommon(object):
pool_details = info_detail[1].split('+') pool_details = info_detail[1].split('+')
if len(pool_details) == 4: if len(pool_details) == 4:
target_slo = pool_details[0] target_slo = pool_details[0]
if pool_details[1].lower() == 'none':
target_workload = 'NONE'
else:
target_workload = pool_details[1] target_workload = pool_details[1]
target_srp = pool_details[2] target_srp = pool_details[2]
target_array_serial = pool_details[3] target_array_serial = pool_details[3]