openstack
/
cyborg
Code Issues Proposed changes

Merge "Fix destroy DBReferenceError in driver_device.py"

This commit is contained in:
Zuul 2019-04-01 12:26:02 +00:00 committed by Gerrit Code Review
parent 49bf36004c 470b2320aa
commit 87223ec81a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cyborg/objects/driver_objects/driver_device.py
View File

@ -79,14 +79,14 @@ class DriverDevice(base.DriverObjectBase,
delete the internal layer objects."""
# get dev_obj_list from hostname
device_obj = self.get_device_obj(context, host)
# delete deployable_list first.
for driver_deployable in self.deployable_list:
driver_deployable.destroy(context, device_obj.id)
if hasattr(self.controlpath_id, 'cpid_info'):
cpid_obj = ControlpathID.get_by_device_id_cpidinfo(
context, device_obj.id, self.controlpath_id.cpid_info)
# delete controlpath_id
cpid_obj.destroy(context)
# delete deployable_list first.
for driver_deployable in self.deployable_list:
driver_deployable.destroy(context, device_obj.id)
# delete the device
device_obj.destroy(context)