openstack
/
deb-cinder
Code Issues Proposed changes

VNX: fix issue when backing-up in-use volume 

When backing-up an in-use volume, initialize_connection_snapshot did not
return connection information for attaching the snapshot thus causing
below error:

TypeError: 'NoneType' object has no attribute '__getitem__'

This commit fixes above issue.

Change-Id: Ie31a0cfe447aee670018914d379d178933437b8c
Closes-bug: #1693956
(cherry picked from commit 530259db85)
This commit is contained in:
Peter Wang 2017-05-27 09:17:21 +08:00
parent bccd77a600
commit e58d89cbff
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/tests/unit/volume/drivers/dell_emc/vnx/test_adapter.py
View File

@ -1034,11 +1034,11 @@ class TestCommonAdapter(test.TestCase):
def test_initialize_connection_snapshot(self, common_adapter, mocked_res,
mocked_input):
common_adapter.client.attach_snapshot = mock.Mock()
common_adapter._initialize_connection = mock.Mock()
common_adapter._initialize_connection = mock.Mock(return_value='fake')
snapshot = mocked_input['snapshot']
smp_name = 'tmp-smp-' + snapshot.id
common_adapter.initialize_connection_snapshot(snapshot, None)
conn = common_adapter.initialize_connection_snapshot(snapshot, None)
common_adapter.client.attach_snapshot.assert_called_once_with(
smp_name, snapshot.name)
lun = mocked_res['lun']
@ -1048,6 +1048,7 @@ class TestCommonAdapter(test.TestCase):
called_volume.vnx_lun_id))
self.assertIsNone(
common_adapter._initialize_connection.call_args[0][1])
self.assertIs(common_adapter._initialize_connection(), conn)
@res_mock.mock_driver_input
@res_mock.patch_common_adapter

2
cinder/volume/drivers/dell_emc/vnx/adapter.py
View File

@ -1118,7 +1118,7 @@ class CommonAdapter(object):
self.client.attach_snapshot(smp_name, snapshot.name)
lun = self.client.get_lun(name=smp_name)
volume = common.Volume(smp_name, snapshot.id, vnx_lun_id=lun.lun_id)
self._initialize_connection(volume, connector)
return self._initialize_connection(volume, connector)
def terminate_connection_snapshot(self, snapshot, connector, **kwargs):
"""Terminates connection for snapshot mount point."""