diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2017-09-20 17:40:47 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2017-09-20 17:40:47 +0800 |
| commit | 5bc9aba661dfa0155691ce2f7b6b4900de9f40d4 (patch) | |
| tree | 48d33dad8d0521f4c2dba6c8271353450b818da9 | |
| parent | f519e4c610cdce2c43e57919812323bcf1cc3d00 (diff) | |
Call nsd parse from catalog
Change-Id: I918b9b23606fbe99764b6761d416c58509cebd74
Issue-id: VFC-402
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
| -rw-r--r-- | lcm/ns/ns_instant.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) |