openstack
/
manila
Code Issues Proposed changes

Merge "Dummy driver: Don't fail unmanage on malformed share servers"

This commit is contained in:
Zuul 2019-03-21 18:59:52 +00:00 committed by Gerrit Code Review
parent 1b83e92793 68a18f4947
commit 6435d1f97e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manila/tests/share/drivers/dummy.py
View File

@ -721,5 +721,15 @@ class DummyDriver(driver.ShareDriver):
return identifier, server_details
def unmanage_server(self, server_details, security_services=None):
server_details = server_details or {}
if not server_details or 'server_id' not in server_details:
# This share server doesn't have any network details. Since it's
# just being cleaned up, we'll log a warning and return without
# errors.
LOG.warning("Share server does not have network information. "
"It is being unmanaged, but cannot be re-managed "
"without first creating network allocations in this "
"driver's private storage.")
return
self.private_storage.update(server_details['server_id'],
server_details)