From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Mon, 4 Dec 2017 04:00:18 +0000 (+0800)
Subject: Modify vfc-catalog ns convert logic.
X-Git-Tag: v1.1.0~97
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2ce66dfe38e7605fb2eaa9b3092292ac6b873fdf;p=vfc%2Fnfvo%2Fcatalog.git

Modify vfc-catalog ns convert logic.

Change-Id: Ib745e69aa2b3b812d433a32a6caf2b3ce3fc17f3
Issue-ID: VFC-607
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/catalog/pub/utils/toscaparser/nsdmodel.py b/catalog/pub/utils/toscaparser/nsdmodel.py
index fa8b8410..7bf2bc60 100644
--- a/catalog/pub/utils/toscaparser/nsdmodel.py
+++ b/catalog/pub/utils/toscaparser/nsdmodel.py
@@ -86,21 +86,21 @@ class EtsiNsdInfoModel(BaseInfoModel):
                 vnf['description'] = node['description']
                 vnf['properties'] = node['properties']
                 vnf['properties']['id'] = node['metadata'].get('UUID', 'undefined')
-                for key in vnf['properties'].iterkeys():
-                    if key.endswith('_version'):
-                        vnf['properties'].update(version=vnf['properties'].pop(key))
-                    if key.endswith('_id'):
-                        vnf['properties'].update(id=vnf['properties'].pop(key))
-                    if key.endswith('_csarProvider'):
-                        vnf['properties'].update(csarProvider=vnf['properties'].pop(key))
-                    if key.endswith('_csarVersion'):
-                        vnf['properties'].update(csarVersion=vnf['properties'].pop(key))
-                    if key.endswith('_vendor'):
-                        vnf['properties'].update(vendor=vnf['properties'].pop(key))
-                    if key.endswith('_csarType'):
-                        vnf['properties'].update(csarType=vnf['properties'].pop(key))
-                    if key.endswith('_vnfm_type') or key.endswith('_vnfmType'):
-                        vnf['properties'].update(vnfmType=vnf['properties'].pop(key))
+                # for key in vnf['properties'].iterkeys():
+                #     if key.endswith('_version'):
+                #         vnf['properties'].update(version=vnf['properties'].pop(key))
+                #     if key.endswith('_id'):
+                #         vnf['properties'].update(id=vnf['properties'].pop(key))
+                #     if key.endswith('_csarProvider'):
+                #         vnf['properties'].update(csarProvider=vnf['properties'].pop(key))
+                #     if key.endswith('_csarVersion'):
+                #         vnf['properties'].update(csarVersion=vnf['properties'].pop(key))
+                #     if key.endswith('_vendor'):
+                #         vnf['properties'].update(vendor=vnf['properties'].pop(key))
+                #     if key.endswith('_csarType'):
+                #         vnf['properties'].update(csarType=vnf['properties'].pop(key))
+                #     if key.endswith('_vnfm_type') or key.endswith('_vnfmType'):
+                #         vnf['properties'].update(vnfmType=vnf['properties'].pop(key))
                 # vnf['dependencies'] = map(lambda x: self.get_requirement_node_name(x), self.getNodeDependencys(node))
                 vnf['dependencies'] = self.get_networks(node)
                 vnf['networks'] = self.get_networks(node)