Update the customer commands for 1.1

CLI-13
Change-Id: I1e95e2e29bec719cf25931e1468f92136072577e
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

12 files changed, 125 insertions, 15 deletions

diff --git a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
index 511e090a..63a90de7 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: List the configured clouds and Onap service subscriptions
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
@@ -35,6 +35,10 @@ results:
       description: Onap cloud service
       scope: long
       type: string
+    - name: resource-version
+      description: Onap cloud resource version
+      scope: short
+      type: string
 http:
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions
@@ -44,6 +48,7 @@ http:
   result_map:
     cloud: $b{cloud-region.[*].cloud-owner}
     region: $b{cloud-region.[*].cloud-region-id}
+    resource-version: $b{cloud-region.[*].resource-version}
     tenant: $b{cloud-region.[*].tenants.tenant.[*].tenant-name}
     tenant-id: $b{cloud-region.[*].tenants.tenant.[*].tenant-id}
     customer: $b{cloud-region.[*].tenants.tenant.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'customer.global-customer-id')].relationship-value}
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml
index a3d61b41..8ff4b579 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: Create a customer in Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml
index 2e6c1ebc..c048870a 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: Delete a customer from Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml
index c49d3cbb..c5953c86 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: Lists the registetred customers in Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 results:
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml
index c7a39bcb..ba37eed6 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: Lists the registetred customers in Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml
index a91f005b..ea1ecad1 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: Add a service type in Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml
index 30296a94..729a2cca 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: Delete a service type from Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml
index ac57b05b..e4797a9a 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: List the service types configured in Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml
index 9b86330e..19d9a8a7 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml
@@ -1,10 +1,10 @@
 onap_cmd_schema_version: 1.0
 name: subscription-create
-description: Create a subscription for a customer in Onap
+description: Create a subscription of a customer for given service in specific cloud region in Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml
index b4d1093c..9a747887 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml
@@ -4,7 +4,7 @@ description: Lists the subscription for a given customer in Onap
 version: onap-1.1
 service:
   name: aai
-  version: v8
+  version: v11
   auth: basic
   mode: direct
 
@@ -23,17 +23,21 @@ results:
       description: Onap service type
       scope: short
       type: string
-
+    - name: resource-version
+      description: Onap subscription resource version
+      scope: short
+      type: string
 http:
   request:
-    uri: /aai/v11/business/customers/customer/${customer-name}
+    uri: /aai/v11//business/customers/customer/${customer-name}/service-subscriptions
     method: GET
   success_codes:
     - 200
   result_map:
-    service-type: $b{$.service-subscriptions.service-subscription.[*].service-type}
+    service-type: $b{$.service-subscription.[*].service-type}
+    resource-version: $b{$.service-subscription.[*].resource-version}
   sample_response:
-    body: '{"global-customer-id":"Linan","subscriber-name":"Linan","subscriber-type":"INFRA","resource-version":"1501768482","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}}'
+    body: '{"service-subscription":[{"service-type":"vTest","resource-version":"1504091375183","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/26ab7af6-96cc-4c4e-814a-e533af4ef9f6","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"att-aic"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"AAIAIC25"},{"relationship-key":"tenant.tenant-id","relationship-value":"26ab7af6-96cc-4c4e-814a-e533af4ef9f6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"test"}]}]}}]}'
 
 
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml
new file mode 100644
index 00000000..6f17ba98
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml
@@ -0,0 +1,46 @@
+onap_cmd_schema_version: 1.0
+name: tenant-create
+description: Create a tenant under given cloud region in Onap
+version: onap-1.1
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: cloud
+    description: Onap cloud
+    type: string
+    short_option: x
+    long_option: cloud
+    is_optional: false
+  - name: region
+    description: Onap cloud region
+    type: string
+    short_option: y
+    long_option: region
+    is_optional: false
+  - name: tenant-id
+    description: Onap cloud tenant id
+    type: string
+    short_option: z
+    long_option: tenant-id
+    is_optional: false
+  - name: tenant-name
+    description: Onap cloud tenant name
+    type: string
+    short_option: r
+    long_option: tenant-name
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}
+    method: PUT
+    body: '{"tenant-id": "${tenant-id}", "tenant-name": "${tenant-name}"}'
+  success_codes:
+    - 200
+    - 201
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml
new file mode 100644
index 00000000..d248e6af
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml
@@ -0,0 +1,55 @@
+onap_cmd_schema_version: 1.0
+name: tenant-list
+description: Lists the tenants under given cloud region in Onap
+version: onap-1.1
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: cloud
+    description: Onap cloud
+    type: string
+    short_option: x
+    long_option: cloud
+    is_optional: false
+  - name: region
+    description: Onap cloud region
+    type: string
+    short_option: y
+    long_option: region
+    is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: tenant-id
+      description: Onap tenant-id
+      scope: short
+      type: string
+    - name: tenant-name
+      description: Onap tenant name
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap tenant resource version
+      scope: short
+      type: string
+http:
+  request:
+    uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    tenant-id: $b{$.tenant.[*].tenant-id}
+    tenant-name: $b{$.tenant.[*].tenant-name}
+    resource-version: $b{$.tenant.[*].resource-version}
+  sample_response:
+    body: '{"tenant":[{"tenant-id":"26ab7af6-96cc-4c4e-814a-e533af4ef9f6","tenant-name":"test","resource-version":"1504091074807","relationship-list":{"relationship":[{"related-to":"service-subscription","related-link":"/aai/v11/business/customers/customer/customer-2/service-subscriptions/service-subscription/vTest","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"customer-2"},{"relationship-key":"service-subscription.service-type","relationship-value":"vTest"}]}]}}]}'
+
+
+
+