From d45dbc5433f3cbee8e86fd60257bd92f74d6cd09 Mon Sep 17 00:00:00 2001
From: hammad zafar <hammad.zafar@xflowresearch.com>
Date: Thu, 11 Mar 2021 14:25:34 +0500
Subject: [PATCH] updated importing of variables for VNFD parsing
---
.../VNFPackageManagementKeywords.robot | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index d368354f..9cd20560 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -10,8 +10,8 @@ Library MockServerLibrary
Library String
Library Collections
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
@@ -196,6 +196,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}
@@ -209,6 +210,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