aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources/test_templates/model_test_template.robot
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-07-22 12:37:45 -0400
committerDR695H <dr695h@att.com>2019-07-22 17:17:28 -0400
commitc1103fba68e3461b136b044daec3339d0e6575f7 (patch)
treeaeef2cbf58858d236d8dfa4b17c463fab83b5b6a /robot/resources/test_templates/model_test_template.robot
parentd979465ec6720dffbebd22bd83104ea5a5f4e65e (diff)
remove the last of the global variables
Issue-ID: TEST-174 Change-Id: I1997bd0e4b693f3560f2cfc254c93537c96ed444 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/test_templates/model_test_template.robot')
-rw-r--r--robot/resources/test_templates/model_test_template.robot17
1 files changed, 2 insertions, 15 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index ab331051..dfbf541c 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -9,15 +9,9 @@ Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping
Resource ../asdc_interface.robot
*** Variables ***
-${ASDC_BASE_PATH} /sdc1
-${ASDC_DESIGNER_PATH} /proxy-designer1#/dashboard
${ASDC_ASSETS_DIRECTORY} ${GLOBAL_HEAT_TEMPLATES_FOLDER}
${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp
-#***************** Test Case Variables *********************
-${CATALOG_RESOURCE_IDS}
-${CATALOG_SERVICE_ID}
-
*** Keywords ***
Model Distribution For Directory
[Arguments] ${service} ${catalog_service_name}= ${cds}=
@@ -36,16 +30,9 @@ Model Distribution For Directory
\ 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} ${catalog_resources} Distribute Model From ASDC ${ziplist} ${catalog_service_name} ${cds} ${service}
- Set Test Variable ${CATALOG_RESOURCE_IDS} ${catalog_resource_ids}
- Set Test Variable ${CATALOG_SERVICE_ID} ${catalog_service_id}
- Set Test Variable ${CATALOG_RESOURCES} ${catalog_resources}
Download CSAR ${catalog_service_id}
- [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources}
-
-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}
+ [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} ${catalog_resource_ids} ${catalog_service_id}
+ [Teardown] Teardown Models ${catalog_service_id} ${catalog_resource_ids}
Teardown Models
[Documentation] Clean up at the end of the test