diff options
| author |   jf9860 <jf9860@att.com> | 2017-03-09 15:28:42 -0500 |
|---|---|---|
| committer | jf9860 <jf9860@att.com> | 2017-03-09 15:29:18 -0500 |
| commit | 99c6329d9b5f5f83a38eb309181200b80d153949 (patch) | |
| tree | b7e51225ba0ac869f4c63d0d456b6bdd90550b6d /robot/resources/test_templates/model_test_template.robot | |
| parent | ca5693c162ed0d019b416b5784c0ee8eaf653abf (diff) | |
TEST-4 Re-factor openstack region variable
Change-Id: Iad9ef0555dbbd921e261bfa2a63806100bcf7c83
Signed-off-by: jf9860 <jf9860@att.com>
Diffstat (limited to 'robot/resources/test_templates/model_test_template.robot')
| -rw-r--r-- | robot/resources/test_templates/model_test_template.robot | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot index e97984d5..add942db 100644 --- a/robot/resources/test_templates/model_test_template.robot +++ b/robot/resources/test_templates/model_test_template.robot @@ -2,7 +2,7 @@ Documentation The main interface for interacting with ASDC. It handles low level stuff like managing the http request library and DCAE required fields Library OperatingSystem Library ArchiveLibrary -Library Collections +Library Collections Resource ../asdc_interface.robot Variables ../../assets/service_mappings.py @@ -17,8 +17,9 @@ ${VVG_DIRECTORY} base_vvg ${SCALING_DIRECTORY} dns_scaling ${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp -${CATALOG_RESOURCE_IDS} -${CATALOG_SERVICE_ID} +#***************** Test Case Variables ********************* +${CATALOG_RESOURCE_IDS} +${CATALOG_SERVICE_ID} *** Keywords *** @@ -28,30 +29,29 @@ Model Distribution For Directory ${ziplist}= Create List :for ${directory} in @{directory_list} \ ${zip}= Catenate ${ASDC_ZIP_DIRECTORY}/${directory}.zip - \ ${folder}= Catenate ${ASDC_ASSETS_DIRECTORY}/${directory} + \ ${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} + \ 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} 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} - + [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} + Teardown Model Distribution [Documentation] Clean up at the end of the test - Log ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS} - Teardown Models ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS} - + Log ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS} + Teardown Models ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS} + Teardown Models [Documentation] Clean up at the end of the test [Arguments] ${catalog_service_id} ${catalog_resource_ids} Return From Keyword If '${catalog_service_id}' == '' :for ${catalog_resource_id} in @{catalog_resource_ids} - \ ${resourece_json}= Mark ASDC Catalog Resource Inactive ${catalog_resource_id} + \ ${resourece_json}= Mark ASDC Catalog Resource Inactive ${catalog_resource_id} ${service_json}= Mark ASDC Catalog Service Inactive ${catalog_service_id} ${services_json}= Delete Inactive ASDC Catalog Services ${resources_json}= Delete Inactive ASDC Catalog Resources -
\ No newline at end of file |