Add 5G service to init (fix vFW)

Issue-ID: INT-651
Change-Id: I961f075cb4c04a795997e8199783963b2b882978
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/robot/assets/templates/aai/add_demo_customer.template b/robot/assets/templates/aai/add_demo_customer.template
index a52d65b..a91e383 100644 (file)
--- a/robot/assets/templates/aai/add_demo_customer.template
+++ b/robot/assets/templates/aai/add_demo_customer.template
@@ -79,6 +79,44 @@
                                                }
                                        ]
                                }
+                       }, {
+                               "service-type" : "${service5}",
+                               "relationship-list" : {
+                                       "relationship" : [{
+                                                       "related-to" : "tenant",
+                                                       "relationship-data" : [{
+                                                                       "relationship-key" : "cloud-region.cloud-owner",
+                                                                       "relationship-value" : "${cloud_owner}"
+                                                               }, {
+                                                                       "relationship-key" : "cloud-region.cloud-region-id",
+                                                                       "relationship-value" : "${cloud_region_id}"
+                                                               }, {
+                                                                       "relationship-key" : "tenant.tenant-id",
+                                                                       "relationship-value" : "${tenant_id}"
+                                                               }
+                                                       ]
+                                               }
+                                       ]
+                               }
+                       }, {
+                               "service-type" : "${service6}",
+                               "relationship-list" : {
+                                       "relationship" : [{
+                                                       "related-to" : "tenant",
+                                                       "relationship-data" : [{
+                                                                       "relationship-key" : "cloud-region.cloud-owner",
+                                                                       "relationship-value" : "${cloud_owner}"
+                                                               }, {
+                                                                       "relationship-key" : "cloud-region.cloud-region-id",
+                                                                       "relationship-value" : "${cloud_region_id}"
+                                                               }, {
+                                                                       "relationship-key" : "tenant.tenant-id",
+                                                                       "relationship-value" : "${tenant_id}"
+                                                               }
+                                                       ]
+                                               }
+                                       ]
+                               }
                        }
                ]
        }

diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index f87cc36..7babb9c 100644 (file)
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -72,13 +72,15 @@ 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    vFWCL
     Create Service If Not Exists    vLB
     Create Service If Not Exists    vCPE
     Create Service If Not Exists    vIMS
+    Create Service If Not Exists    gNB
     ${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=vFWCL       service2=vLB   service3=vCPE   service4=vIMS
+    Set To Dictionary   ${arguments}       service1=vFWCL       service2=vLB   service3=vCPE   service4=vIMS  service5=gNB service6=vFW
     ${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}