Merge changes I358e2a8f,I1bdafb59

* changes:
  Update sample fro service create
  Update moco schema for service-create

2 files changed, 23 insertions, 20 deletions

diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-moco.json b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-moco.json
index 28321085..fc6eb197 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-moco.json
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-moco.json
@@ -1,7 +1,7 @@
 [ {
   "request" : {
     "method" : "post",
-    "uri" : "/ecomp/mso/infra/serviceInstances/v3",
+    "uri" : "/ecomp/mso/infra/serviceInstances/v4",
     "headers" : {
       "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
       "X-FromAppId" : "onap-cli",
@@ -10,28 +10,31 @@
       "Content-Type" : "application/json"
     },
     "json" : {
-      "requestDetails" : {
-        "cloudConfiguration" : {
-          "lcpCloudRegionId" : "RegionOne",
-          "tenantId" : "onap"
+      "requestDetails": {
+        "cloudConfiguration": {
+          "lcpCloudRegionId": "RegionOne",
+          "tenantId": "60817ff9baa547d5857a6b7ff0dc567b"
         },
-        "modelInfo" : {
-          "modelType" : "service",
-          "modelInvariantId" : "1de901ed-17af-4b03-bc1f-41659cfa27cb",
-          "modelNameVersionId" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
-          "modelName" : "demoVLB",
-          "modelVersion" : "1.0"
+        "modelInfo": {
+          "modelType": "service",
+          "modelInvariantId": "f812e618-3abf-4c7a-901e-f2820a73eb2e",
+          "modelNameVersionId": "84ad850a-3d0b-451d-b97b-083bbf39890d",
+          "modelName": "demoVLB",
+          "modelVersion": "1.0",
+          "modelVersionId": "7b-083bbf39890"
         },
-        "subscriberInfo" : {
-          "globalSubscriberId" : "Demonstration"
+        "subscriberInfo": {
+          "globalSubscriberId": "Demonstration"
         },
-        "requestInfo" : {
-          "instanceName" : "sample-service-onap-cli-13",
-          "source" : "VID",
-          "suppressRollback" : "false"
+        "requestInfo": {
+          "requestorId": "234624",
+          "instanceName": "service-vlb-instance-1",
+          "source": "VID",
+          "suppressRollback": "false"
         },
-        "requestParameters" : {
-          "subscriptionServiceType" : "vLB"
+        "requestParameters": {
+          "subscriptionServiceType": "vlb",
+          "aLaCarte": true
         }
       }
     }
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml
index 827c7474..351d6395 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml
@@ -18,7 +18,7 @@ version: onap-beijing
 samples:
   sample1:
     name: service-create
-    input: --cloud-region RegionOne --tenant-id onap --model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --model-name demoVLB --model-version 1.0 -c Demonstration --instance-name sample-service-onap-cli-13 --service-type vLB
+    input: service-create --cloud-region RegionOne --tenant-id 60817ff9baa547d5857a6b7ff0dc567b --model-invariant-id f812e618-3abf-4c7a-901e-f2820a73eb2e --model-uuid 84ad850a-3d0b-451d-b97b-083bbf39890d --model-name demoVLB --model-version 1.0 -c Demonstration --instance-name service-vlb-instance-1 --service-type vlb --model-version-id 57a6b7ff0dc567b
     moco: service-create-schema-beijing-moco.json
     output: |
       +--------------+--------------------------------------+