summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <mkr1481@gmail.com>2019-08-29 16:44:20 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2019-08-29 16:44:20 +0530
commita6a3dfd5dcd974f6ee91bf7ae8e2c5ecf44975d8 (patch)
treedd35ddb62680ed9a1efc3b56342befe33d5bf816
parent82b6102171ca7d07b9cef262be627023dd7b1d5f (diff)
vsp-validate updates
Change-Id: I162fa0c2ac1dceeac00cdb328f3c4d70e96372f4 Issue-ID: CLI-166 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-moco.json34
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-sample.yaml59
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml2
3 files changed, 9 insertions, 86 deletions
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-moco.json
index fabb98b3..baf9a525 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-moco.json
@@ -1,13 +1,13 @@
[ {
"request" : {
"method" : "put",
- "uri" : "/onboarding-api/v1.0/vendor-software-products/0afed170432e471e9dafb662f78a8277/versions/a6a78a511fd74524889f8095e12b9aac/orchestration-template-candidate/process",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products/55ca1625888743a1b791790b126b79f9/versions/f13d686db7bf4fb0ba34354faf8a9d30/orchestration-template-candidate/process",
"headers" : {
"Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
"X-FromAppId" : "ONAP CLI",
"Accept" : "application/json",
"USER_ID" : "cs0008",
- "X-TransactionId" : "req-db25d79f-0a66-4a9b-b8af-0d3e2f5c6376",
+ "X-TransactionId" : "req-67a5ecb0-1ae4-4a3e-a78d-f175b2df042b",
"Content-Type" : "application/json"
},
"json" : { }
@@ -15,34 +15,8 @@
"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]"
- } ]
- },
+ "fileNames" : [ "Artifacts/Deployment/Other/id_rsa.pub", "Definitions/MainServiceTemplate.yaml", "Definitions/onap_dm.yaml", "MainServiceTemplate.yaml", "Artifacts/Deployment/Other/id_rsa", "Artifacts/Deployment/Other/image", "Artifacts/Deployment/Other/authorized_keys", "MainServiceTemplate.mf", "TOSCA-Metadata/TOSCA.meta" ],
+ "errors" : { },
"status" : "Success"
}
}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-sample.yaml
index b0509321..32d57a1b 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-dublin-sample.yaml
@@ -1,61 +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: -x
+name: vsp-validate
version: onap-dublin
samples:
sample1:
- name: -x
- input: 0afed170432e471e9dafb662f78a8277 -y a6a78a511fd74524889f8095e12b9aac -u cs0008 -p demo123456! -m http://10.43.107.110:8081
+ name: vsp-validate
+ input: --format json --vsp-version f13d686db7bf4fb0ba34354faf8a9d30 --vsp-id 55ca1625888743a1b791790b126b79f9
moco: vsp-validate-schema-dublin-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]"}]} |
- +----------+----------------------------------------------------+
+ {"errors":{},"status":"Success"}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml
index 41f1fea1..402b6ae8 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml
@@ -18,7 +18,7 @@ description: Validate the uploaded Vendor Software Product
info:
product: onap-dublin
- service: sdc
+ service: sdc.onboarding
author: ONAP CLI Team onap-discuss@lists.onap.org
parameters: