summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml7
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml2
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml2
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml2
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml2
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml2
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml2
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml2
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml4
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml14
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml46
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml55
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml18
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml8
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-sample-1.1.yaml9
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-sample-1.1.yaml18
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-sample-1.1.yaml23
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-sample-1.1.yaml8
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-sample-1.1.yaml9
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-sample-1.1.yaml14
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-sample-1.1.yaml8
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-sample-1.1.yaml15
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml8
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml16
24 files changed, 270 insertions, 24 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"}]}]}}]}'
+
+
+
+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
index 95ea4112..de1555d7 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
+++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
@@ -1,16 +1,16 @@
onap_cli_sample_version: 1.0
name: cloud-list
-version: onap-1.0
+version: onap-1.1
samples:
sample1:
name: List the configured clouds in onap
- input: -h https://locahost:8443 -u AAI -p AAI --long
+ input: -h https://locahost:8443 -u AAI -p AAI
output: |
- ===============================================================================================
- |cloud | region | tenant | tenant-id | customer| service|
- ===============================================================================================
- |OpenStack | RegionOne | ONAP | 3385e44e-b3bf-4fb8-a83e-4a4097cf8978 | mrkanag | vFW |
- -----------------------------------------------------------------------------------------------
- |OpenStack | RegionTwo | ONAP-2 | 89386e6e-a16b-4091-add7-3119064f8058 | mrkanag | vLB |
- =============================================================================================== \ No newline at end of file
+ +--------------------------------+------------------------------------+
+ |cloud |region |
+ +--------------------------------+------------------------------------+
+ |example-cloud-owner-val-44086 |example-cloud-region-id-val-67393 |
+ +--------------------------------+------------------------------------+
+ |att-aic |AAIAIC25 |
+ +--------------------------------+------------------------------------+ \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml
new file mode 100644
index 00000000..d5332115
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: customer-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-1 -y subscriber-1
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-sample-1.1.yaml
new file mode 100644
index 00000000..9f80da02
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-sample-1.1.yaml
@@ -0,0 +1,9 @@
+onap_cli_sample_version: 1.0
+
+name: customer-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-1 -y 1504085129922
+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-sample-1.1.yaml
new file mode 100644
index 00000000..feb4d7ce
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-sample-1.1.yaml
@@ -0,0 +1,18 @@
+onap_cli_sample_version: 1.0
+
+name: customer-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the configured customers in onap
+ input: -h https://locahost:8443 -u AAI -p AAI
+ output: |
+ +--------------------------------------+------------------+
+ |name |resource-version |
+ +--------------------------------------+------------------+
+ |example-global-customer-id-val-8741 |1504017436899 |
+ +--------------------------------------+------------------+
+ |example-global-customer-id-val-87416 |1504017249493 |
+ +--------------------------------------+------------------+
+ |customer-1 |1504085129922 |
+ +--------------------------------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-sample-1.1.yaml
new file mode 100644
index 00000000..8c2e8dbd
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-sample-1.1.yaml
@@ -0,0 +1,23 @@
+onap_cli_sample_version: 1.0
+
+name: customer-show
+version: onap-1.1
+samples:
+ sample1:
+ name: Show complete details of a customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x example-global-customer-id-val-8741 --long
+ output: |
+ +--------------------------------------+----------------------------------+------------------+------------------------------------+
+ |name |subscriber-name |resource-version |subscriber-type |
+ +--------------------------------------+----------------------------------+------------------+------------------------------------+
+ |example-global-customer-id-val-8741 |example-subscriber-name-val-2447 |1504017436899 |example-subscriber-type-val-24368 |
+ +--------------------------------------+----------------------------------+------------------+------------------------------------+
+ sample2:
+ name: Show basic details of a customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x example-global-customer-id-val-8741
+ output: |
+ +--------------------------------------+----------------------------------+
+ |name |subscriber-name |
+ +--------------------------------------+----------------------------------+
+ |example-global-customer-id-val-8741 |example-subscriber-name-val-2447 |
+ +--------------------------------------+----------------------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-sample-1.1.yaml
new file mode 100644
index 00000000..a9d01569
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: service-type-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a service type
+ input: -h https://locahost:8443 -u AAI -p AAI -x vTest -y 26ab7af6-96cc-4c4e-814a-e533af4ef9f6
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-sample-1.1.yaml
new file mode 100644
index 00000000..46626a29
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-sample-1.1.yaml
@@ -0,0 +1,9 @@
+onap_cli_sample_version: 1.0
+
+name: service-type-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the service type
+ input: -h https://locahost:8443 -u AAI -p AAI -x 26ab7af6-96cc-4c4e-814a-e533af4ef9f6 -y 1504086172338
+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-sample-1.1.yaml
new file mode 100644
index 00000000..01ef2b93
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-sample-1.1.yaml
@@ -0,0 +1,14 @@
+onap_cli_sample_version: 1.0
+
+name: service-type-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the configured service types in onap
+ input: -h https://locahost:8443 -u AAI -p AAI
+ output: |
+ +--------------------------------------+--------------+------------------+
+ |service-type-id |service-type |resource-version |
+ +--------------------------------------+--------------+------------------+
+ |26ab7af6-96cc-4c4e-814a-e533af4ef9f6 |vTest |1504086172338 |
+ +--------------------------------------+--------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-sample-1.1.yaml
new file mode 100644
index 00000000..c2777458
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: subscription-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a subscription
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-2 -y subscriber-2 -z att-aic -r AAIAIC25 -c 26ab7af6-96cc-4c4e-814a-e533af4ef9f6 -e vTest
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-sample-1.1.yaml
new file mode 100644
index 00000000..5943ab15
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-sample-1.1.yaml
@@ -0,0 +1,15 @@
+onap_cli_sample_version: 1.0
+
+name: subscription-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the configured subscription in onap for a given customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-2
+ output: |
+ +--------------+
+ |service-type |
+ +--------------+
+ |vTest |
+ +--------------+
+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml
new file mode 100644
index 00000000..958e9040
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: tenant-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a tenant under given cloud region
+ input: -h https://locahost:8443 -u AAI -p AAI -x att-aic -y AAIAIC25 -z 8bcf4466-b092-473f-889b-7f40efb5a322 -r tenant-2
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml
new file mode 100644
index 00000000..d609a08b
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml
@@ -0,0 +1,16 @@
+onap_cli_sample_version: 1.0
+
+name: tenant-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the tenant under given cloud region in onap
+ input: -h https://locahost:8443 -u AAI -p AAI -x att-aic -y AAIAIC25
+ output: |
+ +--------------------------------------+--------------+------------------+
+ |tenant-id |tenant-name |resource-version |
+ +--------------------------------------+--------------+------------------+
+ |26ab7af6-96cc-4c4e-814a-e533af4ef9f6 |test |1504091074807 |
+ +--------------------------------------+--------------+------------------+
+ |8bcf4466-b092-473f-889b-7f40efb5a322 |tenant-2 |1504093061465 |
+ +--------------------------------------+--------------+------------------+