summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2019-05-02 08:17:17 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-02 08:17:17 +0000
commit70d51414231a0d4f6010e40646386e3b740a7e0b (patch)
treee2b78ea32ff9961f1a17c1ee83fd7cf358200713
parent69fd82243f00695f14c86d339d9bc62e1d81ed82 (diff)
parentd52ab7c0716810980a717318a3f387e0116d048b (diff)
Merge "Fixed service-create, vnf-create and vf-module-create"
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-moco.json71
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-sample.yaml14
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-moco.json75
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-sample.yaml9
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-moco.json64
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-sample.yaml14
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-schema-dublin.yaml38
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-dublin.yaml150
-rw-r--r--products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-create-schema-dublin.yaml35
9 files changed, 417 insertions, 53 deletions
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-moco.json b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-moco.json
new file mode 100644
index 00000000..15585f10
--- /dev/null
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-moco.json
@@ -0,0 +1,71 @@
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onap/so/infra/serviceInstances/v6",
+ "headers" : {
+ "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-bd61dbd5-395b-46e3-b5c9-4f40f9a94a39",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "requestDetails" : {
+ "modelInfo" : {
+ "modelType" : "service",
+ "modelInvariantId" : "41d0ebba-4b89-4437-9b22-4d83d2183aaa",
+ "modelUuid" : "545bca3c-8cc0-4dac-b464-1720894e0213",
+ "modelName" : "vfw-demo-service",
+ "modelVersion" : "1.0",
+ "modelVersionId" : "545bca3c-8cc0-4dac-b464-1720894e0213",
+ "modelInvariantUuid" : "41d0ebba-4b89-4437-9b22-4d83d2183aaa"
+ },
+ "subscriberInfo" : {
+ "globalSubscriberId" : "Demonstration",
+ "subscriberName" : "Demonstration"
+ },
+ "requestInfo" : {
+ "requestorId" : "demo",
+ "instanceName" : "cli-instance-test",
+ "source" : "CLI",
+ "suppressRollback" : "false"
+ },
+ "requestParameters" : {
+ "subscriptionServiceType" : "vFW",
+ "aLaCarte" : "true",
+ "testApi" : "VNF_API",
+ "userParams" : [ {
+ "name" : "Customer_Location",
+ "value" : {
+ "customerLatitude" : "32.897480",
+ "customerLongitude" : "97.040443",
+ "customerName" : "some_company"
+ }
+ }, {
+ "name" : "Homing_Solution",
+ "value" : "oof"
+ }, {
+ "name" : "orchestrator",
+ "value" : "multicloud"
+ } ]
+ },
+ "project" : {
+ "projectName" : "Project-Demonstration"
+ },
+ "owningEntity" : {
+ "owningEntityId" : "d005274f-d295-4538-a6b0-a090a7807dae",
+ "owningEntityName" : "OE-Demonstration"
+ }
+ }
+ }
+ },
+ "response" : {
+ "status" : 202,
+ "json" : {
+ "requestReferences" : {
+ "requestId" : "7f379ef1-bb96-4773-b970-0bf9311c4494",
+ "instanceId" : "98a04978-07d2-46b1-bd16-ce48b1511d16"
+ }
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-sample.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-sample.yaml
new file mode 100644
index 00000000..9ca8e3f8
--- /dev/null
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-sample.yaml
@@ -0,0 +1,14 @@
+open_cli_sample_version: 1.0
+name: -w
+version: onap-dublin
+samples:
+ sample1:
+ name: -w
+ input: vFW -la 32.897480 -lo 97.040443 -o multicloud -A true -i vfw-demo-service -y some_company -x Project-Demonstration -q demo -O OE-Demonstration -k cli-instance-test -P VNF_API -H oof -n 545bca3c-8cc0-4dac-b464-1720894e0213 -e 41d0ebba-4b89-4437-9b22-4d83d2183aaa -j 1.0 -S Demonstration -g 545bca3c-8cc0-4dac-b464-1720894e0213 -z d005274f-d295-4538-a6b0-a090a7807dae -u InfraPortalClient -p password1$ -c Demonstration -m http://192.168.1.147:30277
+ moco: service-create-schema-dublin-moco.json
+ output: |
+ +------------+--------------------------------------+
+ |property |value |
+ +------------+--------------------------------------+
+ |service-id |98a04978-07d2-46b1-bd16-ce48b1511d16 |
+ +------------+--------------------------------------+
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-moco.json b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-moco.json
new file mode 100644
index 00000000..8c92609d
--- /dev/null
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-moco.json
@@ -0,0 +1,75 @@
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onap/so/infra/serviceInstances/v6/d353ace3-52e9-4c79-b3c8-63c97e15cc29/vnfs/dad645a3-7e01-47cd-8e70-cdc8b5e880ec/vfModules",
+ "headers" : {
+ "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-10344988-2fcb-496a-bbff-9a7462dfb328",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "requestDetails" : {
+ "modelInfo" : {
+ "modelType" : "vfModule",
+ "modelInvariantId" : "8d3071e4-0d4e-4520-aa92-c01b9a019142",
+ "modelVersionId" : "d5c83591-0f22-4543-ada2-24197847b7d2",
+ "modelName" : "VfwHpaSriovV2..base_vfw..module-0",
+ "modelVersion" : "1",
+ "modelCustomizationId" : "0f837829-0dbb-4768-88d4-3cdf01e073f6",
+ "modelCustomizationName" : "VfwHpaSriovV2..base_vfw..module-0"
+ },
+ "cloudConfiguration" : {
+ "lcpCloudRegionId" : "cloud-two",
+ "tenantId" : "a0ea4cfd751e40e0a093848dd9e03e6c"
+ },
+ "requestInfo" : {
+ "instanceName" : "vfw-sriov-cli",
+ "source" : "VID",
+ "suppressRollback" : "false",
+ "requestorId" : "demo"
+ },
+ "relatedInstanceList" : [ {
+ "relatedInstance" : {
+ "instanceId" : "d353ace3-52e9-4c79-b3c8-63c97e15cc29",
+ "modelInfo" : {
+ "modelType" : "service",
+ "modelInvariantId" : "41d0ebba-4b89-4437-9b22-4d83d2183aaa",
+ "modelVersionId" : "545bca3c-8cc0-4dac-b464-1720894e0213",
+ "modelName" : "vfw-demo-service",
+ "modelVersion" : "1.0"
+ }
+ }
+ }, {
+ "relatedInstance" : {
+ "instanceId" : "dad645a3-7e01-47cd-8e70-cdc8b5e880ec",
+ "modelInfo" : {
+ "modelType" : "vnf",
+ "modelInvariantId" : "b7d993a3-3870-4096-a16c-90110d402349",
+ "modelVersionId" : "04ffd583-5625-4471-b20b-38394b513efd",
+ "modelName" : "vfw-hpa-sriov_v2",
+ "modelVersion" : "1.0",
+ "modelCustomizationId" : "123f896f-c6a4-4560-8786-7607e832bb6f",
+ "modelCustomizationName" : "vfw-hpa-sriov_v2 0"
+ }
+ }
+ } ],
+ "requestParameters" : {
+ "userParams" : [ ],
+ "testApi" : "VNF_API",
+ "usePreload" : true
+ }
+ }
+ }
+ },
+ "response" : {
+ "status" : 202,
+ "json" : {
+ "requestReferences" : {
+ "requestId" : "f7bc812f-d7cd-4b81-9683-7865f039792c",
+ "instanceId" : "109cb0f1-3d90-4609-b0fc-1901be778367"
+ }
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-sample.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-sample.yaml
new file mode 100644
index 00000000..06450083
--- /dev/null
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: -w
+version: onap-dublin
+samples:
+ sample1:
+ name: -w
+ input: a0ea4cfd751e40e0a093848dd9e03e6c -mn vfw-hpa-sriov_v2 0 -x d353ace3-52e9-4c79-b3c8-63c97e15cc29 -l cloud-two -sv 1.0 -vc 0f837829-0dbb-4768-88d4-3cdf01e073f6 -vm 1 -mv 1.0 -i vfw-sriov-cli -vf vfw-hpa-sriov_v2 -vi 8d3071e4-0d4e-4520-aa92-c01b9a019142 -r false -mc 123f896f-c6a4-4560-8786-7607e832bb6f -api VNF_API -mi b7d993a3-3870-4096-a16c-90110d402349 -vid 04ffd583-5625-4471-b20b-38394b513efd -y dad645a3-7e01-47cd-8e70-cdc8b5e880ec -R demo -si 545bca3c-8cc0-4dac-b464-1720894e0213 -up true -sd 41d0ebba-4b89-4437-9b22-4d83d2183aaa -z vfw-demo-service -vn VfwHpaSriovV2..base_vfw..module-0 -vv d5c83591-0f22-4543-ada2-24197847b7d2 -u InfraPortalClient -p password1$ -m http://192.168.1.147:30277 --debug
+ moco: vf-module-create-schema-dublin-moco.json
+ output: \ No newline at end of file
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-moco.json b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-moco.json
new file mode 100644
index 00000000..e2df5035
--- /dev/null
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-moco.json
@@ -0,0 +1,64 @@
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onap/so/infra/serviceInstances/v6/43143a2c-f0e1-499d-b042-97fb0c05166b/vnfs",
+ "headers" : {
+ "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-dc1c3a89-1201-422f-a0a7-e876cab7b0f6",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "requestDetails" : {
+ "modelInfo" : {
+ "modelType" : "vnf",
+ "modelInvariantId" : "b7d993a3-3870-4096-a16c-90110d402349",
+ "modelVersionId" : "04ffd583-5625-4471-b20b-38394b513efd",
+ "modelName" : "vfw-hpa-sriov_v2",
+ "modelVersion" : "1.0",
+ "modelCustomizationId" : "123f896f-c6a4-4560-8786-7607e832bb6f",
+ "modelCustomizationName" : "vfw-hpa-sriov_v2 0"
+ },
+ "cloudConfiguration" : {
+ "lcpCloudRegionId" : "cloud-two",
+ "tenantId" : "a0ea4cfd751e40e0a093848dd9e03e6c"
+ },
+ "requestInfo" : {
+ "requestorId" : "demo",
+ "instanceName" : "cli-vnf-test",
+ "source" : "VID",
+ "productFamilyId" : "vFW"
+ },
+ "platform" : {
+ "platformName" : "Platform-Demonstration"
+ },
+ "lineOfBusiness" : {
+ "lineOfBusinessName" : "LOB-Demonstration"
+ },
+ "relatedInstanceList" : [ {
+ "relatedInstance" : {
+ "instanceId" : "43143a2c-f0e1-499d-b042-97fb0c05166b",
+ "modelInfo" : {
+ "modelType" : "service",
+ "modelInvariantId" : "41d0ebba-4b89-4437-9b22-4d83d2183aaa",
+ "modelVersionId" : "545bca3c-8cc0-4dac-b464-1720894e0213",
+ "modelName" : "vfw-demo-service",
+ "modelVersion" : "1.0"
+ }
+ }
+ } ],
+ "requestParameters" : { }
+ }
+ }
+ },
+ "response" : {
+ "status" : 202,
+ "json" : {
+ "requestReferences" : {
+ "requestId" : "a80dd590-d031-4f3f-a787-ba539b380c47",
+ "instanceId" : "000bb9fd-f0f3-444a-b26c-ac9b2a376e65"
+ }
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-sample.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-sample.yaml
new file mode 100644
index 00000000..8d44f005
--- /dev/null
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-sample.yaml
@@ -0,0 +1,14 @@
+open_cli_sample_version: 1.0
+name: -j
+version: onap-dublin
+samples:
+ sample1:
+ name: -j
+ input: 41d0ebba-4b89-4437-9b22-4d83d2183aaa -q vfw-demo-service -k 545bca3c-8cc0-4dac-b464-1720894e0213 -l cloud-two -y 43143a2c-f0e1-499d-b042-97fb0c05166b -z a0ea4cfd751e40e0a093848dd9e03e6c -r demo -c 04ffd583-5625-4471-b20b-38394b513efd -o cli-vnf-test -e vfw-hpa-sriov_v2 -g 1.0 -b b7d993a3-3870-4096-a16c-90110d402349 -n 1.0 -i 123f896f-c6a4-4560-8786-7607e832bb6f -vn vfw-hpa-sriov_v2 0 -w vFW -pn Platform-Demonstration -lob LOB-Demonstration -u InfraPortalClient -p password1$ -m http://192.168.1.147:30277
+ moco: vnf-create-schema-dublin-moco.json
+ output: |
+ +----------+--------------------------------------+
+ |property |value |
+ +----------+--------------------------------------+
+ |vf-id |000bb9fd-f0f3-444a-b26c-ac9b2a376e65 |
+ +----------+--------------------------------------+
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-schema-dublin.yaml
index 17dee449..38b0d2dd 100644
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-schema-dublin.yaml
@@ -22,18 +22,6 @@ info:
author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- - name: cloud-region
- description: cloud region identifier
- type: string
- short_option: l
- long_option: cloud-region
- is_optional: true
- - name: tenant-id
- description: tenant id
- type: string
- short_option: t
- long_option: tenant-id
- is_optional: true
- name: model-invariant-id
description: model invariant id generated by ASDC.
type: string
@@ -97,20 +85,20 @@ parameters:
- name: ala-carte
description: ala carte flag, defaults to true
type: string
- short_option: a
+ short_option: A
long_option: ala-carte
is_optional: true
default_value: true
- name: customer-latitude
description: customer latitude, part of customer location
type: string
- short_option: f
+ short_option: la
long_option: customer-latitude
is_optional: true
- name: customer-longitude
description: customer longitude, part of customer location
type: string
- short_option: d
+ short_option: lo
long_option: customer-longitude
is_optional: true
- name: customer-name
@@ -122,7 +110,7 @@ parameters:
- name: homing-solution
description: homing solution to use [oof|sniro]
type: string
- short_option: h
+ short_option: H
long_option: homing-solution
is_optional: true
- name: orchestrator
@@ -134,14 +122,14 @@ parameters:
- name: api
description: api to use [GR_API|VNF_API]
type: string
- short_option: p
+ short_option: P
long_option: api
is_optional: true
default_value: GR_API
- name: subscriber-name
description: subscriber name
type: string
- short_option: s
+ short_option: S
long_option: subscriber-name
is_optional: true
- name: project-name
@@ -159,7 +147,7 @@ parameters:
- name: owning-entity-name
description: owning entity name
type: string
- short_option: m
+ short_option: O
long_option: owning-entity-name
is_optional: true
@@ -170,8 +158,6 @@ results:
description: instance id for the created service.
type: string
scope: short
-
-
http:
service:
name: so
@@ -183,17 +169,14 @@ http:
method: POST
body: '{
"requestDetails":{
- "cloudConfiguration":{
- "lcpCloudRegionId":"${cloud-region}",
- "tenantId":"${tenant-id}"
- },
"modelInfo":{
"modelType":"service",
"modelInvariantId":"${model-invariant-id}",
- "modelNameVersionId":"${model-uuid}",
+ "modelUuid":"${model-uuid}",
"modelName":"${model-name}",
"modelVersion":"${model-version}",
- "modelVersionId":"${model-version-id}"
+ "modelVersionId":"${model-version-id}",
+ "modelInvariantUuid" : "${model-invariant-id}"
},
"subscriberInfo":{
"globalSubscriberId":"${customer}",
@@ -237,6 +220,7 @@ http:
}
}
}'
+
success_codes:
- 202
result_map:
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
}
}
}'
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-create-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-create-schema-dublin.yaml
index 072f19ca..76ecc448 100644
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-create-schema-dublin.yaml
@@ -13,7 +13,7 @@
# limitations under the License.
open_cli_schema_version: 1.0
-name: vfn-create
+name: vnf-create
description: Create a VNF
info:
@@ -42,7 +42,7 @@ parameters:
long_option: product-family
is_optional: false
- name: instance-name
- description: service instance name
+ description: name of vnf instance to be created
type: string
short_option: o
long_option: instance-name
@@ -83,6 +83,12 @@ parameters:
short_option: i
long_option: vf-model-customization-id
is_optional: false
+ - name: vf-model-customization-name
+ description: vf model customization name
+ type: string
+ short_option: vn
+ long_option: vf-model-customization-name
+ is_optional: false
- name: service-model-invariant-id
description: model invariant id
type: string
@@ -113,6 +119,20 @@ parameters:
short_option: r
long_option: requestor-id
is_optional: false
+ - name: platform-name
+ description: platform name
+ type: string
+ short_option: pn
+ long_option: platform-name
+ is_optional: false
+ - name: lob-name
+ description: libe of business name
+ type: string
+ short_option: lob
+ long_option: lob-name
+ is_optional: false
+
+
results:
@@ -127,8 +147,8 @@ http:
service:
name: so
version: v6
- auth: basic
mode: direct
+ auth: basic
request:
uri: /onap/so/infra/serviceInstances/v6/${service-instance-id}/vnfs
method: POST
@@ -140,7 +160,8 @@ http:
"modelVersionId":"${vf-model-uuid}",
"modelName":"${vf-model-name}",
"modelVersion":"${vf-model-version}",
- "modelCustomizationId":"${vf-model-customization-id}"
+ "modelCustomizationId": "${vf-model-customization-id}",
+ "modelCustomizationName": "${vf-model-customization-name}"
},
"cloudConfiguration":{
"lcpCloudRegionId":"${cloud-region}",
@@ -152,6 +173,12 @@ http:
"source":"VID",
"productFamilyId":"${product-family}"
},
+ "platform": {
+ "platformName": "${platform-name}"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "${lob-name}"
+ },
"relatedInstanceList":[
{
"relatedInstance":{