Remove deprecated methods in VNX driver
This change amis to do a cleanup in VNX driver to remove those deprecated methods. Change-Id: I9d3c5bd6ade259a4d731d3d1020e4c37c75ef889 Close-Bug: 1447908
This commit is contained in:
parent
3bb18f4a55
commit
e889fedcb2
@ -1343,10 +1343,6 @@ class EMCVNXCLIDriverISCSITestCase(DriverTestCaseBase):
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase.get_lun_id",
|
||||
mock.Mock(
|
||||
side_effect=[1, 1]))
|
||||
@mock.patch(
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase."
|
||||
"get_lun_id_by_name",
|
||||
mock.Mock(return_value=1))
|
||||
def test_volume_migration_timeout(self):
|
||||
commands = [self.testData.MIGRATION_CMD(),
|
||||
self.testData.MIGRATION_VERIFY_CMD(1)]
|
||||
@ -1398,10 +1394,6 @@ Time Remaining: 0 second(s)
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase.get_lun_id",
|
||||
mock.Mock(
|
||||
side_effect=[1, 1]))
|
||||
@mock.patch(
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase."
|
||||
"get_lun_id_by_name",
|
||||
mock.Mock(return_value=1))
|
||||
def test_volume_migration(self):
|
||||
|
||||
commands = [self.testData.MIGRATION_CMD(),
|
||||
@ -1441,10 +1433,6 @@ Time Remaining: 0 second(s)
|
||||
"CommandLineHelper.create_lun_by_cmd",
|
||||
mock.Mock(
|
||||
return_value={'lun_id': 5}))
|
||||
@mock.patch(
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase."
|
||||
"get_lun_id_by_name",
|
||||
mock.Mock(return_value=5))
|
||||
@mock.patch(
|
||||
"cinder.volume.volume_types."
|
||||
"get_volume_type_extra_specs",
|
||||
@ -1492,10 +1480,6 @@ Time Remaining: 0 second(s)
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase.get_lun_id",
|
||||
mock.Mock(
|
||||
side_effect=[1, 1]))
|
||||
@mock.patch(
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase."
|
||||
"get_lun_id_by_name",
|
||||
mock.Mock(return_value=1))
|
||||
def test_volume_migration_failed(self):
|
||||
commands = [self.testData.MIGRATION_CMD()]
|
||||
results = [FAKE_ERROR_RETURN]
|
||||
@ -1520,10 +1504,6 @@ Time Remaining: 0 second(s)
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase.get_lun_id",
|
||||
mock.Mock(
|
||||
side_effect=[1, 1]))
|
||||
@mock.patch(
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase."
|
||||
"get_lun_id_by_name",
|
||||
mock.Mock(return_value=1))
|
||||
def test_volume_migration_stopped(self):
|
||||
|
||||
commands = [self.testData.MIGRATION_CMD(),
|
||||
@ -2346,10 +2326,6 @@ Time Remaining: 0 second(s)
|
||||
@mock.patch(
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase.get_lun_id",
|
||||
mock.Mock(return_value=1))
|
||||
@mock.patch(
|
||||
"cinder.volume.drivers.emc.emc_vnx_cli.EMCVnxCliBase."
|
||||
"get_lun_id_by_name",
|
||||
mock.Mock(return_value=1))
|
||||
@mock.patch(
|
||||
"eventlet.event.Event.wait",
|
||||
mock.Mock(return_value=None))
|
||||
|
@ -1111,25 +1111,6 @@ class CommandLineHelper(object):
|
||||
else:
|
||||
self._raise_cli_error(command_remove_hlu, rc, out)
|
||||
|
||||
def get_iscsi_protocol_endpoints(self, device_sp):
|
||||
|
||||
command_get_port = ('connection', '-getport',
|
||||
'-sp', device_sp)
|
||||
|
||||
out, rc = self.command_execute(*command_get_port)
|
||||
if rc != 0:
|
||||
self._raise_cli_error(command_get_port, rc, out)
|
||||
|
||||
re_port_wwn = 'Port WWN:\s*(.*)\s*'
|
||||
initiator_address = re.findall(re_port_wwn, out)
|
||||
|
||||
return initiator_address
|
||||
|
||||
def get_pool_name_of_lun(self, lun_name, poll=True):
|
||||
data = self.get_lun_properties(
|
||||
('-name', lun_name), self.LUN_WITH_POOL, poll=poll)
|
||||
return data.get('pool', '')
|
||||
|
||||
def get_lun_by_name(self, name, properties=LUN_ALL, poll=True):
|
||||
data = self.get_lun_properties(('-name', name),
|
||||
properties,
|
||||
@ -1560,21 +1541,6 @@ class CommandLineHelper(object):
|
||||
|
||||
return out, rc
|
||||
|
||||
def _is_sp_alive(self, ipaddr):
|
||||
ping_cmd = ('ping', '-c', 1, ipaddr)
|
||||
try:
|
||||
out, err = utils.execute(*ping_cmd,
|
||||
check_exit_code=True)
|
||||
except processutils.ProcessExecutionError as pe:
|
||||
out = pe.stdout
|
||||
rc = pe.exit_code
|
||||
if rc != 0:
|
||||
LOG.debug('%s is unavaialbe', ipaddr)
|
||||
return False
|
||||
LOG.debug('Ping SP %(spip)s Command Result: %(result)s.',
|
||||
{'spip': self.active_storage_ip, 'result': out})
|
||||
return True
|
||||
|
||||
def _toggle_sp(self):
|
||||
"""This function toggles the storage IP
|
||||
Address between primary IP and secondary IP, if no SP IP address has
|
||||
@ -1635,22 +1601,6 @@ class CommandLineHelper(object):
|
||||
out, rc = self.command_execute(*command_deregister)
|
||||
return rc, out
|
||||
|
||||
def is_pool_fastcache_enabled(self, storage_pool, poll=False):
|
||||
command_check_fastcache = ('storagepool', '-list', '-name',
|
||||
storage_pool, '-fastcache')
|
||||
out, rc = self.command_execute(*command_check_fastcache, poll=poll)
|
||||
|
||||
if 0 != rc:
|
||||
self._raise_cli_error(command_check_fastcache, rc, out)
|
||||
else:
|
||||
re_fastcache = 'FAST Cache:\s*(.*)\s*'
|
||||
m = re.search(re_fastcache, out)
|
||||
if m is not None:
|
||||
result = True if 'Enabled' == m.group(1) else False
|
||||
else:
|
||||
LOG.error(_LE("Error parsing output for FastCache Command."))
|
||||
return result
|
||||
|
||||
|
||||
@decorate_all_methods(log_enter_exit)
|
||||
class EMCVnxCliBase(object):
|
||||
@ -2040,9 +1990,6 @@ class EMCVnxCliBase(object):
|
||||
tiering_change = True
|
||||
return migration, tiering_change
|
||||
|
||||
def get_specific_extra_spec(self, specs, key):
|
||||
return specs.get(key, None)
|
||||
|
||||
def determine_all_enablers_exist(self, enablers):
|
||||
"""Determine all wanted enablers whether exist."""
|
||||
wanted = ['-ThinProvisioning',
|
||||
@ -2409,10 +2356,6 @@ class EMCVnxCliBase(object):
|
||||
|
||||
return model_update, snapshots
|
||||
|
||||
def get_lun_id_by_name(self, volume_name):
|
||||
data = self._client.get_lun_by_name(volume_name)
|
||||
return data['lun_id']
|
||||
|
||||
def get_lun_id(self, volume):
|
||||
lun_id = None
|
||||
try:
|
||||
@ -2437,10 +2380,6 @@ class EMCVnxCliBase(object):
|
||||
data = self._client.get_storage_group(storage_group)
|
||||
return data['lunmap']
|
||||
|
||||
def get_storage_group_uid(self, name):
|
||||
data = self._client.get_storage_group(name)
|
||||
return data['storage_group_uid']
|
||||
|
||||
def assure_storage_group(self, storage_group):
|
||||
self._client.create_storage_group(storage_group)
|
||||
|
||||
@ -2957,10 +2896,6 @@ class EMCVnxCliBase(object):
|
||||
|
||||
return model_update
|
||||
|
||||
def find_iscsi_protocol_endpoints(self, device_sp):
|
||||
"""Returns the iSCSI initiators for a SP."""
|
||||
return self._client.get_iscsi_protocol_endpoints(device_sp)
|
||||
|
||||
def get_login_ports(self, connector):
|
||||
return self._client.get_login_ports(connector['host'],
|
||||
connector['wwpns'])
|
||||
|
Loading…
Reference in New Issue
Block a user