summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authormaopengzhang <zhang.maopeng1@zte.com.cn>2019-05-30 10:16:43 +0800
committermaopengzhang <zhang.maopeng1@zte.com.cn>2019-05-30 10:24:41 +0800
commitc71175866d16bedda627b47acde2d46f33559127 (patch)
treef55883a7d2e8986ff779a038de1276bbc09a003a /lcm
parentd8b1a80c6b9f89d637df257d6347ca2a04426a14 (diff)
fix vnf status update error
fix vnf status update error Change-Id: I465d78f27399a19a4bf6c634eb3e28ea4b52fd39 Issue-ID: VFC-1406 Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/nf/biz/operate_vnf.py3
-rw-r--r--lcm/lcm/nf/biz/scale_vnf.py6
-rw-r--r--lcm/lcm/nf/views/common.py2
3 files changed, 5 insertions, 6 deletions
diff --git a/lcm/lcm/nf/biz/operate_vnf.py b/lcm/lcm/nf/biz/operate_vnf.py
index 775def30..c0c8540b 100644
--- a/lcm/lcm/nf/biz/operate_vnf.py
+++ b/lcm/lcm/nf/biz/operate_vnf.py
@@ -28,7 +28,6 @@ from lcm.pub.utils.notificationsutil import NotificationsUtil
from lcm.pub.utils.values import ignore_case_get
from lcm.pub.vimapi import adaptor
from lcm.nf.biz.grant_vnf import grant_resource
-from lcm.nf.const import VNF_STATUS
from lcm.nf.const import RESOURCE_MAP
from lcm.nf.const import GRANT_TYPE
from lcm.nf.const import OPERATION_STATE_TYPE
@@ -129,7 +128,7 @@ class OperateVnf(Thread):
def vnf_operate_failed_handle(self, error_msg):
logger.error('VNF Operation failed, detail message: %s' % error_msg)
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(
- status=VNF_STATUS.FAILED,
+ # status=VNF_STATUS.FAILED,
lastuptime=now_time()
)
self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, error_msg)
diff --git a/lcm/lcm/nf/biz/scale_vnf.py b/lcm/lcm/nf/biz/scale_vnf.py
index 60efb86c..ad828dd0 100644
--- a/lcm/lcm/nf/biz/scale_vnf.py
+++ b/lcm/lcm/nf/biz/scale_vnf.py
@@ -19,7 +19,7 @@ from threading import Thread
from lcm.nf.biz import common
from lcm.nf.biz.grant_vnf import grant_resource
-from lcm.nf.const import VNF_STATUS, GRANT_TYPE, CHANGE_TYPE
+from lcm.nf.const import GRANT_TYPE, CHANGE_TYPE
from lcm.nf.const import RESOURCE_MAP, OPERATION_STATE_TYPE
from lcm.nf.const import INSTANTIATION_STATE
from lcm.nf.const import OPERATION_TYPE
@@ -289,7 +289,7 @@ class ScaleVnf(Thread):
def vnf_scale_failed_handle(self, error_msg):
logger.error('VNF scaling failed, detail message: %s', error_msg)
- self.vnf_insts.update(status=VNF_STATUS.FAILED,
- lastuptime=now_time())
+ self.vnf_insts.update( # status=VNF_STATUS.FAILED,
+ lastuptime=now_time())
self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, error_msg)
JobUtil.add_job_status(self.job_id, 255, error_msg)
diff --git a/lcm/lcm/nf/views/common.py b/lcm/lcm/nf/views/common.py
index a57a93e1..a3c87a3c 100644
--- a/lcm/lcm/nf/views/common.py
+++ b/lcm/lcm/nf/views/common.py
@@ -126,7 +126,7 @@ def deal_vnf_action(logger, opt_type, opt_status, instid, req, req_serializer, a
job_id = JobUtil.create_job('NF', opt_type, instid)
JobUtil.add_job_status(job_id, 0, "VNF_%s_READY" % opt_type)
- vnf_insts.update(status=opt_status)
+ # vnf_insts.update(status=opt_status)
act_task(req.data, instid, job_id).start()
resp = Response(data={"jobId": job_id}, status=status.HTTP_202_ACCEPTED)