openstack/cinder
Code Issues Proposed changes

Merge "Fixes VNX NotImplementedError of unmanage"

Browse Source
This commit is contained in:
Jenkins 2015-03-11 05:01:53 +00:00 committed by Gerrit Code Review
commit 5b3ff204cc
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/tests/test_emc_vnxdirect.py
View File

@ -3064,6 +3064,13 @@ Time Remaining: 0 second(s)
'-o')]
fake_cli.assert_has_calls(expect_cmd)
def test_unmanage(self):
self.driverSetup()
try:
self.driver.unmanage(self.testData.test_volume)
except NotImplementedError:
self.fail('Interface unmanage need to be implemented')
class EMCVNXCLIDArrayBasedDriverTestCase(DriverTestCaseBase):
def setUp(self):

4
cinder/volume/drivers/emc/emc_cli_fc.py
View File

@ -247,3 +247,7 @@ class EMCCLIFCDriver(driver.FibreChannelDriver):
return self.cli.update_consistencygroup(context, group,
add_volumes,
remove_volumes)
def unmanage(self, volume):
"""Unmanages a volume."""
return self.cli.unmanage(volume)

4
cinder/volume/drivers/emc/emc_cli_iscsi.py
View File

@ -226,3 +226,7 @@ class EMCCLIISCSIDriver(driver.ISCSIDriver):
return self.cli.update_consistencygroup(context, group,
add_volumes,
remove_volumes)
def unmanage(self, volume):
"""Unmanages a volume."""
self.cli.unmanage(volume)

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

@ -1582,7 +1582,7 @@ class CommandLineHelper(object):
class EMCVnxCliBase(object):
"""This class defines the functions to use the native CLI functionality."""
VERSION = '05.03.00'
VERSION = '05.03.01'
stats = {'driver_version': VERSION,
'storage_protocol': None,
'vendor_name': 'EMC',
@ -2917,6 +2917,10 @@ class EMCVnxCliBase(object):
poll=False)
return data.get(self._client.LUN_POOL.key)
def unmanage(self, volume):
"""Unmanages a volume"""
pass
@decorate_all_methods(log_enter_exit)
class EMCVnxCliPool(EMCVnxCliBase):