Update python2 to python3

[vfc/nfvo/lcm.git] / lcm / ns_vnfs / biz / create_vnfs.py

diff --git a/lcm/ns_vnfs/biz/create_vnfs.py b/lcm/ns_vnfs/biz/create_vnfs.py
index a968d64..3e6c511 100644 (file)
--- a/lcm/ns_vnfs/biz/create_vnfs.py
+++ b/lcm/ns_vnfs/biz/create_vnfs.py
@@ -36,7 +36,7 @@ from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
 from lcm.pub.msapi.vnfmdriver import send_nf_init_request
 from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.utils.share_lock import do_biz_with_share_lock
+# from lcm.pub.utils.share_lock import do_biz_with_share_lock
 from lcm.pub.utils.timeutil import now_time
 from lcm.pub.utils.values import ignore_case_get
 
@@ -110,7 +110,7 @@ class CreateVnfs(Thread):
         self.properties = ignore_case_get(additional_param, 'properties')
         self.vnfm_inst_id = ignore_case_get(additional_param, 'vnfmInstanceId')
         para = ignore_case_get(additional_param, 'inputs')
-        self.inputs = json.loads(para) if isinstance(para, (str, unicode)) else para
+        self.inputs = json.loads(para) if isinstance(para, str) else para
         self.vim_id = ignore_case_get(additional_param, 'vimId')
         self.vnfd_id = ignore_case_get(additional_param, 'vnfdId')
 
@@ -166,7 +166,7 @@ class CreateVnfs(Thread):
                     'subnetwork_name': subnet_name,
                     'vl_instance_id': vl_instance_id
                 })
-                vim_id = json.JSONDecoder().decode(vl_instance.vimid) if isinstance(vl_instance.vimid, (str, unicode)) \
+                vim_id = json.JSONDecoder().decode(vl_instance.vimid) if isinstance(vl_instance.vimid, str) \
                     else vl_instance.vimid
                 ext_virtual_link.append({
                     "vlInstanceId": vl_instance_id,
@@ -329,7 +329,7 @@ class CreateVnfs(Thread):
             base_url=base_url,
             user=OOF_USER,
             passwd=OOF_PASSWD,
-            auth_type=restcall.rest_oneway_auth,
+            auth_type=restcall.rest_no_auth,
             resource=resources,
             method="POST",
             content=json.dumps(req_body),
@@ -352,7 +352,7 @@ class CreateVnfs(Thread):
                 cloud_region_id="none",
                 vdu_info="none"
             )
-            raise Exception("Received a Bad Sync from OOF with response code %s" % resp_status)
+            logger.error("Received a Bad Sync from OOF with response code %s" % resp_status)
         logger.info("Completed Homing request to OOF")
 
     def send_get_vnfm_request_to_extsys(self):
@@ -395,7 +395,10 @@ class CreateVnfs(Thread):
             'vnfInstanceId': self.vnfm_nf_inst_id,
             'vnfmId': self.vnfm_inst_id
         }
-        SubscriptionCreation(data).do_biz()
+        try:
+            SubscriptionCreation(data).do_biz()
+        except Exception as e:
+            logger.error("subscribe failed: %s", e.message)
 
     def write_vnf_creation_info(self):
         logger.debug("write_vnf_creation_info start")
@@ -411,7 +414,7 @@ class CreateVnfs(Thread):
 
     def save_info_to_db(self):
         logger.debug("save_info_to_db start")
-        do_biz_with_share_lock("set-vnflist-in-vnffginst-%s" % self.ns_inst_id, self.save_vnf_inst_id_in_vnffg)
+        # do_biz_with_share_lock("set-vnflist-in-vnffginst-%s" % self.ns_inst_id, self.save_vnf_inst_id_in_vnffg)
         NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status=VNF_STATUS.ACTIVE, lastuptime=now_time())
         logger.debug("save_info_to_db end")