1 files changed, 13 insertions, 11 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java
index a25a332b9e..6c820a1af2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java
@@ -371,17 +371,19 @@ public class PropertyValueConstraintValidationUtil {
                 final PropertyDefinition propertyCopyWithNewValue = copyPropertyWithNewValue(propertyDefinition,
                     objectMapper.writeValueAsString(value),mapKey);
                 propertyCopyWithNewValue.setToscaSubPath(mapKey);
-                if (ToscaType.isPrimitiveType(schemaType)) {
-                    evaluateCollectionPrimitiveSchemaType(propertyCopyWithNewValue, schemaType);
-                } else if (ToscaType.isCollectionType(schemaType)) {
-                    propertyCopyWithNewValue.setType(schemaType);
-                    propertyCopyWithNewValue.setSchemaType(propertyDefinition.getSchemaProperty().getSchemaType());
-                    evaluateCollectionTypeProperties(propertyCopyWithNewValue);
-                } else {
-                    propertyCopyWithNewValue.setType(schemaType);
-                    completePropertyName.append(UNDERSCORE);
-                    completePropertyName.append(propertyCopyWithNewValue.getName());
-                    evaluateComplexTypeProperties(propertyCopyWithNewValue);
+                if (isPropertyNotMappedAsInput(propertyCopyWithNewValue)) {
+                    if (ToscaType.isPrimitiveType(schemaType)) {
+                        evaluateCollectionPrimitiveSchemaType(propertyCopyWithNewValue, schemaType);
+                    } else if (ToscaType.isCollectionType(schemaType)) {
+                        propertyCopyWithNewValue.setType(schemaType);
+                        propertyCopyWithNewValue.setSchemaType(propertyDefinition.getSchemaProperty().getSchemaType());
+                        evaluateCollectionTypeProperties(propertyCopyWithNewValue);
+                    } else {
+                        propertyCopyWithNewValue.setType(schemaType);
+                        completePropertyName.append(UNDERSCORE);
+                        completePropertyName.append(propertyCopyWithNewValue.getName());
+                        evaluateComplexTypeProperties(propertyCopyWithNewValue);
+                    }
                 }
             } catch (final Exception e) {
                 logger.debug(e.getMessage(), e);