From 3a169a30cdcd9e890e07fdaaad154d104f565e94 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Fri, 1 Dec 2017 12:39:10 -0500 Subject: Add support for vFWCL - multiple VNFs Issue-ID: TEST-72 Change-Id: Ic6fe176ca5fdeac00cd5018aecf7824ec4eca287 Signed-off-by: Jerry Flood --- robot/resources/test_templates/model_test_template.robot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'robot/resources/test_templates/model_test_template.robot') diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot index 4dce50a7..98b3b1cf 100644 --- a/robot/resources/test_templates/model_test_template.robot +++ b/robot/resources/test_templates/model_test_template.robot @@ -3,7 +3,7 @@ Documentation The main interface for interacting with ASDC. It handles low l Library OperatingSystem Library ArchiveLibrary Library Collections -Library String +Library String Resource ../asdc_interface.robot Variables ../../assets/service_mappings.py @@ -25,16 +25,17 @@ Model Distribution For Directory ${directory_list}= Get From Dictionary ${GLOBAL_SERVICE_FOLDER_MAPPING} ${service} ${ziplist}= Create List :for ${directory} in @{directory_list} - \ ${zipname}= Replace String ${directory} / _ + \ ${zipname}= Replace String ${directory} / _ \ ${zip}= Catenate ${ASDC_ZIP_DIRECTORY}/${zipname}.zip \ ${folder}= Catenate ${ASDC_ASSETS_DIRECTORY}/${directory} \ OperatingSystem.Create Directory ${ASDC_ASSETS_DIRECTORY}/temp \ Create Zip From Files In Directory ${folder} ${zip} \ Append To List ${ziplist} ${zip} - ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} Distribute Model From ASDC ${ziplist} ${catalog_service_name} + ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute Model From ASDC ${ziplist} ${catalog_service_name} Set Test Variable ${CATALOG_RESOURCE_IDS} ${catalog_resource_ids} Set Test Variable ${CATALOG_SERVICE_ID} ${catalog_service_id} - [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} + Set Test Variable ${CATALOG_RESOURCES} ${catalog_resources} + [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} -- cgit 1.2.3-korg