openstack
/
tacker
Code Issues Proposed changes

Merge "Fix for deleting VM when VNF is deleted"

This commit is contained in:
Jenkins 2015-10-20 15:49:28 +00:00 committed by Gerrit Code Review
parent 8a51a96711 dd54d64fb9
commit b4cbca6957
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tacker/db/vm/vm_db.py
View File

@ -562,7 +562,7 @@ class VNFMPluginDb(vnfm.VNFMPluginBase, db_base.CommonDbMixin):
filter(Device.status == constants.PENDING_CREATE).
one())
query.update({'instance_id': instance_id, 'mgmt_url': mgmt_url})
if instance_id is None:
if instance_id is None or device_dict['status'] == constants.ERROR:
query.update({'status': constants.ERROR})
for (key, value) in device_dict['attributes'].items():

13
tacker/vm/plugin.py
View File

@ -244,16 +244,17 @@ class VNFMPlugin(vm_db.VNFMPluginDb, VNFMMgmtMixin):
driver_name = self._infra_driver_name(device_dict)
device_id = device_dict['id']
instance_id = self._instance_id(device_dict)
create_failed = False
try:
self._device_manager.invoke(
driver_name, 'create_wait', plugin=self, context=context,
device_dict=device_dict, device_id=instance_id)
except vnfm.DeviceCreateWaitFailed:
instance_id = None
del device_dict['instance_id']
create_failed = True
device_dict['status'] = constants.ERROR
if instance_id is None:
if instance_id is None or create_failed:
mgmt_url = None
else:
# mgmt_url = self.mgmt_url(context, device_dict)
@ -262,11 +263,11 @@ class VNFMPlugin(vm_db.VNFMPluginDb, VNFMMgmtMixin):
self._create_device_post(
context, device_id, instance_id, mgmt_url, device_dict)
if instance_id is None:
self.mgmt_create_post(context, device_dict)
self.mgmt_create_post(context, device_dict)
if instance_id is None or create_failed:
return
self.mgmt_create_post(context, device_dict)
device_dict['mgmt_url'] = mgmt_url
kwargs = {