From 4827d14388d40fdffd95d560ae6500604aff578f Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Thu, 28 Mar 2019 17:50:06 +0530 Subject: Update test cases to fix the TOSCA issues Issue-ID: VNFSDK-352 Change-Id: I058dbe23a02244b90f3e9d58c136960249c7ffdf Signed-off-by: Kanagaraj Manickam k00365106 --- .../sol001/vtp-validate-csar-r02454.yaml | 56 ++++++++++++++++++++++ .../sol001/vtp-validate-csar-r46527.yaml | 11 +---- .../sol004/vtp-validate-csar-r02454.yaml | 56 ---------------------- .../sol004/vtp-validate-csar-r26885.yaml | 2 +- 4 files changed, 58 insertions(+), 67 deletions(-) create mode 100644 csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r02454.yaml delete mode 100644 csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r02454.yaml (limited to 'csarvalidation/src/main/resources/open-cli-schema') diff --git a/csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r02454.yaml b/csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r02454.yaml new file mode 100644 index 0000000..03d395d --- /dev/null +++ b/csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r02454.yaml @@ -0,0 +1,56 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# 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_schema_version: 1.0 + +name: csar-validate-r02454 + +description: | + The VNF MUST support the existence of multiple major/minor versions of the + VNF software and/or sub-components and interfaces that support both forward + and backward compatibility to be transparent to the Service Provider usage. + +info: + product: onap-vtp + version: 1.0 + service: validation + author: ONAP VTP Team onap-discuss@lists.onap.org + +parameters: + - name: csar + description: CSAR file path + long_option: csar + short_option: b + type: binary + is_optional: false + +results: + direction: landscape + attributes: + - name: code + description: Error code + scope: short + type: string + - name: message + description: Error message + scope: short + type: string + - name: file + description: File in which error occured + scope: short + type: string + - name: line-no + description: Line no at which error occured + scope: short + type: string diff --git a/csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r46527.yaml b/csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r46527.yaml index 176fd5f..a23cacd 100644 --- a/csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r46527.yaml +++ b/csarvalidation/src/main/resources/open-cli-schema/sol001/vtp-validate-csar-r46527.yaml @@ -14,21 +14,12 @@ open_cli_schema_version: 1.0 -name: csar-validate-r17852 +name: csar-validate-r46527 description: | A VNFD is a deployment template which describes a VNF in terms of deployment and operational behavior requirements. It contains virtualized resources (nodes) requirements as well as connectivity and interfaces requirements and MUST comply with info elements specified in ETSI GS NFV-IFA 011. - The main parts of the VNFD are the following: - VNF topology: it is modeled in a cloud agnostic way using virtualized containers and their connectivity. - Virtual Deployment Units (VDU) describe the capabilities of the virtualized containers, such as virtual - CPU, RAM, disks; their connectivity is modeled with VDU Connection Point Descriptors (VduCpd), - Virtual Link Descriptors (VnfVld) and VNF External Connection Point Descriptors (VnfExternalCpd); - VNF deployment aspects: they are described in one or more deployment flavours, including configurable - parameters, instantiation levels, placement constraints (affinity / antiaffinity), minimum and maximum - VDU instance numbers. Horizontal scaling is modeled with scaling aspects and the respective scaling levels - in the deployment flavours; info: product: onap-vtp diff --git a/csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r02454.yaml b/csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r02454.yaml deleted file mode 100644 index 03d395d..0000000 --- a/csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r02454.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2018 Huawei Technologies Co., Ltd. -# -# 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_schema_version: 1.0 - -name: csar-validate-r02454 - -description: | - The VNF MUST support the existence of multiple major/minor versions of the - VNF software and/or sub-components and interfaces that support both forward - and backward compatibility to be transparent to the Service Provider usage. - -info: - product: onap-vtp - version: 1.0 - service: validation - author: ONAP VTP Team onap-discuss@lists.onap.org - -parameters: - - name: csar - description: CSAR file path - long_option: csar - short_option: b - type: binary - is_optional: false - -results: - direction: landscape - attributes: - - name: code - description: Error code - scope: short - type: string - - name: message - description: Error message - scope: short - type: string - - name: file - description: File in which error occured - scope: short - type: string - - name: line-no - description: Line no at which error occured - scope: short - type: string diff --git a/csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r26885.yaml b/csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r26885.yaml index 5209792..71dc113 100644 --- a/csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r26885.yaml +++ b/csarvalidation/src/main/resources/open-cli-schema/sol004/vtp-validate-csar-r26885.yaml @@ -14,7 +14,7 @@ open_cli_schema_version: 1.0 -name: csar-validate-r10087 +name: csar-validate-r26885 description: | The VNF provider MUST provide the binaries and images needed to instantiate the VNF (VNF and VNFC images) either as: -- cgit 1.2.3-korg