openstack
/
deb-cinder
Code Issues Proposed changes

Merge "VNX: use delete instead of remove" into stable/newton

This commit is contained in:
Jenkins 2016-10-18 17:17:33 +00:00 committed by Gerrit Code Review
parent e6c6814379 05ce46f431
commit 43e473cda9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/drivers/emc/vnx/mocked_vnx.yaml
View File

@ -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:

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

@ -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: