From a52f00e9d0af1181d3e9c87508789fb4ced022f5 Mon Sep 17 00:00:00 2001 From: Itohan Date: Mon, 30 Sep 2019 23:39:44 +0000 Subject: Minor bug fixes in CLI - Added USER_ID header for SDC - Changed multicloud url - Added samples for commands - Fixed Bug in service-create command Signed-off-by: Itohan Ukponmwan Issue-ID: CLI-229 Change-Id: I9ec94d6dd390d2b5bf059c2f8a82c67b65fbeb34 --- .../vsp/vsp-add-artifact-schema-elalto-moco.json | 21 ++++++++++ .../vsp/vsp-add-artifact-schema-elalto-sample.yaml | 9 ++++ .../vsp/vsp-add-license-schema-elalto-moco.json | 32 ++++++++++++++ .../vsp/vsp-add-license-schema-elalto-sample.yaml | 18 ++++++++ .../vsp/vsp-create-schema-elalto-moco.json | 41 ++++++++++++++++++ .../vsp/vsp-create-schema-elalto-sample.yaml | 18 ++++++++ .../vsp/vsp-package-schema-elalto-moco.json | 32 ++++++++++++++ .../vsp/vsp-package-schema-elalto-sample.yaml | 9 ++++ .../vsp/vsp-submit-schema-elalto-moco.json | 21 ++++++++++ .../vsp/vsp-submit-schema-elalto-sample.yaml | 9 ++++ .../vsp/vsp-validate-schema-elalto-moco.json | 49 ++++++++++++++++++++++ .../vsp/vsp-validate-schema-elalto-sample.yaml | 48 +++++++++++++++++++++ 12 files changed, 307 insertions(+) create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-sample.yaml (limited to 'products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp') diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-moco.json b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-moco.json new file mode 100644 index 00000000..0a7bfa31 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-moco.json @@ -0,0 +1,21 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/b6c23299280842eca622e9f1a4166d4f/versions/ab2c5855856240aa8cf6ad41ee447d51/orchestration-template-candidate", + "headers" : { + "Content-type" : "multipart/form-data", + "Accept" : "*/*", + "USER_ID" : "cs0008" + }, + "json" : { } + }, + "response" : { + "status" : 200, + "json" : { + "errors" : { }, + "status" : "Success", + "onboardingOrigin" : "zip", + "networkPackageName" : "vfw_hpa" + } + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-sample.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-sample.yaml new file mode 100644 index 00000000..cc380e49 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-artifact-schema-elalto-sample.yaml @@ -0,0 +1,9 @@ +open_cli_sample_version: 1.0 +name: vsp-add-artifact +version: onap-elalto +samples: + sample1: + name: vsp-add-artifact + input: -x b6c23299280842eca622e9f1a4166d4f -y ab2c5855856240aa8cf6ad41ee447d51 -z /root/automation_stuff/vfw_hpa.zip -u cs0008 -p demo123456! -m https://10.12.5.110:30207/sdc1/feProxy + moco: vsp-add-artifact-schema-elalto-moco.json + output: \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-moco.json b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-moco.json new file mode 100644 index 00000000..a7b12287 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-moco.json @@ -0,0 +1,32 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/253b4ec6f96f458294c0276f4a6dc2bc/versions/b48de24b9e334c8cbcb8ba5356e35204", + "headers" : { + "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "USER_ID" : "cs0008", + "X-TransactionId" : "req-210b6771-bf5d-4784-922e-bc94c041066c", + "Content-Type" : "application/json" + }, + "json" : { + "category" : "resourceNewCategory.generic", + "vendorId" : "8c97aece07bf43ab859700328e0b336b", + "subCategory" : "resourceNewCategory.generic.network elements", + "description" : "hpa-vsp-desc", + "licensingVersion" : "ac9ff5fe4a2e4939a9c6b29e21e65c96", + "licensingData" : { + "featureGroups" : [ "9a113c17158747fb821f2d8626f6e94a" ], + "licenseAgreement" : "c1afa5207e104431aca3b72001dbf6c1" + }, + "icon" : "icon", + "vendorName" : "hpa-test", + "name" : "hpa-vsp-test-7" + } + }, + "response" : { + "status" : 200, + "json" : { } + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-sample.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-sample.yaml new file mode 100644 index 00000000..88e9bdd0 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-add-license-schema-elalto-sample.yaml @@ -0,0 +1,18 @@ +open_cli_sample_version: 1.0 +name: vsp-add-license +version: onap-elalto +samples: + sample1: + name: vsp-add-license + input: -j 9a113c17158747fb821f2d8626f6e94a -e hpa-test -x hpa-vsp-test-7 -y hpa-vsp-desc -i c1afa5207e104431aca3b72001dbf6c1 -c ac9ff5fe4a2e4939a9c6b29e21e65c96 -g 8c97aece07bf43ab859700328e0b336b -id 253b4ec6f96f458294c0276f4a6dc2bc -vid b48de24b9e334c8cbcb8ba5356e35204 -u cs0008 -p demo123456! -m https://10.12.5.110:30207/sdc1/feProxy --debug + moco: vsp-add-license-schema-elalto-moco.json + output: | + +------------+--------+ + |property |value | + +------------+--------+ + |id |[] | + +------------+--------+ + |version |[] | + +------------+--------+ + |version-id |[] | + +------------+--------+ diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-moco.json b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-moco.json new file mode 100644 index 00000000..e9c5385d --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-moco.json @@ -0,0 +1,41 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products", + "headers" : { + "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "USER_ID" : "cs0008", + "X-TransactionId" : "req-0cc37083-8ba4-4dff-a133-83b95e14e123", + "Content-Type" : "application/json" + }, + "json" : { + "category" : "resourceNewCategory.generic", + "vendorId" : "8e1cffcf802941b1a88861ea71857fe2", + "subCategory" : "resourceNewCategory.generic.network elements", + "description" : "hpa-vsp-desc", + "licensingVersion" : "f6b115c0f4d8459f9422a21559025a7e", + "licensingData" : { + "featureGroups" : [ "0c81a6a0272546f49403d241bb4ce3b3" ], + "licenseAgreement" : "8cadce750de14b72b37c4c94d41e2cfd" + }, + "icon" : "icon", + "onboardingMethod" : "NetworkPackage", + "vendorName" : "hpa-vendor-1", + "name" : "hpa-vsp-vfw-0" + } + }, + "response" : { + "status" : 200, + "json" : { + "itemId" : "b6c23299280842eca622e9f1a4166d4f", + "version" : { + "id" : "ab2c5855856240aa8cf6ad41ee447d51", + "name" : "1.0", + "description" : "Initial version", + "status" : "Draft" + } + } + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-sample.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-sample.yaml new file mode 100644 index 00000000..150e9e97 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-elalto-sample.yaml @@ -0,0 +1,18 @@ +open_cli_sample_version: 1.0 +name: vsp-create +version: onap-elalto +samples: + sample1: + name: vsp-create + input: -j 0c81a6a0272546f49403d241bb4ce3b3 -o NetworkPackage -e hpa-vendor-1 -x hpa-vsp-vfw-0 -y hpa-vsp-desc -i 8cadce750de14b72b37c4c94d41e2cfd -c f6b115c0f4d8459f9422a21559025a7e -g 8e1cffcf802941b1a88861ea71857fe2 -u cs0008 -p demo123456! -m https://10.12.5.110:30207/sdc1/feProxy + moco: vsp-create-schema-elalto-moco.json + output: | + +------------+----------------------------------+ + |property |value | + +------------+----------------------------------+ + |id |b6c23299280842eca622e9f1a4166d4f | + +------------+----------------------------------+ + |version |1.0 | + +------------+----------------------------------+ + |version-id |ab2c5855856240aa8cf6ad41ee447d51 | + +------------+----------------------------------+ diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-moco.json b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-moco.json new file mode 100644 index 00000000..929d019d --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-moco.json @@ -0,0 +1,32 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/b6c23299280842eca622e9f1a4166d4f/versions/ab2c5855856240aa8cf6ad41ee447d51/actions", + "headers" : { + "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "USER_ID" : "cs0008", + "X-TransactionId" : "req-1b845803-a01f-48cd-b838-91a3e2a1957c", + "Content-Type" : "application/json" + }, + "json" : { + "action" : "Create_Package" + } + }, + "response" : { + "status" : 200, + "json" : { + "description" : "hpa-vsp-desc", + "vspName" : "hpa-vsp-vfw-0", + "version" : "1.0", + "packageId" : "b6c23299280842eca622e9f1a4166d4f", + "category" : "resourceNewCategory.generic", + "subCategory" : "resourceNewCategory.generic.network elements", + "vendorName" : "hpa-vendor-1", + "vendorRelease" : "1.0", + "packageType" : "CSAR", + "resourceType" : "VF" + } + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-sample.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-sample.yaml new file mode 100644 index 00000000..b8878447 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-elalto-sample.yaml @@ -0,0 +1,9 @@ +open_cli_sample_version: 1.0 +name: vsp-package +version: onap-elalto +samples: + sample1: + name: vsp-package + input: -x b6c23299280842eca622e9f1a4166d4f -y ab2c5855856240aa8cf6ad41ee447d51 -u cs0008 -p demo123456! -m https://10.12.5.110:30207/sdc1/feProxy + moco: vsp-package-schema-elalto-moco.json + output: \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-moco.json b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-moco.json new file mode 100644 index 00000000..c4ce4163 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-moco.json @@ -0,0 +1,21 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/b6c23299280842eca622e9f1a4166d4f/versions/ab2c5855856240aa8cf6ad41ee447d51/actions", + "headers" : { + "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "USER_ID" : "cs0008", + "X-TransactionId" : "req-5bf79765-f60f-409d-9e02-75f35756d7b5", + "Content-Type" : "application/json" + }, + "json" : { + "action" : "Submit" + } + }, + "response" : { + "status" : 200, + "json" : { } + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-sample.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-sample.yaml new file mode 100644 index 00000000..e45a6b1c --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-elalto-sample.yaml @@ -0,0 +1,9 @@ +open_cli_sample_version: 1.0 +name: vsp-submit +version: onap-elalto +samples: + sample1: + name: vsp-submit + input: -x b6c23299280842eca622e9f1a4166d4f -y ab2c5855856240aa8cf6ad41ee447d51 -u cs0008 -p demo123456! -m https://10.12.5.110:30207/sdc1/feProxy + moco: vsp-submit-schema-elalto-moco.json + output: \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-moco.json b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-moco.json new file mode 100644 index 00000000..766a5be7 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-moco.json @@ -0,0 +1,49 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/b6c23299280842eca622e9f1a4166d4f/versions/ab2c5855856240aa8cf6ad41ee447d51/orchestration-template-candidate/process", + "headers" : { + "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "USER_ID" : "cs0008", + "X-TransactionId" : "req-371de262-4bea-401b-8573-d7b84c7aa3e6", + "Content-Type" : "application/json" + }, + "json" : { } + }, + "response" : { + "status" : 200, + "json" : { + "fileNames" : [ "base_vfw.yaml", "base_vfw.env" ], + "errors" : { + "base_vfw.yaml" : [ { + "level" : "WARNING", + "message" : "WARNING: [NNP1]: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vfw_private_2_port]. As a result, VF/VFC Profile may miss this information" + }, { + "level" : "WARNING", + "message" : "WARNING: [NNP1]: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vpg_private_1_port]. As a result, VF/VFC Profile may miss this information" + }, { + "level" : "WARNING", + "message" : "WARNING: [NNP1]: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vsn_private_1_port]. As a result, VF/VFC Profile may miss this information" + }, { + "level" : "WARNING", + "message" : "WARNING: [NNS11]: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vfw_0]" + }, { + "level" : "WARNING", + "message" : "WARNING: [NNS12]: A resource is connected twice to the same network role, Network Role [vpg_0], Resource ID [onap_private]" + }, { + "level" : "WARNING", + "message" : "WARNING: [NNS11]: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vpg_0]" + }, { + "level" : "WARNING", + "message" : "WARNING: [NNS12]: A resource is connected twice to the same network role, Network Role [vsn_0], Resource ID [onap_private]" + }, { + "level" : "WARNING", + "message" : "WARNING: [NNS11]: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vsn_0]" + } ] + }, + "status" : "Success" + } + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-sample.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-sample.yaml new file mode 100644 index 00000000..43a6bdf9 --- /dev/null +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-elalto-sample.yaml @@ -0,0 +1,48 @@ +open_cli_sample_version: 1.0 +name: vsp-validate +version: onap-elalto +samples: + sample1: + name: vsp-validate + input: -x b6c23299280842eca622e9f1a4166d4f -y ab2c5855856240aa8cf6ad41ee447d51 -u cs0008 -p demo123456! -m https://10.12.5.110:30207/sdc1/feProxy + moco: vsp-validate-schema-elalto-moco.json + output: | + +----------+----------------------------------------------------+ + |property |value | + +----------+----------------------------------------------------+ + |status |Success | + +----------+----------------------------------------------------+ + |errors |{base_vfw.yaml=[{"level":"WARNING","message":"WARN | + | |ING: [NNP1]: Port 'Fixed_IPS' Parameter Name not | + | |aligned with Guidelines, Parameter Name | + | |[onap_private_subnet_id], Resource ID | + | |[vfw_private_2_port]. As a result, VF\/VFC | + | |Profile may miss this information"},{"level":"WARN | + | |ING","message":"WARNING: [NNP1]: Port 'Fixed_IPS' | + | |Parameter Name not aligned with Guidelines, | + | |Parameter Name [onap_private_subnet_id], Resource | + | |ID [vpg_private_1_port]. As a result, VF\/VFC | + | |Profile may miss this information"},{"level":"WARN | + | |ING","message":"WARNING: [NNP1]: Port 'Fixed_IPS' | + | |Parameter Name not aligned with Guidelines, | + | |Parameter Name [onap_private_subnet_id], Resource | + | |ID [vsn_private_1_port]. As a result, VF\/VFC | + | |Profile may miss this information"},{"level":"WARN | + | |ING","message":"WARNING: [NNS11]: Nova Server | + | |naming convention in image, flavor and name | + | |properties is not consistent, Resource ID | + | |[vfw_0]"},{"level":"WARNING","message":"WARNING: | + | |[NNS12]: A resource is connected twice to the | + | |same network role, Network Role [vpg_0], Resource | + | |ID [onap_private]"},{"level":"WARNING","message":" | + | |WARNING: [NNS11]: Nova Server naming convention | + | |in image, flavor and name properties is not | + | |consistent, Resource ID | + | |[vpg_0]"},{"level":"WARNING","message":"WARNING: | + | |[NNS12]: A resource is connected twice to the | + | |same network role, Network Role [vsn_0], Resource | + | |ID [onap_private]"},{"level":"WARNING","message":" | + | |WARNING: [NNS11]: Nova Server naming convention | + | |in image, flavor and name properties is not | + | |consistent, Resource ID [vsn_0]"}]} | + +----------+----------------------------------------------------+ -- cgit 1.2.3-korg