Subscription management commands

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

3 files changed, 46 insertions, 18 deletions

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 19d9a8a7..68bb9311 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
@@ -15,17 +15,11 @@ parameters:
     short_option: x
     long_option: customer-name
     is_optional: false
-  - name: subscriber-name
-    description: Onap subscriber name
-    type: string
-    short_option: y
-    long_option: subscriber-name
-    is_optional: false
-  - name: cloud-type
-    description: Onap cloud type (openstack, rackspace)
+  - name: cloud-name
+    description: Onap cloud name
     type: string
     short_option: z
-    long_option: cloud-type
+    long_option: cloud-name
     is_optional: false
   - name: cloud-region
     description: Onap cloud region
@@ -45,17 +39,12 @@ parameters:
     short_option: e
     long_option: service-type
     is_optional: false
-  - name: resource-version
-    description: Onap subscription resource version. It is mandatory for existing customer to create a new subscription
-    type: string
-    short_option: g
-    long_option: resource-version
-    is_optional: true
+
 http:
   request:
-    uri: /aai/v11/business/customers/customer/${customer-name}
+    uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}
     method: PUT
-    body: '{"global-customer-id": "${customer-name}", "subscriber-name": "${subscriber-name}", "subscriber-type": "INFRA", "resource-version":"${resource-version}", "service-subscriptions":{"service-subscription":[{"relationship-list":{"relationship":[{"related-to":"tenant","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${cloud-type}"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"${cloud-region}"},{"relationship-key":"tenant.tenant-id","relationship-value":"${cloud-tenant-id}"}]}]},"service-type":"${service-type}"}]}}}'
+    body: '{"service-subscription":[{"relationship-list":{"relationship":[{"related-to":"tenant","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${cloud-name}"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"${cloud-region}"},{"relationship-key":"tenant.tenant-id","relationship-value":"${cloud-tenant-id}"}]}]},"service-type":"${service-type}"}]}'
   success_codes:
     - 200
     - 201
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml
new file mode 100644
index 00000000..069a27e8
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml
@@ -0,0 +1,39 @@
+onap_cmd_schema_version: 1.0
+name: subscription-delete
+description: Delete the subscription for a given customer in Onap
+version: onap-1.1
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: customer-name
+    description: Onap customer name
+    type: string
+    short_option: x
+    long_option: customer-name
+    is_optional: false
+  - name: service-type
+    description: Onap subscribtion id
+    type: string
+    short_option: y
+    long_option: service-type
+    is_optional: false
+  - name: resource-version
+    description: Onap subscription resource version
+    type: string
+    short_option: g
+    long_option: resource-version
+    is_optional: true
+http:
+  request:
+    uri: /aai/v11//business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
+
+
+
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 9a747887..0908fc9a 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
@@ -29,7 +29,7 @@ results:
       type: string
 http:
   request:
-    uri: /aai/v11//business/customers/customer/${customer-name}/service-subscriptions
+    uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions
     method: GET
   success_codes:
     - 200