diff options
| author |   Kailun Qin <kailun.qin@intel.com> | 2018-04-10 21:42:51 +0800 |
|---|---|---|
| committer | Kailun Qin <kailun.qin@intel.com> | 2018-04-11 17:25:18 +0800 |
| commit | e21a9afd0a6ec19741994c57b85ea54f9d57dc8d (patch) | |
| tree | 6c2709dc6c99a168a5101f06aa86e3ed496d2898 | |
| parent | d773e53b2c2de6fa77f84dcb2cd5576be1b6c6f9 (diff) | |
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>
| -rw-r--r-- | catalog/pub/utils/toscaparser/nsdmodel.py | 15 |
1 files changed, 4 insertions, 11 deletions
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 |