openstack
/
tacker
Code Issues Proposed changes

VNF/VNFFG/NS in PENDING_DELETE status can't be deleted correctly. 

When resource's deletion process is interrupted by some reasons,
it stays in PENDING_DELETE status. We cannot find it from db with
_ACTIVE_UPDATE_ERROR_DEAD status. Resources include VNF, VNFFG,
and NS.

Change-Id: Iae7e0ac7629dbe3c5ce79aab3dd2300da8b78df2
Closes-bug: #1689426
Co-Authored-By: claire1006 <baofangyan@cmss.chinamobile.com>
This commit is contained in:
Yan Xing'an 2017-06-13 07:17:53 -07:00
parent f7c89a6d02
commit fe28359be6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tacker/db/nfvo/ns_db.py
View File

@ -38,7 +38,7 @@ LOG = logging.getLogger(__name__)
_ACTIVE_UPDATE = (constants.ACTIVE, constants.PENDING_UPDATE)
_ACTIVE_UPDATE_ERROR_DEAD = (
constants.PENDING_CREATE, constants.ACTIVE, constants.PENDING_UPDATE,
constants.ERROR, constants.DEAD)
constants.PENDING_DELETE, constants.ERROR, constants.DEAD)
CREATE_STATES = (constants.PENDING_CREATE, constants.DEAD)

2
tacker/db/nfvo/vnffg_db.py
View File

@ -35,7 +35,7 @@ LOG = logging.getLogger(__name__)
_ACTIVE_UPDATE = (constants.ACTIVE, constants.PENDING_UPDATE)
_ACTIVE_UPDATE_ERROR_DEAD = (
constants.PENDING_CREATE, constants.ACTIVE, constants.PENDING_UPDATE,
constants.ERROR, constants.DEAD)
constants.PENDING_DELETE, constants.ERROR, constants.DEAD)
_VALID_VNFFG_UPDATE_ATTRIBUTES = ('vnf_mapping',)
_VALID_SFC_UPDATE_ATTRIBUTES = ('chain', 'symmetrical')
_VALID_NFP_UPDATE_ATTRIBUTES = ('symmetrical',)

2
tacker/db/vnfm/vnfm_db.py
View File

@ -44,7 +44,7 @@ _ACTIVE_UPDATE = (constants.ACTIVE, constants.PENDING_UPDATE)
_ACTIVE_UPDATE_ERROR_DEAD = (
constants.PENDING_CREATE, constants.ACTIVE, constants.PENDING_UPDATE,
constants.PENDING_SCALE_IN, constants.PENDING_SCALE_OUT, constants.ERROR,
constants.DEAD)
constants.PENDING_DELETE, constants.DEAD)
CREATE_STATES = (constants.PENDING_CREATE, constants.DEAD)