From 868b9a32ad5df1ebaaa66bf76e9a8082cf871a7d Mon Sep 17 00:00:00 2001
From: hammad zafar <hammad.zafar@xflowresearch.com>
Date: Fri, 5 Mar 2021 18:00:41 +0500
Subject: [PATCH] updated importing of variables for descriptors
---
.../VNFPackageManagementKeywords.robot | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index d8fff843..6f275af2 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -9,8 +9,8 @@ Library Collections
Library JSONSchemaLibrary schemas/
Library Process
Library String
-Variables descriptors/SOL001/VNFD/vnfd_SOL001.yaml
-Variables descriptors/SOL006/VNFD/vnfd_SOL006.yaml
+#Variables descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+#Variables descriptors/SOL006/VNFD/vnfd_SOL006.yaml
*** Keywords ***
Get all VNF Packages
@@ -1578,6 +1578,7 @@ PARSE the Descriptor File
Run Keyword If '${descriptorType}'=='SOL001' Fetch Information from SOL001 descriptor file ELSE Fetch Information from SOL006 descriptor file
Fetch Information from SOL001 descriptor file
+ Import Variables ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
${descriptor_id}= Get Variable Value ${topology_template.node_templates.properties.descriptor_id}
${provider}= Get Variable Value ${topology_template.node_templates.properties.provider}
${product_name}= Get Variable Value ${topology_template.node_templates.properties.product_name}
@@ -1590,6 +1591,7 @@ Fetch Information from SOL001 descriptor file
Set Global Variable ${Descriptor_Version} ${descriptor_version}
Fetch Information from SOL006 descriptor file
+ Import Variables ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
${descriptor_id}= Get Variable Value ${nfv.vnfd[0].id}
${provider}= Get Variable Value ${nfv.vnfd[0].provider}
${product_name}= Get Variable Value ${nfv.vnfd[0]['product-name']}
--
GitLab