From 4e774dd7143d8af3a9eb56c952e7c0a9e42ff4d4 Mon Sep 17 00:00:00 2001
From: muhammadh <muhammad.hamza@xflowresearch.com>
Date: Mon, 27 Sep 2021 16:07:56 +0500
Subject: [PATCH] fixed VNFD parsing in SOL002 VNF-LCM-API

---
 .../VnfLcmOperationKeywords.robot             | 22 +++++++++++++------
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  |  2 --
 .../environment/variables.txt                 |  3 ++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 2d5e6403..284b86aa 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1132,8 +1132,16 @@ Fetch Information from SOL001 descriptor file
     @{VirtualLink_labels}=    Create List
     @{CP_labels}=    Create List
     @{Storage_labels}=    Create List
+    FOR    ${key}    IN    @{node_types.keys()}
+        ${node_type}=    Get Variable Value    ${node_types['${key}']['derived_from']}
+        ${is_VNF}=    Run Keyword And Return Status    Should Be Equal As Strings    ${node_type}    ${tosca_type_VNF}
+        Run Keyword If    ${is_VNF}    Set Global Variable    ${tosca_type_derived_from_VNF}    ${key}
+    END  
+    ${derived_type_is_used}=    Run Keyword And Return Status    Should not be empty    ${tosca_type_derived_from_VNF}
+    Run Keyword If    ${derived_type_is_used}    Set Global Variable    ${tosca_type_VNF}    ${tosca_type_derived_from_VNF} 
+
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates['${key}'].type}
         ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
         ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
         ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
@@ -1155,12 +1163,12 @@ Fetch Information from SOL001 descriptor file
 Get VNF Attributes from SOL001
     Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
     [Arguments]    ${VNF_label}
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.flavour_id}
     
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     Set Global Variable    ${Provider}    ${provider}
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index 7f25ee91..fa3d11e5 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -90,7 +90,6 @@ topology_template:
         order: 1
       requirements:
         - virtual_binding: VDU-B
-    vdu-b-1-vsd:
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
@@ -98,7 +97,6 @@ topology_template:
         order: 0
       requirements:
         - virtual_binding: VDU-B
-    vdu-b-1-vsd:
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index bd926242..f4b5436e 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -88,10 +88,11 @@ ${descriptorType}    SOL006
 ${check_multiple_instances}    0
 
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
-${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+${tosca_type_derived_from_VNF}
  
 ${VDU_IDs}
 ${VNF_IDs}
-- 
GitLab