diff options
| author |   Brian Freeman <bf1936@att.com> | 2018-09-14 11:22:43 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2018-09-14 11:24:29 -0500 |
| commit | 0aebc3a0f2de3edbe307f14c24b615db124af682 (patch) | |
| tree | f01fbf8282dff92dbb9ad09f676f81d3b7265fe6 | |
| parent | 68e71dc6013d0a689f99e53e60d0f6a0dbdde7ad (diff) | |
Add 5G service to init (fix vFW)
Issue-ID: INT-651
Change-Id: I961f075cb4c04a795997e8199783963b2b882978
Signed-off-by: Brian Freeman <bf1936@att.com>
| -rw-r--r-- | robot/assets/templates/aai/add_demo_customer.template | 38 | ||||
| -rw-r--r-- | robot/resources/demo_preload.robot | 4 |
2 files changed, 41 insertions, 1 deletions
diff --git a/robot/assets/templates/aai/add_demo_customer.template b/robot/assets/templates/aai/add_demo_customer.template index a52d65bd..a91e3836 100644 --- 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 f87cc366..7babb9c3 100644 --- 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} |