From 8c6362901aed10107a37b76d96d0e62c6df2e94b Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Mon, 30 Oct 2017 13:03:31 -0400 Subject: Support demo repo heat templates Update the robot home page Remove trailing stapces Issue: TEST-14 Change-Id: Ie9ea644cb8ed03c8ae3286eaecce9beb322525dc Signed-off-by: Jerry Flood --- robot/resources/test_templates/model_test_template.robot | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 c27b3014..4dce50a7 100644 --- a/robot/resources/test_templates/model_test_template.robot +++ b/robot/resources/test_templates/model_test_template.robot @@ -3,6 +3,7 @@ Documentation The main interface for interacting with ASDC. It handles low l Library OperatingSystem Library ArchiveLibrary Library Collections +Library String Resource ../asdc_interface.robot Variables ../../assets/service_mappings.py @@ -10,7 +11,7 @@ Variables ../../assets/service_mappings.py *** Variables *** ${ASDC_BASE_PATH} /sdc1 ${ASDC_DESIGNER_PATH} /proxy-designer1#/dashboard -${ASDC_ASSETS_DIRECTORY} robot/assets/asdc +${ASDC_ASSETS_DIRECTORY} ${GLOBAL_HEAT_TEMPLATES_FOLDER} ${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp #***************** Test Case Variables ********************* @@ -24,7 +25,8 @@ Model Distribution For Directory ${directory_list}= Get From Dictionary ${GLOBAL_SERVICE_FOLDER_MAPPING} ${service} ${ziplist}= Create List :for ${directory} in @{directory_list} - \ ${zip}= Catenate ${ASDC_ZIP_DIRECTORY}/${directory}.zip + \ ${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} -- cgit 1.2.3-korg