From 1301b4f1f5273a7fd3bbcfbc31ed25bbb58fc8b4 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam Date: Thu, 29 Aug 2019 16:49:43 +0530 Subject: vsp create updates Change-Id: Iaa6a8bccbbaea70199edf96fa9111cb7c0ad7756 Issue-ID: CLI-166 Signed-off-by: Kanagaraj Manickam k00365106 --- .../vsp/vsp-create-schema-dublin-moco.json | 20 ++++++++-------- .../vsp/vsp-create-schema-dublin-sample.yaml | 27 ++++------------------ .../vsp/vsp-create-schema-dublin.yaml | 14 +++++++---- 3 files changed, 24 insertions(+), 37 deletions(-) (limited to 'products/onap-dublin') diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-moco.json index bbd21740..75a9207b 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-moco.json +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-moco.json @@ -7,31 +7,31 @@ "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", "USER_ID" : "cs0008", - "X-TransactionId" : "req-a5095ef3-5afc-4305-945b-26fbdaf0b6b0", + "X-TransactionId" : "req-86df50dc-3478-46c9-bba5-85acb0ac33db", "Content-Type" : "application/json" }, "json" : { "category" : "resourceNewCategory.generic", - "vendorId" : "74b43ab85f3d49948c1513a27adfaba7", + "vendorId" : "d572f583bf224b4c93b99105cd35b0a9", "subCategory" : "resourceNewCategory.generic.abstract", - "description" : "cli-test-vsp", - "licensingVersion" : "eb65c2fbbaee4a8dbd0b60e697e98fb7", + "description" : "Created by Open Command Platform - OCOMP", + "licensingVersion" : "496cc167b6cf44c3b7818c95a1d9e036", "licensingData" : { - "featureGroups" : [ "292d56e87f274ef385b0dfd41f41a066" ], - "licenseAgreement" : "92bcbe53b6724ae78c7c13e4269cb90f" + "featureGroups" : [ "880c355b9b374ec08db60906f86a7c15" ], + "licenseAgreement" : "d53857e1d3df472cadd3ac72dfd83a6f" }, "icon" : "icon", "onboardingMethod" : "NetworkPackage", - "vendorName" : "Itohan-vendor", - "name" : "cli-vsp-v2" + "vendorName" : "ocompvtpvendor", + "name" : "vgwocompvtp" } }, "response" : { "status" : 200, "json" : { - "itemId" : "a9928e0e8b124f4d87a9e0654c4b1d60", + "itemId" : "55ca1625888743a1b791790b126b79f9", "version" : { - "id" : "b087302e50374ab28e5a8d4b32aa3abe", + "id" : "f13d686db7bf4fb0ba34354faf8a9d30", "name" : "1.0", "description" : "Initial version", "status" : "Draft" diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-sample.yaml index 0f8fee52..5d810316 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-dublin-sample.yaml @@ -1,29 +1,10 @@ -# Copyright © Intel Corporation 2019 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. open_cli_sample_version: 1.0 -name: -j +name: vsp-create version: onap-dublin samples: sample1: - name: -j - input: 292d56e87f274ef385b0dfd41f41a066 -o NetworkPackage -e Itohan-vendor -x cli-vsp-v2 -y cli-test-vsp -i 92bcbe53b6724ae78c7c13e4269cb90f -c eb65c2fbbaee4a8dbd0b60e697e98fb7 -g 74b43ab85f3d49948c1513a27adfaba7 -u cs0008 -p demo123456! -m http://10.43.107.110:8081 + name: vsp-create + input: --format json --vlm-id d572f583bf224b4c93b99105cd35b0a9 --vlm-agreement-id d53857e1d3df472cadd3ac72dfd83a6f --vsp-name vgwocompvtp --vlm-version 496cc167b6cf44c3b7818c95a1d9e036 --vsp-description Created by Open Command Platform - OCOMP --vlm-vendor ocompvtpvendor --vlm-feature-group-id 880c355b9b374ec08db60906f86a7c15 moco: vsp-create-schema-dublin-moco.json output: | - +----------+----------------------------------+ - |property |value | - +----------+----------------------------------+ - |ID |a9928e0e8b124f4d87a9e0654c4b1d60 | - +----------+----------------------------------+ - |version |b087302e50374ab28e5a8d4b32aa3abe | - +----------+----------------------------------+ + {"version-id":"f13d686db7bf4fb0ba34354faf8a9d30","id":"55ca1625888743a1b791790b126b79f9","version":"1.0"} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml index 19c92393..041f536d 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create Vendor Software Product info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org parameters: @@ -71,17 +71,22 @@ parameters: long_option: onboarding-method short_option: o is_optional: false + default_value: NetworkPackage results: direction: portrait attributes: - - name: ID + - name: id description: VSP ID scope: short type: string - name: version description: VSP Model version scope: short + type: string + - name: version-id + description: VSP Model version id + scope: short type: uuid http: service: @@ -107,5 +112,6 @@ http: success_codes: - 200 result_map: - ID: $b{$.itemId} - version: $b{$.version.id} + id: $b{$.itemId} + version: $b{$.version.name} + version-id: $b{$.version.id} -- cgit 1.2.3-korg