removing the rest of preload global vars

Issue-ID: TEST-174
Change-Id: Ie5354df3526133d398d3fea703145c4a1649b3c1
Signed-off-by: DR695H <dr695h@att.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index 34a1be8f..ec746ff0 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -37,29 +37,18 @@ ${so_request_template}    so/cds_request.jinja
 ${vnf_template_name} 	so/cds_vnf.jinja
 ${vfmodule_template_name} 	so/cds_vfmodule.jinja
 ${so_uri_path}		/onap/so/infra/serviceInstantiation/v7/serviceInstances
-*** Variables ***
-
-#**************** TEST CASE VARIABLES **************************
-${CUSTOMER_NAME}
-${STACK_NAME}
-${STACK_NAMES}
-${SERVICE_INSTANCE_ID}
 
 *** Keywords ***
 Orchestrate VNF With CDS Template
     [Documentation]   Use openECOMP to Orchestrate a service.
-    [Arguments]    ${customer_name}    ${service}    ${product_family}
-    Orchestrate VNF With CDS	${customer_name}    ${service}    ${product_family}
+    [Arguments]    ${customer_name}    ${service_instance_name}    ${product_family}
+    ${uuid}=    Generate UUID4
+    Orchestrate VNF With CDS	${customer_name}_${uuid}    ${service_instance_name}${uuid}    ${product_family}
 
 Orchestrate VNF With CDS
     [Documentation]   Use openECOMP to Orchestrate a service.
-    [Arguments]    ${customer_name}    ${service}    ${product_family}    ${project_name}=Project-Demonstration   ${owning_entity}=OE-Demonstration
+    [Arguments]    ${customer_name}    ${service_instance_name}    ${product_family}    ${project_name}=Project-Demonstration   ${owning_entity}=OE-Demonstration
     ${lcp_region}=   Get Openstack Region
-    ${uuid}=    Generate UUID4
-    Set Test Variable    ${CUSTOMER_NAME}    ${customer_name}_${uuid}
-    ${list}=    Create List
-    Set Test Variable    ${STACK_NAMES}   ${list}
-    ${service_instance_name}=    Catenate    Service_Ete_Name${uuid}
     ${dict}=  Create Dictionary
     Set To Dictionary	${dict}	  service_instance_name=${service_instance_name}
 
@@ -77,7 +66,6 @@ Orchestrate VNF With CDS
     Set To Dictionary   ${dict}   cloud_region=${envjson['cloud_region']}
     Set To Dictionary   ${dict}   tenant_id=${envjson['tenant_id']}
 
-    ${list}=   	Create List
     ${vnfs}=   Get From Dictionary    ${jsondata['topology_template']}   node_templates
     ${keys}=   Get Dictionary Keys    ${vnfs}
     Create Environment    cds    ${GLOBAL_TEMPLATE_FOLDER}