From 8429c539b48ce851f98e086f5a722c13ebcdc151 Mon Sep 17 00:00:00 2001 From: aribeiro Date: Fri, 3 Apr 2020 12:01:29 +0100 Subject: Fix Tosca properties declaration Remove duplicated entries Default value for Boolean type should not be a String According to the description for the keyname 'attachments:' it should be of type List rather than String Issue-ID: SDC-2870 Signed-off-by: aribeiro Change-Id: Iac2b4f89dac16a6aef9dcabea74def5cacff99a6 --- .../main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml | 4 +--- .../resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml | 2 +- .../resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'catalog-be/src/main/resources/import/tosca') diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml index 7eca3a8409..e0c4206d65 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml @@ -13,8 +13,7 @@ node_types: type: string nf_naming: type: org.openecomp.datatypes.Naming - Default: true - availability_zone_max_count: + availability_zone_max_count: type: integer default: 1 constraints: @@ -26,7 +25,6 @@ node_types: multi_stage_design: type: boolean default: false - type: string sdnc_model_name: type: string sdnc_model_version: diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml index ba8ee3c8f6..472db54b63 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml @@ -113,7 +113,7 @@ node_types: status: supported attachments: description: The list of attachments of the volume - type: string + type: list status: supported entry_schema: type: string diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml index 51a8ce539e..12f9372e4f 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml @@ -90,7 +90,7 @@ node_types: type: boolean description: Identifies whether all the local networks associate with the tunnel or not. required: false - default: 'false' + default: false site2_id: type: string description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller. @@ -132,7 +132,7 @@ node_types: type: boolean description: Identifies whether all the local networks associate with the tunnel or not. required: false - default: 'false' + default: false requirements: - virtualLink: capability: tosca.capabilities.network.Linkable -- cgit 1.2.3-korg