Fixed service-create, vnf-create and vf-module-create

-Changed short letters in conflict in service-create
-Manually put in the right authorization header in commands
-Removed cloud parameters which fail when left blank
-Added required parameters for vnf-create
-Added required parameters for vf-module-create

Change-Id: I7cc708e1823dcf2b6a06f113a16f99464e7b3a83
Issue-ID: CLI-163
Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>

1 files changed, 128 insertions, 22 deletions

diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-dublin.yaml
index 7dc5c372..edf82c2e 100644
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-dublin.yaml
@@ -38,7 +38,7 @@ parameters:
     description: vnf instance id

     type: string

     short_option: y

-    long_option: vnf-instace-id

+    long_option: vnf-instance-id

     is_optional: false

   - name: service-instance-id

     description: unique id for service instance

@@ -46,24 +46,126 @@ parameters:
     short_option: x

     long_option: service-instace-id

     is_optional: false

-  - name: parenet-service-model

+  - name: parent-service-model

     description: parent service model name

     type: string

     short_option: z

-    long_option: parenet-service-model

+    long_option: parent-service-model

+    is_optional: false

+  - name: service-model-id

+    description: service model id

+    type: string

+    short_option: si

+    long_option: service-model-id

+    is_optional: false

+  - name: service-model-invariant-id

+    description: service model invariant id

+    type: string

+    short_option: sd

+    long_option: service-model-invariant-id

+    is_optional: false

+  - name: service-model-version

+    description: service model version

+    type: string

+    short_option: sv

+    long_option: service-model-version

     is_optional: false

   - name: supress-rollback

     description: rollback changes if instantiation fails.

     type: bool

     short_option: r

     long_option: supress-rollback

-    is_optional: true

+    is_optional: false

   - name: instance-name

     description: service instance name

     type: string

     short_option: i

     long_option: instance-name

     is_optional: false

+  - name: vf-module-model-invariant-id

+    description: Invariant Id of vf module model in SO catalogdb

+    type: string

+    short_option: vi

+    long_option: vf-module-model-invariant-id

+    is_optional: false

+  - name: vf-module-model-version-id

+    description: version Id of vf module model in SO catalogdb

+    type: string

+    short_option: vv

+    long_option: vf-module-model-version-id

+    is_optional: false

+  - name: vf-module-model-name

+    description: Model Name of vf module model in SO catalogdb

+    type: string

+    short_option: vn

+    long_option: vf-module-model-name

+    is_optional: false

+  - name: vf-module-model-customization-id

+    description: Customization Id of vf module model in SO catalogdb

+    type: string

+    short_option: vc

+    long_option: vf-module-model-customization-id

+    is_optional: false

+  - name: vf-module-model-version

+    description: version of vf module model in SO catalogdb

+    type: string

+    short_option: vm

+    long_option: vf-module-model-version

+    is_optional: false

+  - name: requestor-id

+    description: Id of requestor

+    type: string

+    short_option: R

+    long_option: requestor-id

+    is_optional: false

+  - name: vf-model-name

+    description: name of vf model used in service model

+    type: string

+    short_option: vf

+    long_option: vf-model-name

+    is_optional: false

+  - name: vf-model-invariant-id

+    description: vf model invariant id

+    type: string

+    short_option: mi

+    long_option: vf-model-invariant-id

+    is_optional: false

+  - name: vf-model-version

+    description: vf model version

+    type: string

+    short_option: mv

+    long_option: vf-model-version

+    is_optional: false

+  - name: vf-model-id

+    description: vf model id

+    type: string

+    short_option: vid

+    long_option: vf-model-id

+    is_optional: false

+  - name: vf-model-customization-id

+    description: vf model customization id

+    type: string

+    short_option: mc

+    long_option: vf-model-customization-id

+    is_optional: false

+  - name: vf-model-customization-name

+    description: vf model customization name

+    type: string

+    short_option: mn

+    long_option: vf-model-customization-name

+    is_optional: false

+  - name: test-api

+    description: api for testing (VNF_API|GR_API)

+    type: string

+    short_option: api

+    long_option: test-api

+    is_optional: false

+  - name: use-preload

+    description: To use preloaded values or not

+    type: bool

+    short_option: up

+    long_option: use-preload

+    is_optional: false

 

 results:

   direction: portrait

@@ -77,8 +179,8 @@ http:
   service:

     name: so

     version: v6

-    auth: basic

     mode: direct

+    auth: basic

   request:

     uri: /onap/so/infra/serviceInstances/v6/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules

     method: POST

@@ -86,10 +188,12 @@ http:
               "requestDetails":{

                  "modelInfo":{

                     "modelType":"vfModule",

-                    "modelInvariantId":"ff5256d2-5a33-55df-13ab-12abad84e7ff",

-                    "modelNameVersionId":"fe6478e5-ea33-3346-ac12-ab121484a3fe",

-                    "modelName":"vSAMP12..base..module-0",

-                    "modelVersion":"1"

+                    "modelInvariantId":"${vf-module-model-invariant-id}",

+                    "modelVersionId":"${vf-module-model-version-id}",

+                    "modelName":"${vf-module-model-name}",

+                    "modelVersion":"${vf-module-model-version}",

+                    "modelCustomizationId": "${vf-module-model-customization-id}",

+                    "modelCustomizationName": "${vf-module-model-name}"

                  },

                  "cloudConfiguration":{

                     "lcpCloudRegionId":"${lcp-cloudregion-id}",

@@ -98,7 +202,8 @@ http:
                  "requestInfo":{

                     "instanceName":"${instance-name}",

                     "source":"VID",

-                    "suppressRollback":"${supress-rollback}"

+                    "suppressRollback":"${supress-rollback}",

+                    "requestorId" : "${requestor-id}"

                  },

                  "relatedInstanceList":[

                     {

@@ -106,10 +211,10 @@ http:
                           "instanceId":"${service-instance-id}",

                           "modelInfo":{

                              "modelType":"service",

-                             "modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff",

-                             "modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe",

-                             "modelName":"${parenet-service-model}",

-                             "modelVersion":"1.0"

+                             "modelInvariantId":"${service-model-invariant-id}",

+                             "modelVersionId":"${service-model-id}",

+                             "modelName":"${parent-service-model}",

+                             "modelVersion":"${service-model-version}"

                           }

                        }

                     },

@@ -118,19 +223,20 @@ http:
                           "instanceId":"${vnf-instance-id}",

                           "modelInfo":{

                              "modelType":"vnf",

-                             "modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff",

-                             "modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe",

-                             "modelName":"vSAMP12",

-                             "modelVersion":"1.0",

-                             "modelCustomizationName":"vSAMP12 1"

+                             "modelInvariantId":"${vf-model-invariant-id}",

+                             "modelVersionId":"${vf-model-id}",

+                             "modelName":"${vf-model-name}",

+                             "modelVersion":"${vf-model-version}",

+                             "modelCustomizationId": "${vf-model-customization-id}",

+                             "modelCustomizationName":"${vf-model-customization-name}"

                           }

                        }

                     }

                  ],

                  "requestParameters":{

-                    "userParams":[

-

-                    ]

+                    "userParams":[],

+                    "testApi": "${test-api}",

+                    "usePreload": true

                  }

               }

            }'