diff --git a/cinder/tests/unit/test_huawei_drivers.py b/cinder/tests/unit/test_huawei_drivers.py index 5d8f5f29a18..ff2891f5d0d 100644 --- a/cinder/tests/unit/test_huawei_drivers.py +++ b/cinder/tests/unit/test_huawei_drivers.py @@ -3541,6 +3541,17 @@ class HuaweiFCDriverTestCase(test.TestCase): wwns = self.driver.client.get_online_free_wwns() self.assertEqual(['1'], wwns) + @mock.patch.object(rest_client.RestClient, 'call', + return_value={"data": {"ID": 1}, "error": {"code": 0}}) + def test_rename_lun(self, mock_call): + des = 'This LUN is renamed.' + new_name = 'test_name' + self.driver.client.rename_lun('1', new_name, des) + self.assertEqual(1, mock_call.call_count) + url = "/lun/1" + data = {"NAME": new_name, "DESCRIPTION": des} + mock_call.assert_called_once_with(url, data, "PUT") + class HuaweiConfTestCase(test.TestCase): def setUp(self): diff --git a/cinder/volume/drivers/huawei/huawei_driver.py b/cinder/volume/drivers/huawei/huawei_driver.py index 50b27b73aec..6e455a5bd46 100644 --- a/cinder/volume/drivers/huawei/huawei_driver.py +++ b/cinder/volume/drivers/huawei/huawei_driver.py @@ -1217,8 +1217,7 @@ class HuaweiBaseDriver(driver.VolumeDriver): LOG.debug("Rename LUN %(old_name)s to %(new_name)s.", {'old_name': lun_info.get('NAME'), 'new_name': new_name}) - self.client.rename_lun(lun_id, new_name, # pylint: disable=E1121 - description) + self.client.rename_lun(lun_id, new_name, description) model_update = {} model_update.update({'provider_location': lun_id}) diff --git a/cinder/volume/drivers/huawei/rest_client.py b/cinder/volume/drivers/huawei/rest_client.py index 1a3e005d8ab..2023b555385 100644 --- a/cinder/volume/drivers/huawei/rest_client.py +++ b/cinder/volume/drivers/huawei/rest_client.py @@ -1639,9 +1639,11 @@ class RestClient(object): return initiators - def rename_lun(self, lun_id, new_name): + def rename_lun(self, lun_id, new_name, description=None): url = "/lun/" + lun_id data = {"NAME": new_name} + if description: + data.update({"DESCRIPTION": description}) result = self.call(url, data, "PUT") msg = _('Rename lun on array error.') self._assert_rest_result(result, msg)