diff options
| author |   Jerry Flood <jf9860@att.com> | 2017-10-30 13:03:31 -0400 |
|---|---|---|
| committer | Jerry Flood <jf9860@att.com> | 2017-10-30 13:10:06 -0400 |
| commit | 8c6362901aed10107a37b76d96d0e62c6df2e94b (patch) | |
| tree | e157f4ee900d334a16d5b17efb114a6c47aa410d /robot/resources | |
| parent | bfc7fcce302d41d598b9e3ae36f6e49e423767eb (diff) | |
Support demo repo heat templates
Update the robot home page
Remove trailing stapces
Issue: TEST-14
Change-Id: Ie9ea644cb8ed03c8ae3286eaecce9beb322525dc
Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot/resources')
| -rw-r--r-- | robot/resources/asdc_interface.robot | 3 | ||||
| -rw-r--r-- | robot/resources/test_templates/model_test_template.robot | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot index 75e2dd1e..90bf952a 100644 --- a/robot/resources/asdc_interface.robot +++ b/robot/resources/asdc_interface.robot @@ -68,8 +68,9 @@ Distribute Model From ASDC Distribute ASDC Catalog Service ${catalog_service_id} ${catalog_service_resp}= Get ASDC Catalog Service ${catalog_service_id} ${vf_module}= Find Element In Array ${loop_catalog_resource_resp['groups']} type org.openecomp.groups.VfModule - [Return] ${catalog_service_resp['name']} ${loop_catalog_resource_resp['name']} ${vf_module} ${catalog_resource_ids} ${catalog_service_id} Check Catalog Service Distributed ${catalog_service_resp['uuid']} + [Return] ${catalog_service_resp['name']} ${loop_catalog_resource_resp['name']} ${vf_module} ${catalog_resource_ids} ${catalog_service_id} + Setup ASDC Catalog Resource [Documentation] Creates all the steps a vf needs for an asdc catalog resource and returns the id [Arguments] ${model_zip_path} 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} |