summaryrefslogtreecommitdiffstats
path: root/common-be
diff options
context:
space:
mode:
authorandre.schmid <andre.schmid@est.tech>2020-02-05 12:13:57 +0000
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-06-15 08:06:51 +0000
commit0b3c65c18977212bc74b1f01cefe5ebecc2586f3 (patch)
treedd81f6c5fafb4932868f505db0eddaa9af688b1a /common-be
parente3e2db1d777b89e8292b88f677bcc7d81e6bf2c0 (diff)
Onboard TOSCA data_types defined in package
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 <andre.schmid@est.tech> Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Diffstat (limited to 'common-be')
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/utils/TypeUtils.java8
1 files changed, 5 insertions, 3 deletions
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 <FieldType> void setField(Map<String, Object> toscaJson, ToscaTagNamesEnum tagName, Consumer<FieldType> 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;
}
+
}
}