openstack
/
deb-cinder
Code Issues Proposed changes

Merge "Dell SC: Changed rename volume REST API call"

This commit is contained in:
Jenkins 2016-05-26 05:37:29 +00:00 committed by Gerrit Code Review
parent 8996d0867d c4d3b7dbe9
commit 42cdbde4bf
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/tests/unit/test_dellscapi.py
View File

@ -4647,27 +4647,27 @@ class DellSCSanAPITestCase(test.TestCase):
self.assertIsNone(res, 'Expected None') self.assertIsNone(res, 'Expected None')
@mock.patch.object(dell_storagecenter_api.HttpClient, @mock.patch.object(dell_storagecenter_api.HttpClient,
'post', 'put',
return_value=RESPONSE_200) return_value=RESPONSE_200)
def test_rename_volume(self, def test_rename_volume(self,
mock_post, mock_put,
mock_close_connection, mock_close_connection,
mock_open_connection, mock_open_connection,
mock_init): mock_init):
res = self.scapi.rename_volume(self.VOLUME, 'newname') res = self.scapi.rename_volume(self.VOLUME, 'newname')
self.assertTrue(mock_post.called) self.assertTrue(mock_put.called)
self.assertTrue(res) self.assertTrue(res)
@mock.patch.object(dell_storagecenter_api.HttpClient, @mock.patch.object(dell_storagecenter_api.HttpClient,
'post', 'put',
return_value=RESPONSE_400) return_value=RESPONSE_400)
def test_rename_volume_failure(self, def test_rename_volume_failure(self,
mock_post, mock_put,
mock_close_connection, mock_close_connection,
mock_open_connection, mock_open_connection,
mock_init): mock_init):
res = self.scapi.rename_volume(self.VOLUME, 'newname') res = self.scapi.rename_volume(self.VOLUME, 'newname')
self.assertTrue(mock_post.called) self.assertTrue(mock_put.called)
self.assertFalse(res) self.assertFalse(res)
@mock.patch.object(dell_storagecenter_api.HttpClient, @mock.patch.object(dell_storagecenter_api.HttpClient,

6
cinder/volume/drivers/dell/dell_storagecenter_api.py
View File

@ -1906,9 +1906,9 @@ class StorageCenterApi(object):
""" """
payload = {} payload = {}
payload['Name'] = name payload['Name'] = name
r = self.client.post('StorageCenter/ScVolume/%s/Modify' r = self.client.put('StorageCenter/ScVolume/%s'
% self._get_id(scvolume), % self._get_id(scvolume),
payload) payload)
if self._check_result(r): if self._check_result(r):
return True return True