diff options
| author |   DR695H <dr695h@att.com> | 2019-07-15 17:19:12 -0400 |
|---|---|---|
| committer |   Gary Wu <gary.wu@futurewei.com> | 2019-07-16 20:08:36 +0000 |
| commit | 1ccabd032ef21aee844640b49541d6f1224d572b (patch) | |
| tree | e25a1cbb60881f9ec62405bf760972ca5e701aad /robot/testsuites | |
| parent | 97fec22483d9410037714505b954ff80a0d15a0c (diff) | |
removing the rest of preload global vars
Issue-ID: TEST-174
Change-Id: Ie5354df3526133d398d3fea703145c4a1649b3c1
Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/testsuites')
| -rw-r--r-- | robot/testsuites/cds.robot | 2 | ||||
| -rw-r--r-- | robot/testsuites/closed-loop.robot | 5 | ||||
| -rw-r--r-- | robot/testsuites/demo.robot | 13 |
3 files changed, 11 insertions, 9 deletions
diff --git a/robot/testsuites/cds.robot b/robot/testsuites/cds.robot index 640edb41..6b30e694 100644 --- a/robot/testsuites/cds.robot +++ b/robot/testsuites/cds.robot @@ -7,6 +7,6 @@ Resource ../resources/test_templates/vnf_orchestration_with_cds_test_tem Test Template Orchestrate VNF With CDS Template *** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY -Instantiate Virtual vFW With CDS ETE_Customer vFW vFW +Instantiate Virtual vFW With CDS ETE_Customer Service_Ete_Name vFW [Tags] cds diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot index 2a089cd1..c2d3d3db 100644 --- a/robot/testsuites/closed-loop.robot +++ b/robot/testsuites/closed-loop.robot @@ -3,8 +3,6 @@ Documentation Closed Loop Test cases Resource ../resources/test_templates/closedloop_test_template.robot -Test Teardown Teardown Closed Loop - *** Variables *** ${PACKET_GENERATOR_HOST} @@ -23,4 +21,5 @@ VFWCL Closed Loop Test Log ${EMPTY} VFWCL High Test ${PACKET_GENERATOR_HOST} VFWCL Low Test ${PACKET_GENERATOR_HOST} - [Teardown] VFWCL Set To Medium ${PACKET_GENERATOR_HOST} + VFWCL Set To Medium ${PACKET_GENERATOR_HOST} + [Teardown] Teardown Closed Loop ${None} diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index 5f037723..c9d6219c 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -12,12 +12,15 @@ ${VNF_NAME} DemoVNF ${MODULE_NAME} DemoModuleName ${HB_STACK} -${HB_SERVICE_INSTANCE_ID} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS} ${TENANT_NAME} ${VVG_SERVER_ID} ${SERVICE} +${CUSTOMER_NAME} +${SERVICE_INSTANCE_ID} +${STACK_NAMES} + *** Test Cases *** Initialize Customer And Models @@ -39,7 +42,7 @@ Initialize Models Preload VNF [Tags] PreloadDemo - Preload User Model ${VNF_NAME} ${MODULE_NAME} ${SERVICE} + Preload User Model ${VNF_NAME} ${MODULE_NAME} ${SERVICE} ${SERVICE_INSTANCE_ID} Create APPC Mount Point [Tags] APPCMountPointDemo @@ -68,14 +71,14 @@ Delete Instantiated VNF [Tags] deleteVNF Setup Browser Login To VID GUI - Delete VNF ${TENANT_NAME} ${VVG_SERVER_ID} - [Teardown] Teardown VNF + Delete VNF ${TENANT_NAME} ${VVG_SERVER_ID} ${CUSTOMER_NAME} ${SERVICE_INSTANCE_ID} ${STACK_NAMES} + [Teardown] Teardown VNF ${CUSTOMER_NAME} Run Heatbridge [Documentation] ... Try to run heatbridge [Tags] heatbridge - Execute Heatbridge ${HB_STACK} ${HB_SERVICE_INSTANCE_ID} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS} + Execute Heatbridge ${HB_STACK} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS} Preload APPC CDT GUI [Documentation] |