Create services before creating customer

Issue: TEST-66
Change-Id: Ie4128b0df59db7c4283d4480795ef8e0df5d6525
Signed-off-by: Jerry Flood <jf9860@att.com>

diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index 6c7d054..6904895 100644 (file)
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -53,6 +53,10 @@ Distribute Model
 Create Customer For VNF Demo
     [Documentation]    Create demo customer for the demo
     [Arguments]    ${customer_name}   ${customer_id}   ${customer_type}    ${clouder_owner}    ${cloud_region_id}    ${tenant_id}
+    Create Service If Not Exists    vFW
+    Create Service If Not Exists    vLB
+    Create Service If Not Exists    vCPE
+    Create Service If Not Exists    vIMS
     ${data_template}=    OperatingSystem.Get File    ${ADD_DEMO_CUSTOMER_BODY}
     ${arguments}=    Create Dictionary    subscriber_name=${customer_name}    global_customer_id=${customer_id}    subscriber_type=${customer_type}     cloud_owner=${clouder_owner}  cloud_region_id=${cloud_region_id}    tenant_id=${tenant_id}
     Set To Dictionary   ${arguments}       service1=vFW       service2=vLB   service3=vCPE   service4=vIMS
@@ -60,10 +64,6 @@ Create Customer For VNF Demo
     ${put_resp}=    Run A&AI Put Request     ${INDEX PATH}${ROOT_CUSTOMER_PATH}${customer_id}    ${data}
     ${status_string}=    Convert To String    ${put_resp.status_code}
     Should Match Regexp    ${status_string}    ^(200|201|412)$
-    Create Service If Not Exists    vFW
-    Create Service If Not Exists    vLB
-    Create Service If Not Exists    vCPE
-    Create Service If Not Exists    vIMS
 
 Preload User Model
     [Documentation]   Preload the demo data for the passed VNF with the passed module name

diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index d6bb1e9..7289fbd 100644 (file)
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -78,9 +78,9 @@ Create Customer For VNF
     ...                Create Tenant if not exists, Create Customer, Create Service and related relationships
     [Arguments]    ${customer_name}    ${customer_id}    ${customer_type}    ${service_type}    ${cloud_owner}
     ${cloud_region_id}=   Get Openstack Region
+    Create Service If Not Exists    ${service_type}
     ${resp}=    Create Customer    ${customer_name}    ${customer_id}    ${customer_type}    ${service_type}   ${cloud_owner}  ${cloud_region_id}    ${TENANT_ID}
        Should Be Equal As Strings      ${resp}         201
-    Create Service If Not Exists    ${service_type}
 
 Setup Orchestrate VNF
     [Documentation]    Called before each test case to ensure tenant and region data