Add lcm op occ to scale to level

Change-Id: I184a0f9e5aaa877a84121c859ebad8ab01ad35ab
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/lcm/nf/biz/scale_vnf.py b/lcm/lcm/nf/biz/scale_vnf.py
index 9f59193..60efb86 100644 (file)
--- a/lcm/lcm/nf/biz/scale_vnf.py
+++ b/lcm/lcm/nf/biz/scale_vnf.py
@@ -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

diff --git a/lcm/lcm/nf/biz/scale_vnf_to_level.py b/lcm/lcm/nf/biz/scale_vnf_to_level.py
index 03189e9..0e856ec 100644 (file)
--- a/lcm/lcm/nf/biz/scale_vnf_to_level.py
+++ b/lcm/lcm/nf/biz/scale_vnf_to_level.py
@@ -16,8 +16,11 @@ import logging
 
 from lcm.nf.biz.scale_vnf import ScaleVnf
 from lcm.nf.const import GRANT_TYPE
+from lcm.nf.const import OPERATION_TYPE
+from lcm.nf.const import OPERATION_TASK
 from lcm.pub.database.models import VmInstModel
 from lcm.pub.exceptions import NFLCMException
+from .operate_vnf_lcm_op_occ import VnfLcmOpOcc
 
 logger = logging.getLogger(__name__)
 
@@ -28,6 +31,13 @@ class ScaleVnfToLevel(ScaleVnf):
                                               nf_inst_id=nf_inst_id,
                                               job_id=job_id)
         self.aspect_id = ''
+        self.lcm_op_occ = VnfLcmOpOcc(
+            vnf_inst_id=nf_inst_id,
+            lcm_op_id=job_id,
+            operation=OPERATION_TYPE.SCALE_TO_LEVEL,
+            task=OPERATION_TASK.SCALE_TO_LEVEL
+        )
+        self.op_type = OPERATION_TYPE.SCALE_TO_LEVEL
 
     def scale_pre(self):
         self.vnfd_info = json.loads(self.vnf_insts[0].vnfd_model)