Fix yaml for service-delete

Fix yaml for sevice-delete.

Change-Id: I7e59c93464ab52fa30f6f5225ea3145365d2357b
Issue-ID: CLI-15
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

2 files changed, 44 insertions, 15 deletions

diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml
index e7791d56..4c6e4a92 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml
+++ b/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml
@@ -1,25 +1,62 @@
 open_cli_schema_version: 1.0
 name: service-delete
-description: Delete a service instance
+description: Delete service instance
 version: onap-1.1
 service:
-  name: so
-  version: v2
+  name: mso
+  version: v3
   auth: basic
   mode: direct
 
 parameters:
-  - name: service-instance-id
+  - name: service-id
     description: unique id for service instance
     type: string
     short_option: x
     long_option: service-instace-id
     is_optional: false
+  - name: model-invariant-id
+    description: model invariant id for service in SDC catalog
+    type: string
+    long_option: model-invariant-id
+    is_optional: false
+  - name: model-uuid
+    description: model uuid for service in SDC catalog
+    type: string
+    long_option: model-uuid
+    is_optional: false
+  - name: model-name
+    description: model name available in SDC catalog
+    type: string
+    long_option: model-name
+    is_optional: false
+  - name: model-version
+    description: model version of service (eg. 1.0)
+    type: string
+    long_option: model-version
+    is_optional: false
+  - name: customer-name
+    description: unique id for customer
+    type: string
+    short_option: c
+    long_option: customer-name
+    is_optional: false
+  - name: cloud-region
+    description: cloud region id
+    type: string
+    long_option: cloud-region
+    is_optional: false
+  - name: tenant-id
+    description: tenant id
+    type: string
+    long_option: tenant-id
+    is_optional: false
 
 http:
   request:
-    uri: /ecomp/mso/infra/serviceInstances/v2/${service-instance-id}
+    uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}
     method: DELETE
-    body: '{"requestDetails": {"modelInfo": {"modelType": "service", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", "modelName": "Test","modelVersion": "1.0"}, "requestInfo":{"source": "VID"}}}'
+    body: '{"requestDetails": {"modelInfo": {"modelType": "service","modelInvariantId": "${model-invariant-id}","modelVersionId": "${model-uuid}","modelName": "${model-name}","modelVersion": "${model-version}"},"cloudConfiguration" : {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"subscriberInfo": {"globalSubscriberId": "${customer-name}"},"requestInfo": {"source": "VID"}}}'
+
   success_codes:
-    - 204
\ No newline at end of file
+    - 202
\ No newline at end of file
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/service-delete-sample-1.1.yaml b/plugins/so/src/test/resources/onap-cli-sample/services/service-delete-sample-1.1.yaml
deleted file mode 100644
index cc114ac0..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/service-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: service-delete
-version: onap-1.1
-samples:
-    sample1:
-        name: delete a service instance
-        input: -h https://locahost:8080 -u InfraPortalClient -p password1$  -s 56AA445
\ No newline at end of file