aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot4
-rw-r--r--robot/testsuites/vnf-orchestration.robot4
2 files changed, 6 insertions, 2 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index ae0ba021..bca5c5af 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -42,9 +42,9 @@ ${SERVICE_INSTANCE_ID}
*** Keywords ***
Orchestrate VNF Template
[Documentation] Use openECOMP to Orchestrate a service.
- [Arguments] ${customer_name} ${service} ${product_family} ${tenant}
+ [Arguments] ${customer_name} ${service} ${product_family} ${tenant} ${delete_flag}='DELETE'
Orchestrate VNF ${customer_name} ${service} ${product_family} ${tenant}
- Delete VNF
+ Run Keyword If '${delete_flag}' == 'DELETE' Delete VNF
Orchestrate VNF
[Documentation] Use openECOMP to Orchestrate a service.
diff --git a/robot/testsuites/vnf-orchestration.robot b/robot/testsuites/vnf-orchestration.robot
index 55b027ec..57e6e995 100644
--- a/robot/testsuites/vnf-orchestration.robot
+++ b/robot/testsuites/vnf-orchestration.robot
@@ -15,6 +15,10 @@ Instantiate Virtual Volume Group ETE_Customer vVG vVG ${T
[Tags] ete instantiate stability72hr
Instantiate Virtual FirewallCL ETE_Customer vFWCL vFWCL ${TENANT_NAME}
[Tags] ete instantiate stability72hr
+Instantiate Virtual DNS No Delete ETE_Customer vLB vLB ${TENANT_NAME} KEEP
+ [Tags] instantiateNoDelete
+Instantiate Virtual FirewallCL No Delete ETE_Customer vFWCL vFWCL ${TENANT_NAME} KEEP
+ [Tags] instantiateNoDelete
Instantiate Virtual Firewall ETE_Customer vFW vFW ${TENANT_NAME}