summaryrefslogtreecommitdiffstats
path: root/robot/testsuites
diff options
context:
space:
mode:
Diffstat (limited to 'robot/testsuites')
-rw-r--r--robot/testsuites/closed-loop.robot3
-rw-r--r--robot/testsuites/demo.robot8
-rw-r--r--robot/testsuites/model-distribution-vcpe.robot3
-rw-r--r--robot/testsuites/model-distribution.robot3
4 files changed, 6 insertions, 11 deletions
diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot
index c2d3d3db..2fa501fc 100644
--- a/robot/testsuites/closed-loop.robot
+++ b/robot/testsuites/closed-loop.robot
@@ -7,7 +7,6 @@ Resource ../resources/test_templates/closedloop_test_template.robot
${PACKET_GENERATOR_HOST}
*** Test Cases ***
-
VFW Closed Loop Test
[TAGS] closedloop vfwcl
VFW Policy
@@ -22,4 +21,4 @@ VFWCL Closed Loop Test
VFWCL High Test ${PACKET_GENERATOR_HOST}
VFWCL Low Test ${PACKET_GENERATOR_HOST}
VFWCL Set To Medium ${PACKET_GENERATOR_HOST}
- [Teardown] Teardown Closed Loop ${None}
+ [Teardown] Teardown Closed Loop ${None} ${None} ${None}
diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index c9d6219c..4caf93d9 100644
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -20,7 +20,9 @@ ${SERVICE}
${CUSTOMER_NAME}
${SERVICE_INSTANCE_ID}
${STACK_NAMES}
-
+${CATALOG_SERVICE_ID}
+${CATALOG_RESOURCE_IDS}
+${REVERSE_HEATBRIDGE}
*** Test Cases ***
Initialize Customer And Models
@@ -71,8 +73,8 @@ Delete Instantiated VNF
[Tags] deleteVNF
Setup Browser
Login To VID GUI
- Delete VNF ${TENANT_NAME} ${VVG_SERVER_ID} ${CUSTOMER_NAME} ${SERVICE_INSTANCE_ID} ${STACK_NAMES}
- [Teardown] Teardown VNF ${CUSTOMER_NAME}
+ Delete VNF ${TENANT_NAME} ${VVG_SERVER_ID} ${CUSTOMER_NAME} ${SERVICE_INSTANCE_ID} ${STACK_NAMES} ${REVERSE_HEATBRIDGE}
+ [Teardown] Teardown VNF ${CUSTOMER_NAME} ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS}
Run Heatbridge
[Documentation]
diff --git a/robot/testsuites/model-distribution-vcpe.robot b/robot/testsuites/model-distribution-vcpe.robot
index 09a44303..eee3af91 100644
--- a/robot/testsuites/model-distribution-vcpe.robot
+++ b/robot/testsuites/model-distribution-vcpe.robot
@@ -6,9 +6,6 @@ Library Collections
Resource ../resources/test_templates/model_test_template_vcperescust.robot
Test Template Model Distribution For vCPEResCust Directory
-#Test Teardown Teardown Model Distribution
-
-*** Variables ***
*** Test Cases ***
Distribute vCPEResCust Model vCPEResCust
diff --git a/robot/testsuites/model-distribution.robot b/robot/testsuites/model-distribution.robot
index 5633cdc4..0bdb997c 100644
--- a/robot/testsuites/model-distribution.robot
+++ b/robot/testsuites/model-distribution.robot
@@ -6,9 +6,6 @@ Library Collections
Resource ../resources/test_templates/model_test_template.robot
Test Template Model Distribution For Directory
-Test Teardown Teardown Model Distribution
-
-*** Variables ***
*** Test Cases ***
Distribute vLB Model vLB