From: MichaelMorris <michael.morris@est.tech>
Date: Thu, 20 Oct 2022 13:16:56 +0000 (+0100)
Subject: Fix import service with concat function values
X-Git-Tag: 1.12.0~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f54fd67ca1ae8dc49e520195adb14bde2f4a0a31;p=sdc.git

Fix import service with concat function values

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4225
Change-Id: Iefc402c5dd6338e5bb13a3d425363e777fbbec04
---

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