vfclcm upgrade from python2 to python3

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

diff --git a/lcm/lcm/nf/biz/update_vnf.py b/lcm/lcm/nf/biz/update_vnf.py
index 0721c5d..0dfaa75 100644 (file)
--- a/lcm/lcm/nf/biz/update_vnf.py
+++ b/lcm/lcm/nf/biz/update_vnf.py
@@ -12,41 +12,71 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
+import traceback
 from threading import Thread
 
 from lcm.pub.database.models import NfInstModel
+from lcm.pub.exceptions import NFLCMException
 from lcm.nf.const import OPERATION_STATE_TYPE
 from lcm.nf.const import OPERATION_TYPE
+from lcm.nf.const import OPERATION_TASK
 from lcm.pub.utils.notificationsutil import NotificationsUtil
 from lcm.pub.utils.notificationsutil import prepare_notification
+from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.utils.timeutil import now_time
+from .operate_vnf_lcm_op_occ import VnfLcmOpOcc
 
 logger = logging.getLogger(__name__)
 
 
 class UpdateVnf(Thread):
     def __init__(self, data, instanceid, job_id):
+        super(UpdateVnf, self).__init__()
         self.data = data
         self.nf_inst_id = instanceid
         self.job_id = job_id
         self.vnf_insts = NfInstModel.objects.filter(nfinstid=instanceid)
+        self.lcm_op_occ = VnfLcmOpOcc(
+            vnf_inst_id=instanceid,
+            lcm_op_id=job_id,
+            operation=OPERATION_TYPE.MODIFY_INFO,
+            task=OPERATION_TASK.MODIFY
+        )
 
     def run(self):
         logger.debug("start update for vnf %s", self.nf_inst_id)
         key = "vnfInstanceName"
-        if key in self.data and self.data[key] is not None:
-            self.vnf_insts.update(nf_name=self.data[key],
-                                  lastuptime=now_time())
-
-        key = "vnfInstanceDescription"
-        if key in self.data and self.data[key] is not None:
-            self.vnf_insts.update(nf_desc=self.data[key],
-                                  lastuptime=now_time())
-
-        key = "vnfPkgId"
-        if key in self.data:
-            self.vnf_insts.update(vnfdid=self.data[key],
-                                  lastuptime=now_time())
+        try:
+            self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.PROCESSING)
+            JobUtil.add_job_status(self.job_id, 50, "Start updating VNF.")
+
+            if key in self.data and self.data[key] is not None:
+                self.vnf_insts.update(nf_name=self.data[key],
+                                      lastuptime=now_time())
+
+            key = "vnfInstanceDescription"
+            if key in self.data and self.data[key] is not None:
+                self.vnf_insts.update(nf_desc=self.data[key],
+                                      lastuptime=now_time())
+
+            key = "vnfPkgId"
+            if key in self.data:
+                self.vnf_insts.update(vnfdid=self.data[key],
+                                      lastuptime=now_time())
+
+            JobUtil.add_job_status(self.job_id, 75, "Start sending notification.")
+            self.send_notification()
+
+            JobUtil.add_job_status(self.job_id, 100, "Update VNF success.")
+        except NFLCMException as e:
+            logger.error(e.args[0])
+            self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, e.args[0])
+            JobUtil.add_job_status(self.job_id, 255, e.args[0])
+        except Exception as e:
+            logger.error(e.args[0])
+            logger.error(traceback.format_exc())
+            self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, e.args[0])
+            JobUtil.add_job_status(self.job_id, 255, e.args[0])
 
     def send_notification(self):
         notify_data = prepare_notification(nfinstid=self.nf_inst_id,