openstack
/
tacker
Code Issues Proposed changes

Merge "Fix missing None judgement in rollback"

This commit is contained in:
Zuul 2021-04-08 12:57:39 +00:00 committed by Gerrit Code Review
parent a6fe9869e9 5100e31871
commit 4cf1204025
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tacker/vnflcm/vnflcm_driver.py
View File

@ -1446,24 +1446,24 @@ class VnfLcmDriver(abstract_driver.VnfInstanceAbstractDriver):
resource_changes.affected_vnfcs = [] resource_changes.affected_vnfcs = []
resource_changes.affected_virtual_links = [] resource_changes.affected_virtual_links = []
resource_changes.affected_virtual_storages = [] resource_changes.affected_virtual_storages = []
if 'resource_changes' in vnf_lcm_op_occs \ if 'resource_changes' in vnf_lcm_op_occs and \
and vnf_lcm_op_occs.resource_changes: vnf_lcm_op_occs.resource_changes:
if 'affected_vnfcs' in vnf_lcm_op_occs.resource_changes: res_chg = vnf_lcm_op_occs.resource_changes
if len(vnf_lcm_op_occs.resource_changes.affected_vnfcs) > 0: if 'affected_vnfcs' in res_chg:
if res_chg.affected_vnfcs and \
len(res_chg.affected_vnfcs) > 0:
resource_changes.affected_vnfcs.extend( resource_changes.affected_vnfcs.extend(
vnf_lcm_op_occs.resource_changes.affected_vnfcs) res_chg.affected_vnfcs)
if 'affected_virtual_storages' in vnf_lcm_op_occs.resource_changes: if 'affected_virtual_storages' in res_chg:
if len(vnf_lcm_op_occs.resource_changes. if res_chg.affected_virtual_storages and \
affected_virtual_storages) > 0: len(res_chg.affected_virtual_storages) > 0:
resource_changes.affected_virtual_storages.extend( resource_changes.affected_virtual_storages.extend(
vnf_lcm_op_occs.resource_changes. res_chg.affected_virtual_storages)
affected_virtual_storages) if 'affected_virtual_links' in res_chg:
if 'affected_virtual_links' in vnf_lcm_op_occs.resource_changes: if res_chg.affected_virtual_links and \
if len(vnf_lcm_op_occs.resource_changes. len(res_chg.affected_virtual_links) > 0:
affected_virtual_links) > 0:
resource_changes.affected_virtual_links.extend( resource_changes.affected_virtual_links.extend(
vnf_lcm_op_occs.resource_changes. res_chg.affected_virtual_links)
affected_virtual_links)
resource_changes.affected_vnfcs.extend(affected_vnfcs) resource_changes.affected_vnfcs.extend(affected_vnfcs)
resource_changes.affected_virtual_storages.extend( resource_changes.affected_virtual_storages.extend(
affected_virtual_storages) affected_virtual_storages)