summaryrefslogtreecommitdiffstats
path: root/robot/testsuites
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-07-12 18:34:15 -0400
committerDR695H <dr695h@att.com>2019-07-12 18:34:15 -0400
commit3148028e8f2e1a9cbd85d11002d3a78bfc620ba8 (patch)
tree9073ec5abd76986855a0ab4b730b248c47a40f51 /robot/testsuites
parent8adf0869394150708dd0710ab579c00879954ac0 (diff)
remove some global variables
global state is really confusing Issue-ID: TEST-174 Change-Id: I470c4b9008fd7c8eaf1255947e08cd026a860711 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/testsuites')
-rw-r--r--robot/testsuites/cds.robot4
-rw-r--r--robot/testsuites/demo.robot8
-rw-r--r--robot/testsuites/vnf-orchestration.robot16
3 files changed, 14 insertions, 14 deletions
diff --git a/robot/testsuites/cds.robot b/robot/testsuites/cds.robot
index 1cf7cbfd..640edb41 100644
--- a/robot/testsuites/cds.robot
+++ b/robot/testsuites/cds.robot
@@ -6,7 +6,7 @@ Resource ../resources/test_templates/vnf_orchestration_with_cds_test_tem
Test Template Orchestrate VNF With CDS Template
-*** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY TENANT
-Instantiate Virtual vFW With CDS ETE_Customer vFW vFW ${TENANT_NAME}
+*** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY
+Instantiate Virtual vFW With CDS ETE_Customer vFW vFW
[Tags] cds
diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index 4dd8f68c..5f037723 100644
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -15,7 +15,9 @@ ${HB_STACK}
${HB_SERVICE_INSTANCE_ID}
${HB_SERVICE}
${HB_IPV4_OAM_ADDRESS}
-
+${TENANT_NAME}
+${VVG_SERVER_ID}
+${SERVICE}
*** Test Cases ***
Initialize Customer And Models
@@ -37,7 +39,7 @@ Initialize Models
Preload VNF
[Tags] PreloadDemo
- Preload User Model ${VNF_NAME} ${MODULE_NAME}
+ Preload User Model ${VNF_NAME} ${MODULE_NAME} ${SERVICE}
Create APPC Mount Point
[Tags] APPCMountPointDemo
@@ -66,7 +68,7 @@ Delete Instantiated VNF
[Tags] deleteVNF
Setup Browser
Login To VID GUI
- Delete VNF
+ Delete VNF ${TENANT_NAME} ${VVG_SERVER_ID}
[Teardown] Teardown VNF
Run Heatbridge
diff --git a/robot/testsuites/vnf-orchestration.robot b/robot/testsuites/vnf-orchestration.robot
index d0810d74..5e254b85 100644
--- a/robot/testsuites/vnf-orchestration.robot
+++ b/robot/testsuites/vnf-orchestration.robot
@@ -4,22 +4,20 @@ 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 Template
-Test Teardown Teardown VNF
-*** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY TENANT
-Instantiate Virtual DNS ETE_Customer vLB vLB ${TENANT_NAME}
+*** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY
+Instantiate Virtual DNS ETE_Customer vLB vLB
[Tags] instantiate stability72hr
-Instantiate Virtual Volume Group ETE_Customer vVG vVG ${TENANT_NAME}
+Instantiate Virtual Volume Group ETE_Customer vVG vVG
[Tags] instantiate stability72hr
-Instantiate Virtual FirewallCL ETE_Customer vFWCL vFWCL ${TENANT_NAME}
+Instantiate Virtual FirewallCL ETE_Customer vFWCL vFWCL
[Tags] instantiate stability72hr
-Instantiate Virtual DNS No Delete ETE_Customer vLB vLB ${TENANT_NAME} KEEP
+Instantiate Virtual DNS No Delete ETE_Customer vLB vLB KEEP
[Tags] instantiateNoDelete
-Instantiate Virtual FirewallCL No Delete ETE_Customer vFWCL vFWCL ${TENANT_NAME} KEEP
+Instantiate Virtual FirewallCL No Delete ETE_Customer vFWCL vFWCL KEEP
[Tags] instantiateNoDelete
-Instantiate Virtual Firewall ETE_Customer vFW vFW ${TENANT_NAME}
+Instantiate Virtual Firewall ETE_Customer vFW vFW