Fix vfc-catalog/swagger pep8 issue.

[vfc/nfvo/lcm.git] / lcm / ns / ns_instant.py

diff --git a/lcm/ns/ns_instant.py b/lcm/ns/ns_instant.py
index d16ea52..24a8d31 100644 (file)
--- a/lcm/ns/ns_instant.py
+++ b/lcm/ns/ns_instant.py
@@ -21,7 +21,7 @@ import uuid
 from rest_framework import status
 
 from lcm.pub.database.models import DefPkgMappingModel, ServiceBaseInfoModel, InputParamMappingModel
-from lcm.pub.database.models import NSInstModel, NfPackageModel, VNFFGInstModel, WFPlanModel, NSDModel
+from lcm.pub.database.models import NSInstModel, NfPackageModel, VNFFGInstModel, WFPlanModel
 from lcm.pub.msapi.catalog import get_process_id, query_rawdata_from_catalog
 from lcm.pub.msapi.catalog import get_servicetemplate_id, get_servicetemplate
 from lcm.pub.msapi.wso2bpel import workflow_run
@@ -33,7 +33,7 @@ from lcm.pub.exceptions import NSLCMException
 from lcm.pub.config.config import WORKFLOW_OPTION
 from lcm.workflows import build_in
 from lcm.pub.msapi import activiti
-from lcm.pub.utils import toscaparser
+from lcm.pub.msapi import sdc_run_catalog
 
 logger = logging.getLogger(__name__)
 
@@ -60,15 +60,14 @@ class InstantNSService(object):
             location_constraints = []
             if 'locationConstraints' in self.req_data:
                 location_constraints = self.req_data['locationConstraints']
-            
+
             JobUtil.add_job_status(job_id, 5, 'Start query nsd(%s)' % ns_inst.nspackage_id)
             dst_plan = None
             if WORKFLOW_OPTION == "wso2":
                 src_plan = query_rawdata_from_catalog(ns_inst.nspackage_id, input_parameters)
                 dst_plan = toscautil.convert_nsd_model(src_plan["rawData"])
             else:
-                nsd_pkg = NSDModel.objects.get(id=ns_inst.nspackage_id)
-                dst_plan = toscaparser.parse_nsd(nsd_pkg.nsd_path, input_parameters)
+                dst_plan = sdc_run_catalog.parse_nsd(ns_inst.nspackage_id, input_parameters)
             logger.debug('tosca plan dest:%s' % dst_plan)
 
             NSInstModel.objects.filter(id=self.ns_inst_id).update(nsd_model=dst_plan)
@@ -117,7 +116,7 @@ class InstantNSService(object):
                                  active_status='--',
                                  status=ns_inst.status,
                                  creator='--',
-                                 create_time=int(time.time()*1000)).save()
+                                 create_time=int(time.time() * 1000)).save()
 
             if WORKFLOW_OPTION == "wso2":
                 service_tpl = get_servicetemplate(ns_inst.nsd_id)