X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Fscale_vnf.py;h=2f5b31e87055ee4d571f49144edf72b27f59a617;hb=46ad7c172411214c5432ed93fda4271288077447;hp=60efb86c9b6fc56753dfcc2fab031aeed582858e;hpb=f70821304c49dd58e7a7eb791727acbec67fd018;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/biz/scale_vnf.py b/lcm/lcm/nf/biz/scale_vnf.py
index 60efb86c..2f5b31e8 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
@@ -75,12 +75,12 @@ class ScaleVnf(Thread):
             self.vnf_insts.update(status=INSTANTIATION_STATE.INSTANTIATED,
                                   lastuptime=now_time())
         except NFLCMException as e:
-            logger.error(e.message)
-            self.vnf_scale_failed_handle(e.message)
+            logger.error(e.args[0])
+            self.vnf_scale_failed_handle(e.args[0])
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
-            self.vnf_scale_failed_handle(e.message)
+            self.vnf_scale_failed_handle(e.args[0])
 
     def scale_pre(self):
         self.scale_type = self.data.get("type")
@@ -196,7 +196,7 @@ class ScaleVnf(Thread):
 
     def do_notify_del_vim_res(self, res_type, res_id):
         logger.debug('Scaling in [%s] resource, resourceid [%s]', res_type, res_id)
-        resource_type = RESOURCE_MAP.keys()[RESOURCE_MAP.values().index(res_type)]
+        resource_type = list(RESOURCE_MAP.keys())[list(RESOURCE_MAP.values()).index(res_type)]
         resource_table = globals().get(resource_type + 'InstModel')
         resource_table.objects.filter(instid=self.nf_inst_id, resourceid=res_id).delete()
         if res_type == "vm":
@@ -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)