From 75010a4fe2ec3e182b45196e7e5b2c7889673092 Mon Sep 17 00:00:00 2001 From: jf9860 Date: Wed, 22 Feb 2017 16:52:54 -0500 Subject: Complete teardown implementation. Add demo.sh to support hands on demo Change-Id: Idf235957bd992e6d7482c8241f6ba8b8944c2826 Signed-off-by: jf9860 --- .../templates/aai/add_cloud_region_body.template | 15 ------- .../templates/aai/add_demo_customer.template | 47 ++++++++++++++++++++++ .../assets/templates/aai/add_tenant_body.template | 1 + 3 files changed, 48 insertions(+), 15 deletions(-) delete mode 100644 robot/assets/templates/aai/add_cloud_region_body.template create mode 100644 robot/assets/templates/aai/add_demo_customer.template (limited to 'robot/assets/templates/aai') diff --git a/robot/assets/templates/aai/add_cloud_region_body.template b/robot/assets/templates/aai/add_cloud_region_body.template deleted file mode 100644 index 95b2525c..00000000 --- a/robot/assets/templates/aai/add_cloud_region_body.template +++ /dev/null @@ -1,15 +0,0 @@ -{ - "cloud-owner": "${cloud_owner}", - "cloud-region-id": "${cloud_region_id}", - "cloud-type": "${cloud_type}", - "owner-defined-type": "${owner_defined_type}", - "cloud-region-version": "${cloud_region_version}", - "cloud-zone": "${cloud_zone}", - "tenants": { - "tenant": [{ - "tenant-id": "${tenant_id}", - "tenant-name": "${tenant_name}" - - }] - } -} \ No newline at end of file diff --git a/robot/assets/templates/aai/add_demo_customer.template b/robot/assets/templates/aai/add_demo_customer.template new file mode 100644 index 00000000..e56577c5 --- /dev/null +++ b/robot/assets/templates/aai/add_demo_customer.template @@ -0,0 +1,47 @@ +{ + "global-customer-id" : "${global_customer_id}", + "subscriber-name" : "${subscriber_name}", + "subscriber-type" : "${subscriber_type}", + "service-subscriptions" : { + "service-subscription" : [{ + "service-type" : "${service1}", + "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" : "${service2}", + "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/assets/templates/aai/add_tenant_body.template b/robot/assets/templates/aai/add_tenant_body.template index a3cea10a..a7dbbbf7 100644 --- a/robot/assets/templates/aai/add_tenant_body.template +++ b/robot/assets/templates/aai/add_tenant_body.template @@ -5,6 +5,7 @@ "owner-defined-type": "${owner_defined_type}", "cloud-region-version": "${cloud_region_version}", "cloud-zone": "${cloud_zone}", + ${resource_version} "tenants": { "tenant": [{ "tenant-id": "${tenant_id}", -- cgit 1.2.3-korg