fix vnf status update error

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / biz / scale_vnf.py

diff --git a/lcm/lcm/nf/biz/scale_vnf.py b/lcm/lcm/nf/biz/scale_vnf.py
index 9f59193..ad828dd 100644 (file)
--- 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
@@ -53,6 +53,7 @@ class ScaleVnf(Thread):
             operation=OPERATION_TYPE.SCALE,
             task=OPERATION_TASK.SCALE
         )
+        self.op_type = OPERATION_TYPE.SCALE
 
     def run(self):
         try:
@@ -155,7 +156,7 @@ class ScaleVnf(Thread):
     def send_notification(self):
         data = prepare_notification(nfinstid=self.nf_inst_id,
                                     jobid=self.job_id,
-                                    operation=OPERATION_TYPE.SCALE,
+                                    operation=self.op_type,
                                     operation_state=OPERATION_STATE_TYPE.COMPLETED)
 
         # TODO: need set changedExtConnectivity for data
@@ -288,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)