Merge changes I0e61bb7d,I4685ea88,I2a23d940

* changes:
  Add moco json for service delete command
  Fix service delete command for SO v4 version
  Fix service delete sample for v4 SO apis

3 files changed, 53 insertions, 3 deletions

diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-delete-sample-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-delete-sample-beijing.yaml
index a279fb08..9d244009 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-delete-sample-beijing.yaml
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-delete-sample-beijing.yaml
@@ -19,4 +19,4 @@ version: onap-beijing
 samples:
     sample1:
         name: delete a service instance
-        input: -h https://locahost:8080 -u InfraPortalClient -p password1$  -s 56AA445
\ No newline at end of file
+        input: --model-name sample-model --model-invariant-id 0561a325-a64b-47ab-86f4-000000000429 --cloud-region Region1 --service-instace-id 0561a325-a64b-47ab-86f4-000000000439 --model-uuid 0561a325-a64b-47ab-86f4-000000000449 --customer-name sample-customer --model-version 1.0 --tenant-id onap -r  0561a325-a64b-47ab-86f4-000000000459
\ No newline at end of file
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-delete-schema-beijing-moco.json b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-delete-schema-beijing-moco.json
new file mode 100644
index 00000000..eda897ae
--- /dev/null
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-delete-schema-beijing-moco.json
@@ -0,0 +1,44 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/ecomp/mso/infra/serviceInstances/v4/0561a325-a64b-47ab-86f4-000000000439",
+    "headers" : {
+      "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+      "X-FromAppId" : "onap-cli",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-0dc01d80-f629-4ea9-b49f-0bc45b79bfaf",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "requestDetails": {
+        "modelInfo": {
+          "modelType": "service",
+          "modelInvariantId": "0561a325-a64b-47ab-86f4-000000000429",
+          "modelVersionId": "0561a325-a64b-47ab-86f4-000000000449",
+          "modelName": "sample-model",
+          "modelVersion": "1.0"
+        },
+        "cloudConfiguration": {
+          "lcpCloudRegionId": "Region1",
+          "tenantId": "onap"
+        },
+        "subscriberInfo": {
+          "globalSubscriberId": "sample-customer"
+        },
+        "requestInfo": {
+          "requestorId": "0561a325-a64b-47ab-86f4-000000000459",
+          "source": "VID"
+        }
+      }
+    }
+  },
+  "response" : {
+    "status" : 202,
+    "json" : {
+      "requestReferences" : {
+        "instanceId" : "957949b4-f857-497c-81b0-832ce7bb9434",
+        "requestId" : "d59fc98a-b0fa-4de9-b426-6ef40dfd0812"
+      }
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml
index 7cb2604d..d8c04dbb 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml
@@ -71,6 +71,12 @@ parameters:
     short_option: k
     long_option: tenant-id
     is_optional: false
+  - name: requestor-id
+    description: requestor ID
+    type: string
+    short_option: r
+    long_option: requestor-id
+    is_optional: false
 
 http:
   service:
@@ -81,7 +87,7 @@ http:
   request:
     uri: /ecomp/mso/infra/serviceInstances/v4/${service-id}
     method: DELETE
-    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"}}}'
+    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": {"requestorId": "${requestor-id}","source": "VID"}}}'
 
   success_codes:
-    - 202
\ No newline at end of file
+    - 202