summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichaelMorris <michael.morris@est.tech>2022-10-20 14:16:56 +0100
committerVasyl Razinkov <vasyl.razinkov@est.tech>2022-10-25 16:05:35 +0000
commitf54fd67ca1ae8dc49e520195adb14bde2f4a0a31 (patch)
tree26ecff19ccb91c2ff58deb19e1c4e9c8df2cbc8d
parent5517cab153e2efce298f1da98fd4b41b483cb57f (diff)
Fix import service with concat function values
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4225 Change-Id: Iefc402c5dd6338e5bb13a3d425363e777fbbec04
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java2
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/utils/TypeUtils.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
index a28d587cae..181c860b9f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
@@ -675,7 +675,7 @@ public final class ImportUtils {
public static boolean containsGetInput(Object propValue) {
String value = getPropertyJsonStringValue(propValue, ToscaPropertyType.MAP.getType());
- return value != null && value.contains(TypeUtils.ToscaTagNamesEnum.GET_INPUT.getElementName());
+ return value != null && value.contains(TypeUtils.ToscaTagNamesEnum.GET_INPUT.getElementName()) && !value.contains(TypeUtils.ToscaTagNamesEnum.CONCAT.getElementName());
}
public static String getPropertyJsonStringValue(Object value, String type) {
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 7602509068..ff5677208a 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
@@ -72,7 +72,7 @@ public class TypeUtils {
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"), CONCAT("concat"),
// Definitions
DATA_TYPES("data_types"), NODE_TYPES("node_types"), POLICY_TYPES("policy_types"), IMPORTS("imports"),
//Operations