Merge changes Ie12df218,If2be275a,I01a662ef

* changes:
  Fix vf-create sampel for beijing
  Fix moco for vf-create command
  Fix schema for vf-create

3 files changed, 37 insertions, 28 deletions

diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-moco.json b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-moco.json
index 0d8a97b9..e465f9ab 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-moco.json
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-moco.json
@@ -10,37 +10,40 @@
       "Content-Type" : "application/json"
     },
     "json" : {
-      "requestDetails" : {
-        "modelInfo" : {
-          "modelType" : "vnf",
-          "modelInvariantId" : "cc34cd54-dd7c-44cd-8847-f9577c6f1a49",
-          "modelVersionId" : "8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe",
-          "modelName" : "847cb26a-59a6-475a-94dd",
-          "modelVersion" : "1.0",
-          "modelCustomizationId" : "cf893f5a-1bb1-4e32-a92b-2456e12178f8"
+      "requestDetails": {
+        "modelInfo": {
+          "modelType": "vnf",
+          "modelInvariantId": "4982d10b-09af-46b9-8317-c92d2658ae68",
+          "modelVersionId": "b2a40a03-c85e-4b6c-8ade-f90e5f2ce2d4",
+          "modelName": "2932d051-6aad-4c0d-ac2d",
+          "modelVersion": "1.0",
+          "modelCustomizationId": "3741acf1-5929-42e6-b234-4b9051d09a54"
         },
-        "cloudConfiguration" : {
-          "lcpCloudRegionId" : "RegionOne",
-          "tenantId" : "onap"
+        "cloudConfiguration": {
+          "lcpCloudRegionId": "RegionOne",
+          "tenantId": "onap"
         },
-        "requestInfo" : {
-          "instanceName" : "vlb-cli-sample-11",
-          "source" : "VID",
-          "productFamilyId" : "vLB"
+        "requestInfo": {
+          "requestorId": "2345",
+          "instanceName": "service-vlb-instance-1-vnf-1",
+          "source": "VID",
+          "productFamilyId": "vLB"
         },
-        "relatedInstanceList" : [ {
-          "relatedInstance" : {
-            "instanceId" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee",
-            "modelInfo" : {
-              "modelType" : "service",
-              "modelInvariantId" : "1de901ed-17af-4b03-bc1f-41659cfa27cb",
-              "modelVersionId" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
-              "modelName" : "demoVLB",
-              "modelVersion" : "1.0"
+        "relatedInstanceList": [
+          {
+            "relatedInstance": {
+              "instanceId": "1561a325-a64b-47ab-86f4-459e334292f0",
+              "modelInfo": {
+                "modelType": "service",
+                "modelInvariantId": "f812e618-3abf-4c7a-901e-f2820a73eb2e",
+                "modelVersionId": "84ad850a-3d0b-451d-b97b-083bbf39890d",
+                "modelName": "demoVLB",
+                "modelVersion": "1.0"
+              }
             }
           }
-        } ],
-        "requestParameters" : { }
+        ],
+        "requestParameters": {}
       }
     }
   },
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml
index bbe549c7..7a66d9d8 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml
@@ -18,7 +18,7 @@ version: onap-beijing
 samples:
   sample1:
     name: vf-create
-    input: --cloud-region RegionOne --tenant-id onap --product-family vLB --instance-name vlb-cli-sample-11 --service-instance-id 2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee --vf-model-invariant-id cc34cd54-dd7c-44cd-8847-f9577c6f1a49 --vf-model-uuid 8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe --vf-model-name 847cb26a-59a6-475a-94dd --vf-model-version 1.0 --vf-model-customization-id cf893f5a-1bb1-4e32-a92b-2456e12178f8 --service-model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --service-model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --service-model-name demoVLB --service-model-version 1.0 -m http://192.168.17.121:8080 -u InfraPortalClient -p password1$
+    input: --cloud-region RegionOne --tenant-id onap --product-family vLB --instance-name service-vlb-instance-1-vnf-1 --service-instance-id 1561a325-a64b-47ab-86f4-459e334292f0 --vf-model-invariant-id 4982d10b-09af-46b9-8317-c92d2658ae68 --vf-model-uuid b2a40a03-c85e-4b6c-8ade-f90e5f2ce2d4 --vf-model-name 2932d051-6aad-4c0d-ac2d --vf-model-version 1.0 --vf-model-customization-id 3741acf1-5929-42e6-b234-4b9051d09a54 --service-model-invariant-id f812e618-3abf-4c7a-901e-f2820a73eb2e --service-model-uuid 84ad850a-3d0b-451d-b97b-083bbf39890d --service-model-name demoVLB --service-model-version 1.0 -r 2345
     moco: vf-create-schema-beijing-moco.json
     output: |
       +--------------+--------------------------------------+
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml
index eac89b53..e9732289 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml
@@ -106,6 +106,12 @@ parameters:
     short_option: n
     long_option: service-model-version
     is_optional: false
+  - name: requestor-id
+    description: requestor ID
+    type: string
+    short_option: r
+    long_option: requestor-id
+    is_optional: false
 
 
 results:
@@ -125,7 +131,7 @@ http:
   request:
     uri: /ecomp/mso/infra/serviceInstances/v4/${service-instance-id}/vnfs
     method: POST
-    body: '{"requestDetails": {"modelInfo": {"modelType": "vnf","modelInvariantId": "${vf-model-invariant-id}","modelVersionId": "${vf-model-uuid}","modelName": "${vf-model-name}","modelVersion": "${vf-model-version}","modelCustomizationId": "${vf-model-customization-id}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"requestInfo": {"instanceName": "${instance-name}","source": "VID","productFamilyId": "${product-family}" },"relatedInstanceList": [{"relatedInstance": {"instanceId": "${service-instance-id}","modelInfo": {"modelType": "service","modelInvariantId": "${service-model-invariant-id}","modelVersionId": "${service-model-uuid}","modelName": "${service-model-name}","modelVersion": "${service-model-version}"}}}],"requestParameters": {}}}'
+    body: '{"requestDetails": {"modelInfo": {"modelType": "vnf","modelInvariantId": "${vf-model-invariant-id}","modelVersionId": "${vf-model-uuid}","modelName": "${vf-model-name}","modelVersion": "${vf-model-version}","modelCustomizationId": "${vf-model-customization-id}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"requestInfo": {"requestorId": "${requestor-id}","instanceName": "${instance-name}","source": "VID","productFamilyId": "${product-family}" },"relatedInstanceList": [{"relatedInstance": {"instanceId": "${service-instance-id}","modelInfo": {"modelType": "service","modelInvariantId": "${service-model-invariant-id}","modelVersionId": "${service-model-uuid}","modelName": "${service-model-name}","modelVersion": "${service-model-version}"}}}],"requestParameters": {}}}'
 
   success_codes:
     - 202