diff options
| author |   Jerry Flood <jf9860@att.com> | 2017-03-14 07:34:41 -0400 |
|---|---|---|
| committer | Jerry Flood <jf9860@att.com> | 2017-03-14 07:35:09 -0400 |
| commit | 8877bca253caf09b72e0482a093844c71ed730b1 (patch) | |
| tree | 88db036ec761ea2c006f666860af58c0f1f24a44 | |
| parent | 6d138c789b733a93be5c1724e591ad728c96efd9 (diff) | |
TEST-10 Include stack deletion as part of the tc
Change-Id: I44dc565e600035c3ae5e32699558748ee80873b3
Signed-off-by: Jerry Flood <jf9860@att.com>
3 files changed, 15 insertions, 5 deletions
diff --git a/robot/resources/test_templates/closedloop_test_template.robot b/robot/resources/test_templates/closedloop_test_template.robot index e5a5ca92..d879f9d2 100644 --- a/robot/resources/test_templates/closedloop_test_template.robot +++ b/robot/resources/test_templates/closedloop_test_template.robot @@ -54,13 +54,14 @@ VFW Policy Initialize VFW Policy ${stackname}= Orchestrate VNF vFW closedloop Policy Check Firewall Stack ${stackname} ${VFWPOLICYRATE} - + Delete VNF VDNS Policy Initialize VDNS Policy ${stackname}= Orchestrate VNF vDNS closedloop ${dnsscaling}= Policy Check vLB Stack ${stackname} ${VLBPOLICYRATE} Set Test Variable ${DNSSCALINGSTACK} ${dnsscaling} + Delete VNF Initialize VFW Policy # Create Config Policy diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 9de590b9..e3e7905a 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -36,6 +36,11 @@ ${VVG_SERVER_ID} ${SERVICE_INSTANCE_ID} *** Keywords *** +Orchestrate VNF Template + [Documentation] Use openECOMP to Orchestrate a service. + [Arguments] ${customer_name} ${service} ${product_family} ${tenant} + Orchestrate VNF ${customer_name} ${service} ${product_family} ${tenant} + Delete VNF Orchestrate VNF [Documentation] Use openECOMP to Orchestrate a service. @@ -121,12 +126,16 @@ Get VVG Preload Parameters ${vvg_params} Get From Dictionary ${test_dict} vvg_preload.template [Return] ${vvg_params} -Teardown VNF +Delete VNF [Documentation] Called at the end of a test case to tear down the VNF created by Orchestrate VNF ${lcp_region}= Get Openstack Region Teardown VVG Server - Run Keyword If '${TEST STATUS}' == 'PASS' Teardown VLB Closed Loop Hack - Run Keyword If '${TEST STATUS}' == 'PASS' Teardown VID ${SERVICE_INSTANCE_ID} ${lcp_region} ${TENANT_ID} + Teardown VLB Closed Loop Hack + Teardown VID ${SERVICE_INSTANCE_ID} ${lcp_region} ${TENANT_ID} + Log VNF Deleted + +Teardown VNF + [Documentation] Called at the end of a test case to tear down the VNF created by Orchestrate VNF Run Keyword If '${TEST STATUS}' == 'PASS' Teardown Model Distribution Run Keyword If '${TEST STATUS}' == 'PASS' Clean A&AI Inventory Close All Browsers diff --git a/robot/testsuites/vnf-orchestration.robot b/robot/testsuites/vnf-orchestration.robot index 48f3964c..d7ae16fa 100644 --- a/robot/testsuites/vnf-orchestration.robot +++ b/robot/testsuites/vnf-orchestration.robot @@ -5,7 +5,7 @@ Documentation Executes the VNF Orchestration Test cases including setup and te Resource ../resources/test_templates/vnf_orchestration_test_template.robot Test Setup Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone -Test Template Orchestrate VNF +Test Template Orchestrate VNF Template Test Teardown Teardown VNF *** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY TENANT |