openstack
/
tacker
Code Issues Proposed changes

Merge "Correct tstamp and res_state in event when updating vnf."

This commit is contained in:
Jenkins 2017-05-19 06:33:14 +00:00 committed by Gerrit Code Review
parent b7f9710ed3 e36d4a7dc7
commit 7ebb37e089
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,13 +518,14 @@ class VNFMPluginDb(vnfm.VNFMPluginBase, db_base.CommonDbMixin):
return updated_vnf_dict
def _update_vnf_post(self, context, vnf_id, new_status,
new_vnf_dict=None):
new_vnf_dict):
updated_time_stamp = timeutils.utcnow()
with context.session.begin(subtransactions=True):
(self._model_query(context, VNF).
filter(VNF.id == vnf_id).
filter(VNF.status == constants.PENDING_UPDATE).
update({'status': new_status,
'updated_at': timeutils.utcnow()}))
'updated_at': updated_time_stamp}))
dev_attrs = new_vnf_dict.get('attributes', {})
(context.session.query(VNFAttribute).
@ -539,9 +540,9 @@ class VNFMPluginDb(vnfm.VNFMPluginBase, db_base.CommonDbMixin):
self._cos_db_plg.create_event(
context, res_id=vnf_id,
res_type=constants.RES_TYPE_VNF,
res_state=new_vnf_dict['status'],
res_state=new_status,
evt_type=constants.RES_EVT_UPDATE,
tstamp=new_vnf_dict[constants.RES_EVT_UPDATED_FLD])
tstamp=updated_time_stamp)
def _delete_vnf_pre(self, context, vnf_id):
with context.session.begin(subtransactions=True):
@ -613,7 +614,9 @@ class VNFMPluginDb(vnfm.VNFMPluginBase, db_base.CommonDbMixin):
# start actual update of hosting vnf
# waiting for completion of update should be done backgroundly
# by another thread if it takes a while
self._update_vnf_post(context, vnf_id, constants.ACTIVE)
self._update_vnf_post(context, vnf_id,
constants.ACTIVE,
vnf_dict)
return vnf_dict
# reference implementation. needs to be overrided by subclass

4
tacker/vnfm/plugin.py
View File

@ -446,7 +446,9 @@ class VNFMPlugin(vnfm_db.VNFMPluginDb, VNFMMgmtMixin):
vnf_dict['id'],
six.text_type(e))
self.mgmt_update_post(context, vnf_dict)
self._update_vnf_post(context, vnf_id, constants.ERROR)
self._update_vnf_post(context, vnf_id,
constants.ERROR,
vnf_dict)
self.spawn_n(self._update_vnf_wait, context, vnf_dict, vim_auth,
driver_name)