[SDC-643] Fix Constraint validation

Change-Id: I02b5b8b4516f0c190d460c067ea40bb6880dc8cf
Signed-off-by: Pavel Aharoni <pa0916@att.com>

diff --git a/pom.xml b/pom.xml
index 8337a3a..3b26cab 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
        <groupId>org.openecomp.sdc.jtosca</groupId>
        <artifactId>jtosca</artifactId>
-       <version>1.1.13-SNAPSHOT</version>
+       <version>1.1.14-SNAPSHOT</version>
         <name>sdc-jtosca</name>
        <properties>
 

diff --git a/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Constraint.java b/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Constraint.java
index 253cc0c..5cf7444 100644 (file)
--- a/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Constraint.java
+++ b/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Constraint.java
@@ -5,6 +5,7 @@ import java.util.LinkedHashMap;
 
 import org.openecomp.sdc.toscaparser.api.common.JToscaValidationIssue;
 import org.openecomp.sdc.toscaparser.api.elements.ScalarUnit;
+import org.openecomp.sdc.toscaparser.api.functions.Function;
 import org.openecomp.sdc.toscaparser.api.utils.ThreadLocalsHolder;
 
 public abstract class Constraint {
@@ -141,6 +142,11 @@ public abstract class Constraint {
        }
 
        public void validate(Object value) {
+               if (Function.isFunction(value)){
+                       //skipping constraints check for functions
+                   return;
+               }
+
                valueMsg = value;
         boolean bFound = false;
         for(String s: ScalarUnit.SCALAR_UNIT_TYPES) {