Change to vFWCL instead of vFW
Issue-ID: TEST-72
Change-Id: I18c8823c1348187e2ea3929b75a843b7df5784d0
Signed-off-by: Jerry Flood <jf9860@att.com>
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index 6904895..406f8f0 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -41,7 +41,7 @@
[Documentation] Use openECOMP to Orchestrate a service.
[Arguments] ${customer_name}
Set Test Variable ${CUSTOMER_NAME} ${customer_name}
- ${status} ${value}= Run Keyword And Ignore Error Distribute Model vFW ${DEMO_PREFIX}VFW
+ ${status} ${value}= Run Keyword And Ignore Error Distribute Model vFWCL ${DEMO_PREFIX}VFWCL
${status} ${value}= Run Keyword And Ignore Error Distribute Model vLB ${DEMO_PREFIX}VLB
${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPE ${DEMO_PREFIX}VCPE
##${status} ${value}= Run Keyword And Ignore Error Distribute Model vIMS ${DEMO_PREFIX}VIMS
@@ -53,13 +53,13 @@
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 vFWCL
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
+ Set To Dictionary ${arguments} service1=vFWCL service2=vLB service3=vCPE service4=vIMS
${data}= Fill JSON Template ${data_template} ${arguments}
${put_resp}= Run A&AI Put Request ${INDEX PATH}${ROOT_CUSTOMER_PATH}${customer_id} ${data}
${status_string}= Convert To String ${put_resp.status_code}
@@ -108,7 +108,7 @@
[Documentation] Query and Validates A&AI Service Instance
[Arguments] ${service_instance_id} ${service_type} ${customer_id}
${resp}= Run A&AI Get Request ${INDEX PATH}${CUSTOMER SPEC PATH}${customer_id}${SERVICE SUBSCRIPTIONS}${service_type}${SERVICE INSTANCE}${service_instance_id}
- ${persona_model_id}= Get From DIctionary ${resp.json()['service-instance'][0]} persona-model-id
+ ${persona_model_id}= Get From DIctionary ${resp.json()['service-instance'][0]} model-invariant-id
[Return] ${persona_model_id}
APPC Mount Point
diff --git a/robot/testsuites/vnf-orchestration.robot b/robot/testsuites/vnf-orchestration.robot
index 450b63f..2c340a3 100644
--- a/robot/testsuites/vnf-orchestration.robot
+++ b/robot/testsuites/vnf-orchestration.robot
@@ -9,13 +9,13 @@
Test Teardown Teardown VNF
*** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY TENANT
-Instantiate Virtual Firewall ETE_Customer vFW vFW ${TENANT_NAME}
- [Tags] ete instantiate
Instantiate Virtual DNS ETE_Customer vLB vLB ${TENANT_NAME}
[Tags] ete instantiate
Instantiate Virtual Volume Group ETE_Customer vVG vVG ${TENANT_NAME}
[Tags] ete instantiate
Instantiate Virtual FirewallCL ETE_Customer vFWCL vFWCL ${TENANT_NAME}
+ [Tags] ete instantiate
+Instantiate Virtual Firewall ETE_Customer vFW vFW ${TENANT_NAME}