add VNFDID properties

add VNFDID properties in VNF Node of NSD and Service Descriptor

Change-Id: I915861ecce519cfe0bb376131bd5251662553eb1
Issue-ID: VFC-635
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>

diff --git a/catalog/pub/utils/toscaparser/nsdmodel.py b/catalog/pub/utils/toscaparser/nsdmodel.py
index 22a75b9..0313386 100644 (file)
--- a/catalog/pub/utils/toscaparser/nsdmodel.py
+++ b/catalog/pub/utils/toscaparser/nsdmodel.py
@@ -57,8 +57,10 @@ class EtsiNsdInfoModel(BaseInfoModel):
                 vnf['vnf_id'] = node['name']
                 vnf['description'] = node['description']
                 vnf['properties'] = node['properties']
-                if node['metadata']:
-                    vnf['properties']['id'] = node['metadata'].get('UUID', 'undefined')
+                if not vnf['properties'].get('id', None):
+                    vnf['properties']['id'] = vnf['properties'].get('descriptor_id', None)
+                if not vnf['properties'].get('id', None) and node['metadata']:
+                    vnf['properties']['id'] = node['metadata'].get('UUID', None)
                 vnf['dependencies'] = self._get_networks(node, node_types)
                 vnf['networks'] = self._get_networks(node, node_types)
                 vnfs.append(vnf)

diff --git a/catalog/pub/utils/toscaparser/servicemodel.py b/catalog/pub/utils/toscaparser/servicemodel.py
index bccd417..bc530ad 100644 (file)
--- a/catalog/pub/utils/toscaparser/servicemodel.py
+++ b/catalog/pub/utils/toscaparser/servicemodel.py
@@ -98,8 +98,10 @@ class SdcServiceModel(BaseInfoModel):
             if self.isNodeTypeX(node, node_types, VF_TYPE):
                 vnf = {}
                 self.setTargetValues(vnf, VNF_SECTIONS, node, SDC_VF_SECTIONS)
-                if node['metadata']:
-                    vnf['properties']['id'] = node['metadata'].get('UUID', 'undefined')
+                if not vnf['properties'].get('id', None):
+                    vnf['properties']['id'] = vnf['properties'].get('descriptor_id', None)
+                if not vnf['properties'].get('id', None) and node['metadata']:
+                    vnf['properties']['id'] = node['metadata'].get('UUID', None)
                 vnf['dependencies'] = self._get_networks(node, node_types)
                 vnf['networks'] = self._get_networks(node, node_types)
                 vnfs.append(vnf)