From 05ce46f4318477b657253c262d843d2ab787bc64 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Mon, 10 Oct 2016 23:54:17 -0400 Subject: [PATCH] VNX: use delete instead of remove storops is using 'delete' for destroying objects instead of 'remove', we need to correct related wrong usage in in VNX cinder driver as well. Change-Id: I86683070084f5ccf846f0cf01dc58d9d71572c9b Closes-bug: #1631100 (cherry picked from commit 95dacbfa16676b3d8302f87e12bb18db6479a234) --- cinder/tests/unit/volume/drivers/emc/vnx/mocked_vnx.yaml | 4 ++-- cinder/volume/drivers/emc/vnx/adapter.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/emc/vnx/mocked_vnx.yaml b/cinder/tests/unit/volume/drivers/emc/vnx/mocked_vnx.yaml index 74a075f54..2bac48eab 100644 --- a/cinder/tests/unit/volume/drivers/emc/vnx/mocked_vnx.yaml +++ b/cinder/tests/unit/volume/drivers/emc/vnx/mocked_vnx.yaml @@ -1745,7 +1745,7 @@ test_terminate_connection_cleanup_remove_sg: sg: _properties: *sg_base_prop _methods: - remove: + delete: disconnect_host: get_alu_hlu_map: {} @@ -1758,7 +1758,7 @@ test_terminate_connection_cleanup_deregister: sg: _properties: *sg_base_prop _methods: - remove: + delete: disconnect_host: get_alu_hlu_map: {} vnx: diff --git a/cinder/volume/drivers/emc/vnx/adapter.py b/cinder/volume/drivers/emc/vnx/adapter.py index b1eafa6cc..7d4210346 100644 --- a/cinder/volume/drivers/emc/vnx/adapter.py +++ b/cinder/volume/drivers/emc/vnx/adapter.py @@ -982,7 +982,7 @@ class CommonAdapter(object): try: LOG.info(_LI("Storage Group %s is empty."), sg.name) sg.disconnect_host(sg.name) - sg.remove() + sg.delete() if self.itor_auto_dereg: self._deregister_initiator(host) except storops_ex.StoropsException: