From: Kailun Qin <kailun.qin@intel.com>
Date: Tue, 10 Apr 2018 13:42:51 +0000 (+0800)
Subject: Update VL parsing to get fields required by LCM
X-Git-Tag: v1.1.0~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e21a9afd0a6ec19741994c57b85ea54f9d57dc8d;p=vfc%2Fnfvo%2Fcatalog.git

Update VL parsing to get fields required by LCM

Change-Id: I9d4bc91516debdc741402a730fa13c66024622ca
Issue-ID: VFC-869
Signed-off-by: Kailun Qin <kailun.qin@intel.com>
---

diff --git a/catalog/pub/utils/toscaparser/nsdmodel.py b/catalog/pub/utils/toscaparser/nsdmodel.py
index 2e679e4c..b09ec0a6 100644
--- a/catalog/pub/utils/toscaparser/nsdmodel.py
+++ b/catalog/pub/utils/toscaparser/nsdmodel.py
@@ -139,20 +139,13 @@ class EtsiNsdInfoModel(BaseInfoModel):
     def get_all_vl(self, nodeTemplates, node_types):
         vls = []
         for node in nodeTemplates:
-            if self.isVl(node, node_types):
-                vl = {}
+            if self.isVl(node, node_types) or self._isExternalVL(node):
+                vl = dict()
                 vl['vl_id'] = node['name']
                 vl['description'] = node['description']
                 vl['properties'] = node['properties']
-                vl['route_external'] = False
-                vl['route_id'] = self._get_vl_route_id(node)
-                vls.append(vl)
-            if self._isExternalVL(node):
-                vl = {}
-                vl['vl_id'] = node['name']
-                vl['description'] = node['description']
-                vl['properties'] = node['properties']
-                vl['route_external'] = True
+                vl['route_external'] = False if self.isVl(node, node_types) else True
+                # vl['route_id'] = self._get_vl_route_id(node)
                 vls.append(vl)
         return vls