aboutsummaryrefslogtreecommitdiffstats
path: root/robot
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-07-25 17:10:53 -0400
committerBrian Freeman <bf1936@att.com>2019-07-25 21:48:01 +0000
commit3c98fb3cb263f16f0ea2a8d3937505e285bb0238 (patch)
tree5fb479639889549df42062c20d6b6d8dfb26f591 /robot
parent908e9bdfc0a0778346b6571dddf5134fd3d7dbee (diff)
fixing teardown issue
Issue-ID: TEST-179 Change-Id: I66b10246e8a991e6e60b79121bffff359ca40b26 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot')
-rw-r--r--robot/resources/test_templates/model_test_template.robot6
-rw-r--r--robot/testsuites/health-check.robot2
2 files changed, 6 insertions, 2 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index dbbe2644..8fa502df 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -13,6 +13,11 @@ ${ASDC_ASSETS_DIRECTORY} ${GLOBAL_HEAT_TEMPLATES_FOLDER}
${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp
*** Keywords ***
+Model Distribution For Directory With Teardown
+ [Arguments] ${service} ${catalog_service_name}= ${cds}=
+ ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} ${catalog_resource_ids} ${catalog_service_id}= Model Distribution For Directory ${service} ${catalog_service_name} ${cds}
+ [Teardown] Teardown Models ${catalog_service_id} ${catalog_resource_ids}
+
Model Distribution For Directory
[Arguments] ${service} ${catalog_service_name}= ${cds}=
ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
@@ -32,7 +37,6 @@ Model Distribution For Directory
${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}
Download CSAR ${catalog_service_id}
[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
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 2202d302..466a6d25 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -282,7 +282,7 @@ Basic VNFSDK Health Check
Health Distribution Test
[Tags] healthdist
[Timeout] 1200
- Model Distribution For Directory vFW
+ Model Distribution For Directory With Teardown vFW
Portal Login Tests
[Tags] healthlogin