From: fujinhua Date: Wed, 20 Sep 2017 09:40:47 +0000 (+0800) Subject: Call nsd parse from catalog X-Git-Tag: v1.0.0~48 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F13799%2F1;p=vfc%2Fnfvo%2Flcm.git Call nsd parse from catalog Change-Id: I918b9b23606fbe99764b6761d416c58509cebd74 Issue-id: VFC-402 Signed-off-by: fujinhua --- diff --git a/lcm/ns/ns_instant.py b/lcm/ns/ns_instant.py index d16ea526..255daffa 100644 --- a/lcm/ns/ns_instant.py +++ b/lcm/ns/ns_instant.py @@ -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__) @@ -68,7 +68,7 @@ class InstantNSService(object): 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)