openstack/cinder
Code Issues Proposed changes

Merge "Port EMC VNX CLI to Python 3"

Browse Source
This commit is contained in:
Jenkins
2015-11-23 14:02:45 +00:00
committed by Gerrit Code Review
parent 4a9b619403 b12fb487b4
commit 0747a64b6b
3 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cinder/tests/unit/test_emc_vnxdirect.py
View File

@@ -2026,8 +2026,7 @@ Time Remaining: 0 second(s)
vol,
fake_host)
self.assertTrue(ret[0])
self.assertTrue(
ret[1]['provider_location'].find('type^lun') > 0)
self.assertIn('type^lun', ret[1]['provider_location'])
# verification
expect_cmd = [mock.call(*self.testData.MIGRATION_CMD(),
retry_disable=True,
@@ -2597,8 +2596,7 @@ Time Remaining: 0 second(s)
vol = self.driver.create_volume_from_snapshot(
self.testData.test_volume_with_type,
self.testData.test_snapshot)
self.assertTrue(
vol['provider_location'].find('type^smp') > 0)
self.assertIn('type^smp', vol['provider_location'])
expect_cmd = [
mock.call(
*self.testData.SNAP_COPY_CMD(
@@ -2768,8 +2766,7 @@ Time Remaining: 0 second(s)
vol = self.driver.create_cloned_volume(
self.testData.test_clone,
self.testData.test_volume_with_type)
self.assertTrue(
vol['provider_location'].find('type^smp') > 0)
self.assertIn('type^smp', vol['provider_location'])
expect_cmd = [
mock.call(
*self.testData.SNAP_CREATE_CMD(
@@ -3737,8 +3734,7 @@ Time Remaining: 0 second(s)
host_test_data)
self.assertTrue(type(ret) == tuple)
self.assertTrue(ret[0])
self.assertTrue(
ret[1]['provider_location'].find('type^lun') > 0)
self.assertIn('type^lun', ret[1]['provider_location'])
expect_cmd = [
mock.call(*self.testData.SNAP_LIST_CMD(), poll=False),
mock.call(*self.testData.SNAP_DELETE_CMD(tmp_snap),
@@ -4227,10 +4223,10 @@ Time Remaining: 0 second(s)
vol2_in_new_cg['name'] + '_dest'), poll=False),
mock.call(*td.MIGRATION_CMD(6232, 2),
poll=True, retry_disable=True),
mock.call(*td.MIGRATION_VERIFY_CMD(6232), poll=True),
mock.call(*td.MIGRATION_VERIFY_CMD(6231), poll=True),
mock.call(*td.MIGRATION_VERIFY_CMD(6232), poll=True),
mock.call(*td.CREATE_CONSISTENCYGROUP_CMD(
new_cg['id'], [6232, 6231]), poll=True),
new_cg['id'], [6231, 6232]), poll=True),
mock.call(*td.DELETE_CG_SNAPSHOT(copied_snap_name))]
self.assertEqual(expect_cmd, fake_cli.call_args_list)
@@ -5149,8 +5145,8 @@ class EMCVNXCLIDriverFCTestCase(DriverTestCaseBase):
poll=False),
mock.call('port', '-list', '-gname', 'fakehost')]
fake_cli.assert_has_calls(expected)
self.assertEqual(['5006016A0860080F', '5006016008600195'],
data['data']['target_wwn'])
self.assertEqual(set(['5006016A0860080F', '5006016008600195']),
set(data['data']['target_wwn']))
@mock.patch('random.randint',
mock.Mock(return_value=0))
@@ -5186,8 +5182,8 @@ class EMCVNXCLIDriverFCTestCase(DriverTestCaseBase):
poll=False),
mock.call('port', '-list', '-gname', 'fakehost')]
fake_cli.assert_has_calls(expected)
self.assertEqual(['5006016A0860080F', '5006016008600195'],
data['data']['target_wwn'])
self.assertEqual(set(['5006016A0860080F', '5006016008600195']),
set(data['data']['target_wwn']))
@mock.patch(
"cinder.zonemanager.fc_san_lookup_service.FCSanLookupService." +

20
cinder/volume/drivers/emc/emc_vnx_cli.py
View File

@@ -3229,11 +3229,9 @@ class EMCVnxCliBase(object):
wwnns = connector['wwnns']
wwpns = connector['wwpns']
wwns = [(node + port).upper() for node, port in zip(wwnns, wwpns)]
return map(lambda wwn: re.sub(r'\S\S',
lambda m: m.group(0) + ':',
wwn,
len(wwn) / 2 - 1),
wwns)
return [re.sub(r'\S\S', lambda m: m.group(0) + ':',
wwn, len(wwn) // 2 - 1)
for wwn in wwns]
def _exec_command_setpath(self, initiator_uid, sp, port_id,
ip, host, vport_id=None):
@@ -4067,8 +4065,8 @@ class EMCVnxCliBase(object):
pool_list)
pool_feature = (self._client.get_pool_feature_properties(poll=False)
if self.check_max_pool_luns_threshold else None)
self.stats['pools'] = map(
lambda pool: self._build_pool_stats(pool, pool_feature), pool_list)
self.stats['pools'] = [self._build_pool_stats(pool, pool_feature)
for pool in pool_list]
return self.stats
@@ -4269,8 +4267,8 @@ class AllowReadWriteOnSnapshotTask(task.Task):
class CreateConsistencyGroupTask(task.Task):
"""Task to create a consistency group."""
def __init__(self, lun_id_key_template, num_of_members):
self.lun_id_keys = set(
[lun_id_key_template % i for i in range(num_of_members)])
self.lun_id_keys = sorted(set(
[lun_id_key_template % i for i in range(num_of_members)]))
super(CreateConsistencyGroupTask, self).__init__(
requires=self.lun_id_keys)
@@ -4284,8 +4282,8 @@ class CreateConsistencyGroupTask(task.Task):
class WaitMigrationsCompleteTask(task.Task):
"""Task to wait migrations to be completed."""
def __init__(self, lun_id_key_template, num_of_members):
self.lun_id_keys = set(
[lun_id_key_template % i for i in range(num_of_members)])
self.lun_id_keys = sorted(set(
[lun_id_key_template % i for i in range(num_of_members)]))
super(WaitMigrationsCompleteTask, self).__init__(
requires=self.lun_id_keys)

1
tests-py3.txt
View File

@@ -56,6 +56,7 @@ cinder.tests.unit.test_dellsc
cinder.tests.unit.test_dellscapi
cinder.tests.unit.test_dothill
cinder.tests.unit.test_drbdmanagedrv
cinder.tests.unit.test_emc_vnxdirect
cinder.tests.unit.test_emc_xtremio
cinder.tests.unit.test_eqlx
cinder.tests.unit.test_evaluator