From d52ab7c0716810980a717318a3f387e0116d048b Mon Sep 17 00:00:00 2001 From: Itohan Ukponmwan Date: Fri, 19 Apr 2019 21:53:02 +0000 Subject: 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 --- .../service-create-schema-dublin-moco.json | 71 ++++++++++++++++++++ .../service-create-schema-dublin-sample.yaml | 14 ++++ .../vf-module-create-schema-dublin-moco.json | 75 ++++++++++++++++++++++ .../vf-module-create-schema-dublin-sample.yaml | 9 +++ .../vnf-create-schema-dublin-moco.json | 64 ++++++++++++++++++ .../vnf-create-schema-dublin-sample.yaml | 14 ++++ 6 files changed, 247 insertions(+) create mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-moco.json create mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-sample/service-create-schema-dublin-sample.yaml create mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-moco.json create mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-dublin-sample.yaml create mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-moco.json create mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-sample/vnf-create-schema-dublin-sample.yaml (limited to 'products/onap-dublin/features/so/src/main/resources/open-cli-sample') 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 | + +----------+--------------------------------------+ -- cgit 1.2.3-korg