From 0b3c65c18977212bc74b1f01cefe5ebecc2586f3 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Wed, 5 Feb 2020 12:13:57 +0000 Subject: Onboard TOSCA data_types defined in package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Onboard TOSCA data_types defined in a CSAR package that does not exists in the SDC default data_types library. Those data_types were being lost. All data_types declared in the package will be included in the "GlobalSubstitutionServiceTemplate". This includes the data_types declared in the main topology template and in its imported definition files. Defines a maven profile to compile the catalog-be in the main SDC pom. Change-Id: I39445b0f42e924dc1015945b7e605e804c1d505b Issue-ID: SDC-2763 Signed-off-by: André Schmid Signed-off-by: Vasyl Razinkov --- common-be/src/main/java/org/openecomp/sdc/be/utils/TypeUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'common-be') diff --git a/common-be/src/main/java/org/openecomp/sdc/be/utils/TypeUtils.java b/common-be/src/main/java/org/openecomp/sdc/be/utils/TypeUtils.java index f58c8fa4d9..00e8a9ab09 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/utils/TypeUtils.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/utils/TypeUtils.java @@ -24,7 +24,6 @@ import java.util.function.Consumer; public class TypeUtils { - private static final String FIRST_CERTIFIED_VERSION_VERSION = "1.0"; public static void setField(Map toscaJson, ToscaTagNamesEnum tagName, Consumer setter) { @@ -57,13 +56,15 @@ public class TypeUtils { // Heat env Validation PARAMETERS("parameters"), // Import Validations - TOSCA_VERSION("tosca_definitions_version"), TOPOLOGY_TEMPLATE("topology_template"), NODE_TYPES("node_types"), OCCURRENCES("occurrences"), NODE_TEMPLATES("node_templates"), GROUPS("groups"), INPUTS("inputs"), + TOSCA_VERSION("tosca_definitions_version"), TOPOLOGY_TEMPLATE("topology_template"), OCCURRENCES("occurrences"), NODE_TEMPLATES("node_templates"), GROUPS("groups"), INPUTS("inputs"), SUBSTITUTION_MAPPINGS("substitution_mappings"), NODE_TYPE("node_type"), DIRECTIVES("directives"), // Attributes ATTRIBUTES("attributes"), LABEL("label"), HIDDEN("hidden"), IMMUTABLE("immutable"), ANNOTATIONS("annotations"), VERSION("version"), OPERATIONS("operations"), NOTIFICATIONS("notifications"), //functions - GET_INPUT("get_input"); + GET_INPUT("get_input"), + // Definitions + DATA_TYPES("data_types"), NODE_TYPES("node_types"), IMPORTS("imports"); private final String elementName; @@ -74,5 +75,6 @@ public class TypeUtils { public String getElementName() { return elementName; } + } } -- cgit 1.2.3-korg