Service Import - Node Template Node Filter

Issue-ID: SDC-4049
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: If0de045f88db44d14936e6fcc55ad623fb235174

2 files changed, 11 insertions, 2 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogic.java
index e60ced5cc7..65b5794687 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogic.java
@@ -358,9 +358,17 @@ public class ComponentNodeFilterBusinessLogic extends BaseBusinessLogic {
             List<RequirementNodeFilterPropertyDataDefinition> properties = ciNodeFilterDataDefinition.getProperties()
                 .getListToscaDataDefinition();
             if (!properties.isEmpty()) {
+                final Component component;
+                try {
+                    component = getComponent(componentId);
+                } catch (BusinessLogicException e) {
+                    throw new ComponentException(e.getResponseFormat());
+                }
                 properties.forEach(property -> {
+                    String propertyType = getComponentInstancePropertyType(component, componentInstanceId, property.getName());
                     RequirementNodeFilterPropertyDataDefinition requirementNodeFilterPropertyDataDefinition =
                         getRequirementNodeFilterPropertyDataDefinition(property);
+                    requirementNodeFilterPropertyDataDefinition.setType(propertyType);
                     Either<CINodeFilterDataDefinition, StorageOperationStatus> nodeFilterProperty = nodeFilterOperation
                         .addNewProperty(componentId, componentInstanceId, nodeFilter.left().value(), requirementNodeFilterPropertyDataDefinition);
                     if (nodeFilterProperty.isRight()) {
@@ -396,8 +404,7 @@ public class ComponentNodeFilterBusinessLogic extends BaseBusinessLogic {
 
     private List<String> getNodeFilterConstraints(String name, List<String> value) {
         List<String> constraints = new ArrayList<>();
-        String values = value.get(0).split("\n")[0];
-        constraints.add(name + ": {" + values + "}");
+        constraints.add(name + ":\n " + value.get(0));
         return constraints;
     }
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogicTest.java
index 3b717fb51d..aae88ab153 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogicTest.java
@@ -570,6 +570,7 @@ public class ComponentNodeFilterBusinessLogicTest extends BaseBusinessLogicMock
         nodeFilterMap.put(componentInstanceId, filter);
 
         when(nodeFilterOperation.createNodeFilter(componentId, componentInstanceId)).thenReturn(Either.left(ciNodeFilterDataDefinition));
+        when(toscaOperationFacade.getToscaElement(componentId)).thenReturn(Either.left(resource));
         when(nodeFilterOperation.addNewProperty(anyString(), anyString(), any(CINodeFilterDataDefinition.class),
             any(RequirementNodeFilterPropertyDataDefinition.class))).thenReturn(Either.left(ciNodeFilterDataDefinition));
 
@@ -593,6 +594,7 @@ public class ComponentNodeFilterBusinessLogicTest extends BaseBusinessLogicMock
         nodeFilterMap.put(componentInstanceId, filter);
 
         when(nodeFilterOperation.createNodeFilter(componentId, componentInstanceId)).thenReturn(Either.left(ciNodeFilterDataDefinition));
+        when(toscaOperationFacade.getToscaElement(componentId)).thenReturn(Either.left(resource));
         when(nodeFilterOperation.addNewProperty(anyString(), anyString(), any(CINodeFilterDataDefinition.class),
             any(RequirementNodeFilterPropertyDataDefinition.class))).thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));