Support INDEX in node filter tosca functions

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / validation / NodeFilterValidator.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java
index 30fe3dc..a0716fe 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java
@@ -415,6 +415,22 @@ public class NodeFilterValidator {
                 }
                 return null;
             }
+            else {
+                if (null != ((PropertyDefinition) sourcePropDefinition).getSchemaProperty()){
+                    if (((PropertyDefinition) sourcePropDefinition).getSchemaProperty().getType().equals(targetType)) {
+                        if (TYPES_WITH_SCHEMA.contains(((PropertyDefinition) sourcePropDefinition).getSchemaProperty().getType())) {
+                            final String sourceSchemaType = sourcePropDefinition.getSchemaType();
+                            final String targetSchemaType = targetPropDefinition.getSchemaType();
+                            if (sourceSchemaType != null && !sourceSchemaType.equals(targetSchemaType)) {
+                                return componentsUtils.getResponseFormat(ActionStatus.SOURCE_TARGET_SCHEMA_MISMATCH,
+                                    targetPropDefinition.getName(), targetSchemaType, sourcePropDefinition.getName(),
+                                    sourceSchemaType);
+                            }
+                        }
+                        return null;
+                    }
+                }
+            }
         }
         else {
             if (sourceType.equalsIgnoreCase("integer")) {