Fix for scalar-unit type value.

Issue-ID: SDC-323 Change-Id: I7f19a7356e1cd34deca0a168b3cb707ef657b9cb Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
author: aribeiro <anderson.ribeiro@est.tech> 2019-10-01 16:47:26 +0100
committer: Ofir Sonsino <ofir.sonsino@intl.att.com> 2019-11-19 07:48:02 +0000
commit: 35b5687d60558bac72c1e53ddd9044584964a3d8 (patch)
tree: dc2e184f2cef02c6d1aee0b5baf1585d2b7b3ffe
parent: 0f9257b8265404c82ccdfae6aafce940f20a2947 (diff)
85 files changed, 798 insertions, 310 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/heat/HeatParameterType.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/heat/HeatParameterType.java
index f5f4d9ff2d..503cf61e70 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/heat/HeatParameterType.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/heat/HeatParameterType.java
@@ -20,9 +20,23 @@
 
 package org.openecomp.sdc.be.model.heat;
 
-import org.openecomp.sdc.be.model.tosca.converters.*;
-import org.openecomp.sdc.be.model.tosca.validators.*;
-
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.openecomp.sdc.be.model.tosca.converters.HeatBooleanConverter;
+import org.openecomp.sdc.be.model.tosca.converters.HeatCommaDelimitedListConverter;
+import org.openecomp.sdc.be.model.tosca.converters.HeatJsonConverter;
+import org.openecomp.sdc.be.model.tosca.converters.HeatNumberConverter;
+import org.openecomp.sdc.be.model.tosca.converters.HeatStringConverter;
+import org.openecomp.sdc.be.model.tosca.converters.PropertyValueConverter;
+import org.openecomp.sdc.be.model.tosca.validators.HeatBooleanValidator;
+import org.openecomp.sdc.be.model.tosca.validators.HeatCommaDelimitedListValidator;
+import org.openecomp.sdc.be.model.tosca.validators.HeatNumberValidator;
+import org.openecomp.sdc.be.model.tosca.validators.HeatStringValidator;
+import org.openecomp.sdc.be.model.tosca.validators.PropertyTypeValidator;
+
+
+@AllArgsConstructor
+@Getter
 public enum HeatParameterType {
 
     STRING("string", HeatStringValidator.getInstance(), HeatStringConverter.getInstance()),
@@ -40,42 +54,12 @@ public enum HeatParameterType {
     private PropertyTypeValidator validator;
     private PropertyValueConverter converter;
 
-    HeatParameterType(String type, PropertyTypeValidator validator, PropertyValueConverter converter) {
-        this.type = type;
-        this.validator = validator;
-        this.converter = converter;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public PropertyTypeValidator getValidator() {
-        return validator;
-    }
-
-    public void setValidator(PropertyTypeValidator validator) {
-        this.validator = validator;
-    }
-
-    public PropertyValueConverter getConverter() {
-        return converter;
-    }
-
-    public void setConverter(PropertyValueConverter converter) {
-        this.converter = converter;
-    }
-
-    public static HeatParameterType isValidType(String typeName) {
+    public static HeatParameterType isValidType(final String typeName) {
         if (typeName == null) {
             return null;
         }
 
-        for (HeatParameterType type : HeatParameterType.values()) {
+        for (final HeatParameterType type : HeatParameterType.values()) {
             if (type.getType().equals(typeName)) {
                 return type;
             }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverter.java
index 187793ee0b..b2237d0f35 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverter.java
@@ -20,6 +20,7 @@
 
 package org.openecomp.sdc.be.model.tosca.converters;
 
+import org.onap.sdc.tosca.datatypes.model.ScalarUnitValidator;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 
 import java.math.BigDecimal;
@@ -33,17 +34,23 @@ public class HeatNumberConverter implements PropertyValueConverter {
         return numberConverter;
     }
 
+    private final ScalarUnitValidator scalarUnitValidator = ScalarUnitValidator.getInstance();
+
+
     private HeatNumberConverter() {
 
     }
 
     @Override
     public String convert(String original, String innerType, Map<String, DataTypeDefinition> dataTypes) {
-
         if (original == null || original.isEmpty()) {
             return null;
         }
 
+        if (scalarUnitValidator.isScalarUnit(original)) {
+            return original;
+        }
+
         return new BigDecimal(original).toPlainString();
     }
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/HeatNumberValidator.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/HeatNumberValidator.java
index 0ae3f74c85..ec281c0618 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/HeatNumberValidator.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/HeatNumberValidator.java
@@ -20,27 +20,29 @@
 
 package org.openecomp.sdc.be.model.tosca.validators;
 
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-
 import java.util.Map;
+import org.onap.sdc.tosca.datatypes.model.ScalarUnitValidator;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
 
 public class HeatNumberValidator implements PropertyTypeValidator {
 
     private static HeatNumberValidator numberValidator = new HeatNumberValidator();
 
-    private static FloatValidator floatValidator = FloatValidator.getInstance();
-    private static IntegerValidator integerValidator = IntegerValidator.getInstance();
+    private final FloatValidator floatValidator = FloatValidator.getInstance();
+    private final IntegerValidator integerValidator = IntegerValidator.getInstance();
+    private final ScalarUnitValidator scalarUnitValidator = ScalarUnitValidator.getInstance();
 
     public static HeatNumberValidator getInstance() {
         return numberValidator;
     }
 
     private HeatNumberValidator() {
-
     }
 
     @Override
-    public boolean isValid(String value, String innerType, Map<String, DataTypeDefinition> allDataTypes) {
+    public boolean isValid(final String value,
+                           final String innerType,
+                           final Map<String, DataTypeDefinition> allDataTypes) {
 
         if (value == null || value.isEmpty()) {
             return true;
@@ -51,11 +53,15 @@ public class HeatNumberValidator implements PropertyTypeValidator {
             valid = floatValidator.isValid(value, null, allDataTypes);
         }
 
+        if(!valid) {
+            valid = scalarUnitValidator.isScalarUnit(value);
+        }
+
         return valid;
     }
 
     @Override
-    public boolean isValid(String value, String innerType) {
+    public boolean isValid(final String value, final String innerType) {
         return isValid(value, innerType, null);
     }
 }
diff --git a/common/onap-tosca-datatype/pom.xml b/common/onap-tosca-datatype/pom.xml
index bd46d62518..c99be321f2 100644
--- a/common/onap-tosca-datatype/pom.xml
+++ b/common/onap-tosca-datatype/pom.xml
@@ -76,6 +76,12 @@
 			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>${lang3.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
 			<groupId>com.google.code.bean-matchers</groupId>
 			<artifactId>bean-matchers</artifactId>
 			<version>${bean-matchers.version}</version>
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java
index facdb2a7b1..1b91ca96d2 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java
@@ -15,8 +15,17 @@
  */
 
 package org.onap.sdc.tosca.datatypes.model;
-import java.util.*;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
 public enum PropertyType {
 
   STRING("string"),
@@ -28,27 +37,21 @@ public enum PropertyType {
   MAP("map"),
   LIST("list"),
   SCALAR_UNIT_SIZE("scalar-unit.size"),
+  SCALAR_UNIT_TIME("scalar-unit.time"),
   SCALAR_UNIT_FREQUENCY("scalar-unit.frequency");
 
-  private static final Map<String, PropertyType> M_MAP =
-      Collections.unmodifiableMap(initializeMapping());
-  private static final Set<String> SIMPLE_PROPERTY_TYPES =
-      Collections.unmodifiableSet(initializeSimplePropertyTypes());
+  private static final Map<String, PropertyType> M_MAP = Collections.unmodifiableMap(initializeMapping());
+  private static final Set<String> SIMPLE_PROPERTY_TYPES = Collections.unmodifiableSet(initializeSimplePropertyTypes());
   private String displayName;
 
-  PropertyType(String displayName) {
-
-    this.displayName = displayName;
-  }
-
   /**
    * Initilize property type display name mapping.
    * @return Map
    */
   public static Map<String, PropertyType> initializeMapping() {
-    Map<String, PropertyType> typeMap = new HashMap<>();
-    for (PropertyType v : PropertyType.values()) {
-      typeMap.put(v.displayName, v);
+    final Map<String, PropertyType> typeMap = new HashMap<>();
+    for (final PropertyType propertyType : PropertyType.values()) {
+      typeMap.put(propertyType.displayName, propertyType);
     }
     return typeMap;
   }
@@ -58,7 +61,7 @@ public enum PropertyType {
    * @param displayName
    * @return PropertyType
    */
-  public static PropertyType getPropertyTypeByDisplayName(String displayName) {
+  public static PropertyType getPropertyTypeByDisplayName(final String displayName) {
     if (M_MAP.containsKey(displayName)) {
       return M_MAP.get(displayName);
     }
@@ -66,12 +69,14 @@ public enum PropertyType {
   }
 
   private static Set<String> initializeSimplePropertyTypes() {
-    final int setSize = 4;
-    Set<String> simplePropertyTypes = new HashSet<>(setSize);
+    final Set<String> simplePropertyTypes = new HashSet<>();
     simplePropertyTypes.add(STRING.getDisplayName().toLowerCase());
     simplePropertyTypes.add(INTEGER.getDisplayName().toLowerCase());
     simplePropertyTypes.add(FLOAT.getDisplayName().toLowerCase());
     simplePropertyTypes.add(BOOLEAN.getDisplayName().toLowerCase());
+    simplePropertyTypes.add(SCALAR_UNIT_SIZE.getDisplayName().toLowerCase());
+    simplePropertyTypes.add(SCALAR_UNIT_TIME.getDisplayName().toLowerCase());
+    simplePropertyTypes.add(SCALAR_UNIT_FREQUENCY.getDisplayName().toLowerCase());
     return simplePropertyTypes;
   }
 
@@ -79,8 +84,4 @@ public enum PropertyType {
     return SIMPLE_PROPERTY_TYPES;
   }
 
-  public String getDisplayName() {
-    return displayName;
-  }
-
 }
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ScalarUnitValidator.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ScalarUnitValidator.java
new file mode 100644
index 0000000000..d7e538e0a7
--- /dev/null
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ScalarUnitValidator.java
@@ -0,0 +1,74 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.onap.sdc.tosca.datatypes.model;
+
+import java.util.Arrays;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * This Class is responsible for validating if a given value is a valid Tosca Scalar Unit Type.
+ */
+public class ScalarUnitValidator {
+
+    private static ScalarUnitValidator scalarUnitValidator = new ScalarUnitValidator();
+
+    /**
+     *  Tosca Scalar Unit Types structure.
+     */
+    private final Pattern pattern = Pattern.compile("\\d+\\s*[a-zA-Z]{1,3}");
+
+    private ScalarUnitValidator() {
+    }
+
+    public static ScalarUnitValidator getInstance() {
+        return scalarUnitValidator;
+    }
+
+    /**
+     * Validates if the given String matches with the Tosca Scalar Unit Types structure.
+     *
+     * @param value String to be validated.
+     * @return an {@Boolean}
+     */
+    public boolean isScalarUnit(final String value) {
+        if (value == null || value.isEmpty()) {
+            return true;
+        }
+
+        return pattern.matcher(value).matches();
+    }
+
+    /**
+     * Validates if the given String has a Recognized Tosca unit.
+     *
+     * @param value String to be validated
+     * @param enumClass Enum that represents a Tosca Scalar Unit Type.
+     * @param <E>
+     * @return an Enum that represents the Tosca Scalar Unit Type.
+     */
+    public <E extends Enum<E>> boolean isValueScalarUnit(final Object value, final Class<E> enumClass) {
+        final String stringToValidate = String.valueOf(value);
+        return isScalarUnit(stringToValidate) && Arrays.stream(StringUtils.split(stringToValidate))
+            .anyMatch(strValue -> Arrays.stream(enumClass.getEnumConstants())
+                .anyMatch(scalarUnit ->
+                    scalarUnit.name().equalsIgnoreCase(strValue) || strValue.endsWith(scalarUnit.name())));
+    }
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypes.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypes.java
index 600917201b..4205f0bee3 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypes.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/DefinedHeatParameterTypes.java
@@ -24,10 +24,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang3.ClassUtils;
+import org.onap.sdc.tosca.datatypes.model.ScalarUnitValidator;
 
+@AllArgsConstructor
+@Getter
 public enum DefinedHeatParameterTypes {
     NUMBER("number"),
     STRING("string"),
@@ -35,22 +39,19 @@ public enum DefinedHeatParameterTypes {
     JSON("json"),
     BOOLEAN("boolean");
 
+    private static ScalarUnitValidator scalarUnitValidator = ScalarUnitValidator.getInstance();
     private static Map<String, DefinedHeatParameterTypes> stringToDefinedType;
 
     static {
         stringToDefinedType = new HashMap<>();
-        for (DefinedHeatParameterTypes definedHeatParameterType : DefinedHeatParameterTypes.values()) {
+        for (final DefinedHeatParameterTypes definedHeatParameterType : DefinedHeatParameterTypes.values()) {
             stringToDefinedType.put(definedHeatParameterType.type, definedHeatParameterType);
         }
     }
 
     private String type;
 
-    DefinedHeatParameterTypes(String type) {
-        this.type = type;
-    }
-
-    public static DefinedHeatParameterTypes findByHeatResource(String type) {
+    public static DefinedHeatParameterTypes findByHeatResource(final String type) {
         return stringToDefinedType.get(type);
     }
 
@@ -61,12 +62,17 @@ public enum DefinedHeatParameterTypes {
      * @param parameterType the parameter type
      * @return the boolean
      */
-    public static boolean isValueIsFromGivenType(Object value, String parameterType) {
-        DefinedHeatParameterTypes definedType = findByHeatResource(parameterType);
+    public static boolean isValueIsFromGivenType(final Object value, final String parameterType) {
+        final DefinedHeatParameterTypes definedType = findByHeatResource(parameterType);
 
         if (Objects.nonNull(definedType)) {
             switch (definedType) {
                 case NUMBER:
+                    if (scalarUnitValidator.isValueScalarUnit(value, ToscaScalarUnitSize.class) ||
+                        scalarUnitValidator.isValueScalarUnit(value, ToscaScalarUnitTime.class) ||
+                        scalarUnitValidator.isValueScalarUnit(value, ToscaScalarUnitFrequency.class)) {
+                        return isValueString(value);
+                    }
                     return NumberUtils.isNumber(String.valueOf(value));
 
                 case BOOLEAN:
@@ -87,35 +93,28 @@ public enum DefinedHeatParameterTypes {
         return false;
     }
 
-    public static boolean isNovaServerEnvValueIsFromRightType(Object value) {
+    public static boolean isNovaServerEnvValueIsFromRightType(final Object value) {
         return isValueIsFromGivenType(value, COMMA_DELIMITED_LIST.getType())
                 || isValueIsFromGivenType(value, STRING.getType());
     }
 
-    private static boolean isValueCommaDelimitedList(Object value) {
+    private static boolean isValueCommaDelimitedList(final Object value) {
         return value instanceof List
                 || String.valueOf(value).contains(",")
                 || isValueIsFromGivenType(value, DefinedHeatParameterTypes.STRING.type);
     }
 
-    private static boolean isValueString(Object value) {
+    private static boolean isValueString(final Object value) {
         return value instanceof String
                 || ClassUtils.isPrimitiveOrWrapper(value.getClass());
     }
 
-    private static boolean isValueJson(Object value) {
+    private static boolean isValueJson(final Object value) {
         return (value instanceof Map) || (value instanceof List);
     }
 
-    public static boolean isEmptyValueInEnv(Object value) {
+    public static boolean isEmptyValueInEnv(final Object value) {
         return Objects.isNull(value);
     }
 
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
 }
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitFrequency.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitFrequency.java
new file mode 100644
index 0000000000..8ec246555a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitFrequency.java
@@ -0,0 +1,29 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.heat.datatypes;
+
+/**
+ * This enum is responsible for defining properties that have scalar values measured in units per second.
+ */
+public enum ToscaScalarUnitFrequency {
+
+    HZ, KHZ, MHZ, GHZ
+
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitSize.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitSize.java
new file mode 100644
index 0000000000..12f6a176a3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitSize.java
@@ -0,0 +1,29 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.heat.datatypes;
+
+/**
+ * This enum is responsible for defining properties that have scalar values measured in size units.
+ */
+public enum ToscaScalarUnitSize {
+
+    B, KB, KIB, MB, MIB, GB, GIB, TB, TIB
+
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitTime.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitTime.java
new file mode 100644
index 0000000000..0a41a63ed1
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitTime.java
@@ -0,0 +1,30 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.heat.datatypes;
+
+
+/**
+ * This enum is responsible for defining properties that have scalar values measured in size units.
+ */
+public enum ToscaScalarUnitTime {
+
+    D, H, M, S, MS, US, NS
+
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitTypes.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitTypes.java
new file mode 100644
index 0000000000..05cc97c8dc
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/ToscaScalarUnitTypes.java
@@ -0,0 +1,37 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.heat.datatypes;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * This enum is responsible for defining all Tosca Scalar Unit types Supported.
+ */
+@Getter
+@AllArgsConstructor
+public enum ToscaScalarUnitTypes {
+
+    SCALAR_UNIT_SIZE("scalar-unit.size"),
+    SCALAR_UNIT_TIME("scalar-unit.time"),
+    SCALAR_UNIT_FREQUENCY("scalar-unit.frequency");
+
+    private String type;
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ToscaScalarUnitTypesTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ToscaScalarUnitTypesTest.java
new file mode 100644
index 0000000000..0b83e9b32b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ToscaScalarUnitTypesTest.java
@@ -0,0 +1,98 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.heat.datatypes.model;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.sdc.tosca.datatypes.model.ScalarUnitValidator;
+import org.openecomp.sdc.heat.datatypes.DefinedHeatParameterTypes;
+import org.openecomp.sdc.heat.datatypes.ToscaScalarUnitFrequency;
+import org.openecomp.sdc.heat.datatypes.ToscaScalarUnitSize;
+import org.openecomp.sdc.heat.datatypes.ToscaScalarUnitTime;
+
+public class ToscaScalarUnitTypesTest {
+
+    private String inputValue;
+    private static ScalarUnitValidator scalarUnitValidator = ScalarUnitValidator.getInstance();
+
+    @Test
+    public void shouldReturnTrueForScalarUnitSize() {
+        inputValue = "100 " + ToscaScalarUnitSize.GB.name();
+        Assert.assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(inputValue,
+            DefinedHeatParameterTypes.NUMBER.getType()));
+
+        Assert.assertTrue(scalarUnitValidator.isValueScalarUnit(inputValue, ToscaScalarUnitSize.class));
+    }
+
+    @Test
+    public void shouldReturnTrueForScalarUnitSizeWithSpace() {
+        inputValue = "10              " + ToscaScalarUnitSize.GB.name();
+        Assert.assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(inputValue,
+            DefinedHeatParameterTypes.NUMBER.getType()));
+
+        Assert.assertTrue(scalarUnitValidator.isValueScalarUnit(inputValue, ToscaScalarUnitSize.class));
+    }
+
+    @Test
+    public void shouldReturnTrueForScalarUnitSizeWithoutSpace() {
+        inputValue = "200" + ToscaScalarUnitSize.GB.name();
+        Assert.assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(inputValue,
+            DefinedHeatParameterTypes.NUMBER.getType()));
+
+        Assert.assertTrue(scalarUnitValidator.isValueScalarUnit(inputValue, ToscaScalarUnitSize.class));
+    }
+
+    @Test
+    public void shouldReturnTrueForScalarUnitTime() {
+        inputValue = "5000 " + ToscaScalarUnitTime.S.name();
+        Assert.assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(
+            inputValue, DefinedHeatParameterTypes.NUMBER.getType()));
+
+        Assert.assertTrue(scalarUnitValidator.isValueScalarUnit(inputValue, ToscaScalarUnitTime.class));
+    }
+
+    @Test
+    public void shouldReturnTrueForScalarUnitFrequency() {
+        inputValue = "60 " + ToscaScalarUnitFrequency.GHZ.name();
+        Assert.assertTrue(DefinedHeatParameterTypes.isValueIsFromGivenType(
+            inputValue, DefinedHeatParameterTypes.NUMBER.getType()));
+
+        Assert.assertTrue(scalarUnitValidator.isValueScalarUnit(inputValue, ToscaScalarUnitFrequency.class));
+    }
+
+    @Test
+    public void shouldReturnFalse() {
+        inputValue = "one hundred " + ToscaScalarUnitSize.GB.name();
+        Assert.assertFalse(DefinedHeatParameterTypes.isValueIsFromGivenType(
+            inputValue, DefinedHeatParameterTypes.NUMBER.getType()));
+
+        Assert.assertFalse(scalarUnitValidator.isValueScalarUnit(inputValue, ToscaScalarUnitSize.class));
+    }
+
+    @Test
+    public void shouldReturnFalseForMatcher() {
+        inputValue = "100 abc";
+        Assert.assertFalse(DefinedHeatParameterTypes.isValueIsFromGivenType(
+            inputValue, DefinedHeatParameterTypes.NUMBER.getType()));
+
+        Assert.assertFalse(scalarUnitValidator.isValueScalarUnit(inputValue, ToscaScalarUnitSize.class));
+    }
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
index 866f78c1b5..339d6ff023 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
@@ -232,12 +232,12 @@ public class TranslationService {
             return;
         }
 
+        final Environment heatEnvFile = getHeatEnvFile(heatFileData, context);
+        final Map<String, Object> parameters = heatEnvFile.getParameters();
         Map<String, ParameterDefinition> parameterDefinitionMap =
                 TranslatorHeatToToscaParameterConverter
                         .parameterConverter(serviceTemplate, heatOrchestrationTemplate.getParameters(),
-                                heatOrchestrationTemplate, heatFileName, heatFileData.getParentFile(), context);
-        Environment heatEnvFile = getHeatEnvFile(heatFileData, context);
-        Map<String, Object> parameters = heatEnvFile.getParameters();
+                                heatOrchestrationTemplate, heatFileName, heatFileData.getParentFile(), context, parameters);
         Object parameterValue;
         if (parameters != null) {
             for (Map.Entry<String, ParameterDefinition> entry : parameterDefinitionMap.entrySet()) {
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java
index 84d36f7bb3..a69c26c04f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java
@@ -16,6 +16,7 @@
 
 package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation;
 
+import java.util.Map;
 import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
 import org.openecomp.sdc.heat.datatypes.HeatBoolean;
 import org.openecomp.sdc.heat.services.HeatConstants;
@@ -25,16 +26,14 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo;
 import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil;
 import org.openecomp.sdc.translator.services.heattotosca.mapping.TranslatorHeatToToscaPropertyConverter;
 
-import java.util.Map;
-
 
 public class ResourceTranslationCinderVolumeImpl extends ResourceTranslationBase {
 
     private static final String VOLUME_SIZE_PROPERTY_NAME = "size";
 
     @Override
-    public void translate(TranslateTo translateTo) {
-        NodeTemplate nodeTemplate = new NodeTemplate();
+    public void translate(final TranslateTo translateTo) {
+        final NodeTemplate nodeTemplate = new NodeTemplate();
         nodeTemplate.setType(ToscaNodeType.CINDER_VOLUME);
         nodeTemplate.setProperties(TranslatorHeatToToscaPropertyConverter
                 .getToscaPropertiesSimpleConversion(translateTo.getServiceTemplate(),
@@ -43,9 +42,9 @@ public class ResourceTranslationCinderVolumeImpl extends ResourceTranslationBase
                         translateTo.getHeatOrchestrationTemplate(), translateTo.getResource().getType(),
                         nodeTemplate, translateTo.getContext()));
         handleSizeProperty(nodeTemplate.getProperties());
-        String toscaReadOnlyPropName =
+        final String toscaReadOnlyPropName =
                 HeatToToscaUtil.getToscaPropertyName(translateTo, HeatConstants.READ_ONLY_PROPERTY_NAME);
-        Object readOnlyPropVal = nodeTemplate.getProperties().get(toscaReadOnlyPropName);
+        final Object readOnlyPropVal = nodeTemplate.getProperties().get(toscaReadOnlyPropName);
         if (readOnlyPropVal != null && !(readOnlyPropVal instanceof Map)) {
             nodeTemplate.getProperties().put(toscaReadOnlyPropName, HeatBoolean.eval(readOnlyPropVal));
         }
@@ -54,18 +53,11 @@ public class ResourceTranslationCinderVolumeImpl extends ResourceTranslationBase
     }
 
 
-    private void handleSizeProperty(Map<String, Object> nodeTemplateProperties) {
-        Object size = nodeTemplateProperties.get(VOLUME_SIZE_PROPERTY_NAME);
+    private void handleSizeProperty(final Map<String, Object> nodeTemplateProperties) {
+        final Object size = nodeTemplateProperties.get(VOLUME_SIZE_PROPERTY_NAME);
         if (size == null) {
             return;
         }
-        if (size instanceof Map) {
-            Map<String, Object> propMap = (Map) size;
-            Map.Entry<String, Object> entry = propMap.entrySet().iterator().next();
-            String val = "(" + entry.getKey() + " : " + entry.getValue() + ") * 1024";
-            nodeTemplateProperties.put(VOLUME_SIZE_PROPERTY_NAME, val);
-        } else {
-            nodeTemplateProperties.put(VOLUME_SIZE_PROPERTY_NAME, size + "*1024");
-        }
+        nodeTemplateProperties.put(VOLUME_SIZE_PROPERTY_NAME, size);
     }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
index d4dc1ac80f..386b2e1ea9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
@@ -23,14 +23,23 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
-
 import org.apache.commons.collections4.MapUtils;
-import org.onap.sdc.tosca.datatypes.model.*;
+import org.apache.commons.lang3.StringUtils;
+import org.onap.sdc.tosca.datatypes.model.Constraint;
+import org.onap.sdc.tosca.datatypes.model.EntrySchema;
+import org.onap.sdc.tosca.datatypes.model.ParameterDefinition;
+import org.onap.sdc.tosca.datatypes.model.ScalarUnitValidator;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.onap.sdc.tosca.datatypes.model.heatextend.AnnotationDefinition;
 import org.onap.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt;
 import org.openecomp.core.utilities.file.FileUtils;
-
+import org.openecomp.sdc.heat.datatypes.DefinedHeatParameterTypes;
+import org.openecomp.sdc.heat.datatypes.ToscaScalarUnitFrequency;
+import org.openecomp.sdc.heat.datatypes.ToscaScalarUnitSize;
+import org.openecomp.sdc.heat.datatypes.ToscaScalarUnitTime;
+import org.openecomp.sdc.heat.datatypes.ToscaScalarUnitTypes;
 import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
 import org.openecomp.sdc.heat.datatypes.model.Output;
 import org.openecomp.sdc.heat.datatypes.model.Parameter;
@@ -78,15 +87,17 @@ public class TranslatorHeatToToscaParameterConverter {
    * @return the map
    */
   public static Map<String, ParameterDefinition> parameterConverter(ServiceTemplate serviceTemplate,
-      Map<String, Parameter> parameters, HeatOrchestrationTemplate heatOrchestrationTemplate,
-      String heatFileName, String parentHeatFileName, TranslationContext context) {
+                                                                    Map<String, Parameter> parameters,
+                                                                    HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                                                    String heatFileName, String parentHeatFileName,
+                                                                    TranslationContext context,
+                                                                    Map<String, Object> heatEnvParameters) {
     Map<String, ParameterDefinition> parameterDefinitionMap = new HashMap<>();
     for (Map.Entry<String, Parameter> entry : parameters.entrySet()) {
       String heatParamName = entry.getKey();
       parameterDefinitionMap.put(heatParamName,
-          getToscaParameter(serviceTemplate,heatParamName, entry.getValue(),
-              heatOrchestrationTemplate,
-              heatFileName, parentHeatFileName, context));
+          getToscaParameter(serviceTemplate,heatParamName, entry.getValue(), heatOrchestrationTemplate, heatFileName,
+              parentHeatFileName, context, heatEnvParameters));
     }
     return parameterDefinitionMap;
   }
@@ -100,9 +111,9 @@ public class TranslatorHeatToToscaParameterConverter {
    * @param context                   the context
    * @return the map
    */
-  public static Map<String, ParameterDefinition> parameterOutputConverter(ServiceTemplate
-                                                                              serviceTemplate,
-      Map<String, Output> parameters, HeatOrchestrationTemplate heatOrchestrationTemplate,
+  public static Map<String, ParameterDefinition> parameterOutputConverter(ServiceTemplate serviceTemplate,
+                                                                          Map<String, Output> parameters,
+                                                                          HeatOrchestrationTemplate heatOrchestrationTemplate,
       String heatFileName, TranslationContext context) {
     Map<String, ParameterDefinition> parameterDefinitionMap = new HashMap<>();
     for (Map.Entry<String, Output> entry : parameters.entrySet()) {
@@ -125,16 +136,16 @@ public class TranslatorHeatToToscaParameterConverter {
    * @return the tosca parameter
    */
   private static ParameterDefinitionExt getToscaParameter(ServiceTemplate serviceTemplate,
-                                                         String heatParameterName,
-                                                         Parameter heatParameter,
-                                                         HeatOrchestrationTemplate
-                                                             heatOrchestrationTemplate,
-                                                         String heatFileName,
-                                                         String parentHeatFileName,
-                                                         TranslationContext context) {
+                                                          String heatParameterName,
+                                                          Parameter heatParameter,
+                                                          HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                                          String heatFileName,
+                                                          String parentHeatFileName,
+                                                          TranslationContext context,
+                                                          Map<String, Object> heatEnvParameters) {
 
     ParameterDefinitionExt toscaParameter = new ParameterDefinitionExt();
-    toscaParameter.setType(getToscaParameterType(heatParameter.getType()));
+    toscaParameter.setType(getToscaParameterType(heatParameter.getType(), heatEnvParameters));
     toscaParameter.setEntry_schema(getToscaParameterEntrySchema(toscaParameter.getType()));
     toscaParameter.setLabel(heatParameter.getLabel());
     toscaParameter.setDescription(heatParameter.getDescription());
@@ -330,7 +341,32 @@ public class TranslatorHeatToToscaParameterConverter {
     return entrySchema;
   }
 
-  protected static String getToscaParameterType(String heatParameterType) {
+  protected static String getToscaParameterType(final String heatParameterType,
+                                                final Map<String, Object> heatEnvParameters) {
+    if (heatEnvParameters != null && DefinedHeatParameterTypes.NUMBER.getType().equals(heatParameterType)) {
+      if (getScalarUnitType(heatEnvParameters, ToscaScalarUnitSize.class) != null) {
+        return ToscaScalarUnitTypes.SCALAR_UNIT_SIZE.getType();
+      } else if (getScalarUnitType(heatEnvParameters, ToscaScalarUnitTime.class) != null) {
+        return ToscaScalarUnitTypes.SCALAR_UNIT_TIME.getType();
+      } else if (getScalarUnitType(heatEnvParameters, ToscaScalarUnitFrequency.class) != null) {
+        return ToscaScalarUnitTypes.SCALAR_UNIT_FREQUENCY.getType();
+      }
+    }
+
     return parameterTypeMapping.get(heatParameterType);
   }
+
+  private static <E extends Enum<E>> String getScalarUnitType(final Map<String, Object> heatEnvParameters,
+                                                              final Class<E> enumClass) {
+    final ScalarUnitValidator scalarUnitValidator = ScalarUnitValidator.getInstance();
+    if (Arrays.stream(enumClass.getEnumConstants()).anyMatch(unitType ->
+            heatEnvParameters.values().stream().filter(Objects::nonNull)
+                .anyMatch(parameterValue -> scalarUnitValidator.isScalarUnit(parameterValue.toString()) &&
+                    Arrays.stream(StringUtils.split(parameterValue.toString()))
+                        .anyMatch(strParamValue -> strParamValue.equalsIgnoreCase(unitType.name()))))) {
+      return enumClass.getTypeName();
+    }
+    return null;
+  }
+
 }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
index 793a9e4291..e5439361d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
@@ -128,7 +128,7 @@ topology_template:
             - availability_zone_0
         image:
           get_input: bootimage
-        size: 35*1024
+        size: 35
         name:
           str_replace:
             template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-boot-volume
@@ -192,7 +192,7 @@ topology_template:
           - get_input: indx
           - get_input:
             - availability_zone_0
-        size: 265*1024
+        size: 265
         name:
           str_replace:
             template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-data-volume
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/MainServiceTemplate.yaml
index aadea7bb86..32a260bbcc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/MainServiceTemplate.yaml
@@ -328,9 +328,9 @@ topology_template:
             - ocgapp_04
             source_type: HEAT
             param_name: ocgapp_volume_size_3
-      type: float
+      type: scalar-unit.size
       description: the size of the Cinder volume
-      default: 400
+      default: 400 MB
       constraints:
       - in_range:
         - 100
@@ -388,9 +388,9 @@ topology_template:
             - ocgapp_03
             source_type: HEAT
             param_name: ocgapp_volume_size_2
-      type: float
+      type: scalar-unit.size
       description: the size of the Cinder volume
-      default: 400
+      default: 400 MB
       constraints:
       - in_range:
         - 100
@@ -407,9 +407,9 @@ topology_template:
             - ocgapp_02
             source_type: HEAT
             param_name: ocgapp_volume_size_1
-      type: float
+      type: scalar-unit.size
       description: the size of the Cinder volume
-      default: 400
+      default: 400 MB
       constraints:
       - in_range:
         - 100
@@ -426,9 +426,9 @@ topology_template:
             - ocgapp_01
             source_type: HEAT
             param_name: ocgapp_volume_size_0
-      type: float
+      type: scalar-unit.size
       description: the size of the Cinder volume
-      default: 400
+      default: 400 MB
       constraints:
       - in_range:
         - 100
@@ -1784,7 +1784,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ocgapp_volume_type_1
-        size: '(get_input : ocgapp_volume_size_1) * 1024'
+        size:
+          get_input: ocgapp_volume_size_1
         name:
           str_replace:
             template: VF_NAME_STACK_NAME_volume_1
@@ -1798,7 +1799,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ocgapp_volume_type_0
-        size: '(get_input : ocgapp_volume_size_0) * 1024'
+        size:
+          get_input: ocgapp_volume_size_0
         name:
           str_replace:
             template: VF_NAME_STACK_NAME_volume_1
@@ -1812,7 +1814,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ocgapp_volume_type_3
-        size: '(get_input : ocgapp_volume_size_3) * 1024'
+        size:
+          get_input: ocgapp_volume_size_3
         name:
           str_replace:
             template: VF_NAME_STACK_NAME_volume_3
@@ -1857,7 +1860,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ocgapp_volume_type_2
-        size: '(get_input : ocgapp_volume_size_2) * 1024'
+        size:
+          get_input: ocgapp_volume_size_2
         name:
           str_replace:
             template: VF_NAME_STACK_NAME_volume_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/ocgmgr_nested_volumeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/ocgmgr_nested_volumeServiceTemplate.yaml
index 0de9369c69..eab88df900 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/ocgmgr_nested_volumeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/expectedoutputfiles/ocgmgr_nested_volumeServiceTemplate.yaml
@@ -50,7 +50,8 @@ topology_template:
       properties:
         volume_type:
           get_input: volume_type
-        size: '(get_input : size) * 1024'
+        size:
+          get_input: size
         name:
           str_replace:
             template: VF_NAME_STACK_NAME_INDEX
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_01_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_01_volume.env
index 369444f6f8..9ff9ce82e3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_01_volume.env
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_01_volume.env
@@ -1,5 +1,5 @@
 #file version 1.0
 parameters:
   vnf_name: 'zrdm5avocg01'
-  ocgapp_volume_size_0: 400
+  ocgapp_volume_size_0: 400 MB
   ocgapp_volume_type_0: SF-Default-SSD
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_02_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_02_volume.env
index 37b385fd76..519a6196fc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_02_volume.env
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_02_volume.env
@@ -1,5 +1,5 @@
 #file version 1.0
 parameters:
   vnf_name: 'zrdm5avocg01'
-  ocgapp_volume_size_1: 400
+  ocgapp_volume_size_1: 400 MB
   ocgapp_volume_type_1: SF-Default-SSD
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_03_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_03_volume.env
index 35f142884b..d6748066b7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_03_volume.env
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_03_volume.env
@@ -1,5 +1,5 @@
 #file version 1.0
 parameters:
   vnf_name: 'zrdm5avocg01'
-  ocgapp_volume_size_2: 400
+  ocgapp_volume_size_2: 400 MB
   ocgapp_volume_type_2: SF-Default-SSD
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_04_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_04_volume.env
index 983d5d2e33..f88bfa722d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_04_volume.env
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedundervolume/inputs/ocgapp_04_volume.env
@@ -1,5 +1,5 @@
 #file version 1.0
 parameters:
   vnf_name: 'zrdm5avocg01'
-  ocgapp_volume_size_3: 400
+  ocgapp_volume_size_3: 400 MB
   ocgapp_volume_type_3: SF-Default-SSD
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
index 793a9e4291..e5439361d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
@@ -128,7 +128,7 @@ topology_template:
             - availability_zone_0
         image:
           get_input: bootimage
-        size: 35*1024
+        size: 35
         name:
           str_replace:
             template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-boot-volume
@@ -192,7 +192,7 @@ topology_template:
           - get_input: indx
           - get_input:
             - availability_zone_0
-        size: 265*1024
+        size: 265
         name:
           str_replace:
             template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-data-volume
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml
index ae852574f3..a97dff5452 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -141,7 +141,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml
index cbf9ff1951..b835f18b32 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml
@@ -287,7 +287,7 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: 3*1024
+        size: 3
         name:
           get_input: FSB1_volume_name
   groups:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml
index 27582261d8..5fb69e7961 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml
@@ -1183,7 +1183,7 @@ topology_template:
             - vmme_small
             source_type: HEAT
             param_name: volume_size
-      type: string
+      type: float
       description: volume
     fsb2-image:
       hidden: false
@@ -1612,7 +1612,7 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: 3*1024
+        size: 3
         name:
           get_input: FSB1_volume_name
     testConvertGetParamFunctions:
@@ -1637,7 +1637,8 @@ topology_template:
           get_input: FSB_2_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         name:
           get_input: FSB2_volume_name
     FSB1_OAM:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/inputs/vmme_small.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/inputs/vmme_small.yml
index 21df075c4a..b6caafb7ca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/inputs/vmme_small.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/inputs/vmme_small.yml
@@ -256,7 +256,7 @@ parameters:
     type: string
     description: volume
   volume_size:
-    type: string
+    type: number
     description: volume
   FSB1_volume_name:
     type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml
index bc90c39153..2357560d67 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml
@@ -684,7 +684,8 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         read_only: true
         name:
           get_input: FSB1_volume_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml
index 50b4130270..8293f5c43c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml
@@ -2871,7 +2871,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     lb2_eca_traffic_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -3008,13 +3009,15 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     cmaui1_volume:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     nems_traffic_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
       properties:
@@ -3346,7 +3349,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ARB_volume_type
-        size: '(get_input : arb_volume_size) * 1024'
+        size:
+          get_input: arb_volume_size
     eca_trx12_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -3724,7 +3728,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     eca_trx7_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -3866,7 +3871,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     eca_trx3_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -3958,7 +3964,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     nems_imap_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
       properties:
@@ -4224,7 +4231,8 @@ topology_template:
       properties:
         volume_type:
           get_input: NEMS_FE_volume_type
-        size: '(get_input : nems_volume_size) * 1024'
+        size:
+          get_input: nems_volume_size
     server_nems_be1:
       type: org.openecomp.resource.vfc.nodes.heat.nems_be
       properties:
@@ -4272,7 +4280,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ECA_OAM_volume_type
-        size: '(get_input : oam_volume_size) * 1024'
+        size:
+          get_input: oam_volume_size
     server_nems_fe2:
       type: org.openecomp.resource.vfc.nodes.heat.nems_fe
       properties:
@@ -4300,7 +4309,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ECA_OAM_volume_type
-        size: '(get_input : oam_volume_size) * 1024'
+        size:
+          get_input: oam_volume_size
     lb2_cor_direct_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -5107,7 +5117,8 @@ topology_template:
       properties:
         volume_type:
           get_input: NEMS_BE_volume_type
-        size: '(get_input : nems_be_volume_size) * 1024'
+        size:
+          get_input: nems_be_volume_size
     server_mmsc4:
       type: org.openecomp.resource.vfc.nodes.heat.mmsc
       properties:
@@ -5666,7 +5677,8 @@ topology_template:
       properties:
         volume_type:
           get_input: NEMS_FE_volume_type
-        size: '(get_input : nems_volume_size) * 1024'
+        size:
+          get_input: nems_volume_size
     eca_trx10_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -6368,7 +6380,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
   relationship_templates:
     mmsc1_volume_attachment:
       type: org.openecomp.relationships.VolumeAttachesTo
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
index cdc13a00ee..cd3491aca1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
@@ -2595,7 +2595,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     lb2_eca_traffic_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -2704,13 +2705,15 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     cmaui1_volume:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     nems_traffic_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
       properties:
@@ -3365,7 +3368,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     eca_trx7_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -3509,7 +3513,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     eca_trx3_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -3601,7 +3606,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
     nems_imap_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
       properties:
@@ -3867,7 +3873,8 @@ topology_template:
       properties:
         volume_type:
           get_input: NEMS_FE_volume_type
-        size: '(get_input : nems_volume_size) * 1024'
+        size:
+          get_input: nems_volume_size
     server_nems_be1:
       type: org.openecomp.resource.vfc.nodes.heat.nems_be
       properties:
@@ -4682,7 +4689,8 @@ topology_template:
       properties:
         volume_type:
           get_input: NEMS_BE_volume_type
-        size: '(get_input : nems_be_volume_size) * 1024'
+        size:
+          get_input: nems_be_volume_size
     server_mmsc4:
       type: org.openecomp.resource.vfc.nodes.heat.mmsc
       properties:
@@ -5208,7 +5216,8 @@ topology_template:
       properties:
         volume_type:
           get_input: NEMS_FE_volume_type
-        size: '(get_input : nems_volume_size) * 1024'
+        size:
+          get_input: nems_volume_size
     eca_trx10_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -5889,7 +5898,8 @@ topology_template:
       properties:
         volume_type:
           get_input: MMSC_volume_type
-        size: '(get_input : mmsc_cinder_volume_size) * 1024'
+        size:
+          get_input: mmsc_cinder_volume_size
   relationship_templates:
     nems1_fe_volume_attachment:
       type: org.openecomp.relationships.VolumeAttachesTo
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
index 9b69834f06..44f1693564 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
@@ -298,7 +298,8 @@ topology_template:
       properties:
         volume_type:
           get_input: ARB_volume_type
-        size: '(get_input : arb_volume_size) * 1024'
+        size:
+          get_input: arb_volume_size
     oam1_instance:
       type: org.openecomp.resource.vfc.nodes.heat.eca
       properties:
@@ -325,13 +326,15 @@ topology_template:
       properties:
         volume_type:
           get_input: ECA_OAM_volume_type
-        size: '(get_input : oam_volume_size) * 1024'
+        size:
+          get_input: oam_volume_size
     oam1_volume:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: ECA_OAM_volume_type
-        size: '(get_input : oam_volume_size) * 1024'
+        size:
+          get_input: oam_volume_size
     oam1_int_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml
index 2ffe57da05..471a29768b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -260,7 +260,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml
index 2bef1f9219..d56cf15ccd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -112,7 +112,7 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: 3*1024
+        size: 3
         read_only:
           get_input: stam
         name:
@@ -124,7 +124,8 @@ topology_template:
           get_input: FSB_2_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         read_only: true
         name:
           get_input: FSB2_volume_name
@@ -135,7 +136,7 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: 3*1024
+        size: 3
         read_only: true
         name:
           get_input: FSB1_volume_name
@@ -146,7 +147,8 @@ topology_template:
           get_input: FSB_2_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         read_only: true
         name:
           get_input: FSB2_volume_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index 40695ff356..96272dbc46 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -813,7 +813,8 @@ topology_template:
     plt_volume_shared_0:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        size: '(get_input : plt_servicedata2_volume_size_0) * 1024'
+        size:
+          get_input: plt_servicedata2_volume_size_0
         name:
           str_replace:
             template: $vnf_name-plt_volume_shared_0
@@ -850,7 +851,8 @@ topology_template:
     app_volume_1:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        size: '(get_input : app_volume_size_0) * 1024'
+        size:
+          get_input: app_volume_size_0
         name:
           str_replace:
             template: $vnf_name-app_volume_1
@@ -860,7 +862,8 @@ topology_template:
     app_volume_2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        size: '(get_input : app_volume_size_0) * 1024'
+        size:
+          get_input: app_volume_size_0
         name:
           str_replace:
             template: $vnf_name-app_volume_2
@@ -870,7 +873,8 @@ topology_template:
     app_volume_0:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        size: '(get_input : app_volume_size_0) * 1024'
+        size:
+          get_input: app_volume_size_0
         name:
           str_replace:
             template: $vnf_name-app_volume_0
@@ -880,7 +884,8 @@ topology_template:
     plt_volume_1:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        size: '(get_input : plt_servicedata1_volume_size_0) * 1024'
+        size:
+          get_input: plt_servicedata1_volume_size_0
         name:
           str_replace:
             template: $vnf_name-plt_volume_1
@@ -890,7 +895,8 @@ topology_template:
     plt_volume_0:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        size: '(get_input : plt_servicedata1_volume_size_0) * 1024'
+        size:
+          get_input: plt_servicedata1_volume_size_0
         name:
           str_replace:
             template: $vnf_name-plt_volume_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
index cd6075a9f2..3cdf6fb3e3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
@@ -2469,7 +2469,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_0
-        size: '(get_input : oam_volume_size_0) * 1024'
+        size:
+          get_input: oam_volume_size_0
         name:
           str_replace:
             template: $VNF$DELoam$DELvolume$DEL0
@@ -2743,7 +2744,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_1
-        size: '(get_input : oam_volume_size_0) * 1024'
+        size:
+          get_input: oam_volume_size_0
         name:
           str_replace:
             template: $VNF$DELoam$DELvolume$DEL1
@@ -2867,7 +2869,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_0
-        size: '(get_input : cif_volume_size_0) * 1024'
+        size:
+          get_input: cif_volume_size_0
         name:
           str_replace:
             template: $VNF$DELcif$DELvolume$DEL0
@@ -2881,7 +2884,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_1
-        size: '(get_input : cif_volume_size_0) * 1024'
+        size:
+          get_input: cif_volume_size_0
         name:
           str_replace:
             template: $VNF$DELcif$DELvolume$DEL1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index 323bbb3238..ab51fae814 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -2069,7 +2069,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_dbc_volume_size_0) * 1024'
+        size:
+          get_input: vson_dbc_volume_size_0
         name:
           get_input: vson_dbc_volume_name_0
         description: vSON DB Config cinder volume.
@@ -2085,7 +2086,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_mdr_volume_size_0) * 1024'
+        size:
+          get_input: vson_mdr_volume_size_0
         name:
           get_input: vson_mdr_volume_name_0
         description: |
@@ -2102,7 +2104,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_mgt_volume_size_0) * 1024'
+        size:
+          get_input: vson_mgt_volume_size_0
         name:
           get_input: vson_mgt_volume_name_0
         description: |
@@ -2119,7 +2122,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_mon_volume_size_0) * 1024'
+        size:
+          get_input: vson_mon_volume_size_0
         name:
           get_input: vson_mon_volume_name_0
         description: |
@@ -2134,7 +2138,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_cll_volume_size_2) * 1024'
+        size:
+          get_input: vson_cll_volume_size_2
         name:
           str_replace:
             template: VNF_NAME_cll_volume_2
@@ -2152,7 +2157,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_cll_volume_size_0) * 1024'
+        size:
+          get_input: vson_cll_volume_size_0
         name:
           str_replace:
             template: VNF_NAME_cll_volume_0
@@ -2170,7 +2176,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_cll_volume_size_1) * 1024'
+        size:
+          get_input: vson_cll_volume_size_1
         name:
           str_replace:
             template: VNF_NAME_cll_volume_1
@@ -2311,7 +2318,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_dbs_volume_size_1) * 1024'
+        size:
+          get_input: vson_dbs_volume_size_1
         name:
           get_input: vson_dbs_volume_name_1
         description: Cinder volume for the second vSON DBS VM instance.
@@ -2393,7 +2401,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_dbs_volume_size_0) * 1024'
+        size:
+          get_input: vson_dbs_volume_size_0
         name:
           get_input: vson_dbs_volume_name_0
         description: Cinder volume for the first vSON DBS VM instance.
@@ -2472,7 +2481,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_dcl_volume_size_2) * 1024'
+        size:
+          get_input: vson_dcl_volume_size_2
         name:
           str_replace:
             template: VNF_NAME_dcl_volume_2
@@ -2490,7 +2500,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_dcl_volume_size_0) * 1024'
+        size:
+          get_input: vson_dcl_volume_size_0
         name:
           str_replace:
             template: VNF_NAME_dcl_volume_0
@@ -2508,7 +2519,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_dcl_volume_size_1) * 1024'
+        size:
+          get_input: vson_dcl_volume_size_1
         name:
           str_replace:
             template: VNF_NAME_dcl_volume_1
@@ -2885,7 +2897,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_dbg_volume_size_0) * 1024'
+        size:
+          get_input: vson_dbg_volume_size_0
         name:
           get_input: vson_dbg_volume_name_0
         description: vSON DB Global cinder volume.
@@ -3042,7 +3055,8 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        size: '(get_input : vson_app_volume_size_0) * 1024'
+        size:
+          get_input: vson_app_volume_size_0
         name:
           get_input: vson_app_volume_name_0
         description: vSON APP cinder volume.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/MainServiceTemplate.yaml
index e89a0c772d..cd877d4b6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/MainServiceTemplate.yaml
@@ -1517,7 +1517,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_0
-        size: '(get_input : oam_volume_size_0) * 1024'
+        size:
+          get_input: oam_volume_size_0
         name:
           str_replace:
             template: $VNF$DELoam$DELvolume$DEL0
@@ -1801,7 +1802,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_1
-        size: '(get_input : oam_volume_size_0) * 1024'
+        size:
+          get_input: oam_volume_size_0
         name:
           str_replace:
             template: $VNF$DELoam$DELvolume$DEL1
@@ -1922,7 +1924,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_0
-        size: '(get_input : cif_volume_size_0) * 1024'
+        size:
+          get_input: cif_volume_size_0
         name:
           str_replace:
             template: $VNF$DELcif$DELvolume$DEL0
@@ -1936,7 +1939,8 @@ topology_template:
       properties:
         availability_zone:
           get_input: availability_zone_1
-        size: '(get_input : cif_volume_size_0) * 1024'
+        size:
+          get_input: cif_volume_size_0
         name:
           str_replace:
             template: $VNF$DELcif$DELvolume$DEL1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
index 8768ffd8eb..be3be10660 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -125,7 +125,8 @@ topology_template:
       properties:
         volume_type:
           get_input: pd01_volume_type
-        size: '(get_input : pd01_cinder_volume_size) * 1024'
+        size:
+          get_input: pd01_cinder_volume_size
     abstract_pd_server:
       type: org.openecomp.resource.abstract.nodes.pd_server
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index db272f1db9..7080e12f30 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -158,7 +158,8 @@ topology_template:
       properties:
         volume_type:
           get_input: pd01_volume_type
-        size: '(get_input : pd01_cinder_volume_size) * 1024'
+        size:
+          get_input: pd01_cinder_volume_size
     abstract_pd_server:
       type: org.openecomp.resource.abstract.nodes.pd_server
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 3fe0da473a..651ac0d26e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -172,7 +172,8 @@ topology_template:
       properties:
         volume_type:
           get_input: pd01_volume_type
-        size: '(get_input : pd01_cinder_volume_size) * 1024'
+        size:
+          get_input: pd01_cinder_volume_size
     packet_internal_network:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml
index 25470e4630..c450f053c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml
@@ -609,7 +609,8 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         name:
           get_input: FSB1_volume_name
     FSB2_volume:
@@ -619,7 +620,8 @@ topology_template:
           get_input: FSB_2_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         name:
           get_input: FSB2_volume_name
     abstract_VLC2:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
index efc5e3cf12..7bb68e83e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
@@ -320,7 +320,7 @@ topology_template:
           - allowed_address_pair
           - 0
           - mac
-        size: 50*1024
+        size: 50
         name:
           get_attribute:
           - abstract_pd_server
@@ -376,7 +376,10 @@ topology_template:
           get_attribute:
           - abstract_pd_server
           - pd_server_pd01_port_0_port_security_enabled
-        size: '(get_attribute : [pd01_port_0, network]) * 1024'
+        size:
+          get_attribute:
+          - abstract_pd_server
+          - pd_server_pd01_port_0_network
         read_only:
           get_attribute:
           - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml
index 18e0c63df6..263a1e107b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml
@@ -682,7 +682,8 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         read_only: true
         name:
           get_input: FSB1_volume_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/inputfiles/hot-nimbus-oam-volumes_v1.0.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/inputfiles/hot-nimbus-oam-volumes_v1.0.env
index b494d8c270..c7707401bb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/inputfiles/hot-nimbus-oam-volumes_v1.0.env
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/inputfiles/hot-nimbus-oam-volumes_v1.0.env
@@ -1,5 +1,5 @@
 parameters:
-  pcrf_oam_vol_size: 500
+  pcrf_oam_vol_size: 500 GB
   pcrf_oam_volume_silver-1: Silver
   pcrf_oam_volume_silver-2: Silver
   pcrf_oam_vol_name_1: sde1-pcrfx01-oam001-vol-1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml
index e0c3cb4af2..32750b63f3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml
@@ -81,9 +81,9 @@ topology_template:
             - hot-nimbus-oam_v1.0
             source_type: HEAT
             param_name: pcrf_oam_vol_size
-      type: float
+      type: scalar-unit.size
       description: the size of the Cinder volume
-      default: 500
+      default: 500 GB
     pcrf_oam_vol_name_2:
       label: OAM volume name 2
       hidden: false
@@ -1053,7 +1053,8 @@ topology_template:
       properties:
         volume_type:
           get_input: pcrf_oam_volume_silver-1
-        size: '(get_input : pcrf_oam_vol_size) * 1024'
+        size:
+          get_input: pcrf_oam_vol_size
         name:
           get_input: pcrf_oam_vol_name_1
     server_pcrf_oam_001:
@@ -1339,7 +1340,8 @@ topology_template:
       properties:
         volume_type:
           get_input: pcrf_pcm_volume_silver
-        size: '(get_input : pcrf_pcm_vol_size) * 1024'
+        size:
+          get_input: pcrf_pcm_vol_size
         name:
           get_input: pcrf_pcm_vol_name_1
     server_pcrf_ppd_001:
@@ -1761,7 +1763,8 @@ topology_template:
       properties:
         volume_type:
           get_input: pcrf_oam_volume_silver-2
-        size: '(get_input : pcrf_oam_vol_size) * 1024'
+        size:
+          get_input: pcrf_oam_vol_size
         name:
           get_input: pcrf_oam_vol_name_2
     server_pcrf_psm_009:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
index d2d5a928dd..50080554c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
@@ -149,7 +149,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_resourceGroup:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
       directives:
@@ -180,7 +181,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     main_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index 0c89037b87..6a251dcc0d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -294,13 +294,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     main_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index fe9c34a568..911181e52d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -408,7 +408,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     server_cmaui21:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
@@ -431,7 +432,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index a6843e335d..547e925418 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -133,7 +133,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_resourceGroup:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
       directives:
@@ -163,7 +164,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_nova:
       type: org.openecomp.resource.vfc.nodes.heat.jsa
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index ceb1117e4f..0e1ca5c869 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -42,7 +42,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_nested:
       type: org.openecomp.resource.abstract.nodes.heat.nested
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index 3ae12abd30..21681fa7fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -153,7 +153,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index a82686f24b..c99bf33f12 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -343,13 +343,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index 1bd7482d06..f3b6ea28ec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -177,7 +177,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_resourceGroup:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
       directives:
@@ -208,7 +209,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_nova:
       type: org.openecomp.resource.vfc.nodes.heat.jsa
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index b0b26f59fa..26072b706f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -70,13 +70,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_vol2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_nested:
       type: org.openecomp.resource.abstract.nodes.heat.nested
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index eaed82b0ea..9be18df736 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -168,13 +168,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_vol2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     server_cmaui:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumemulticonnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumemulticonnection/expectedoutputfiles/MainServiceTemplate.yaml
index 00c7996cf9..747459e860 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumemulticonnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumemulticonnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -263,13 +263,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumesharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumesharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index 5b3b793b1b..8b172f82db 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumesharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumesharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -52,13 +52,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_vol2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     test_nested:
       type: org.openecomp.resource.abstract.nodes.heat.nested
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
index 82b8920144..25ae87767f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
@@ -160,7 +160,8 @@ topology_template:
       properties:
         volume_type:
           get_input: qrouter_volume_type_1
-        size: '(get_input : qrouter_volume_size_1) * 1024'
+        size:
+          get_input: qrouter_volume_size_1
         description:
           get_input: qrouter_volume_name_1
     qrouter_volume_0:
@@ -168,7 +169,8 @@ topology_template:
       properties:
         volume_type:
           get_input: qrouter_volume_type_0
-        size: '(get_input : qrouter_volume_size_0) * 1024'
+        size:
+          get_input: qrouter_volume_size_0
         description:
           get_input: qrouter_volume_name_0
     qrouter_volume_2:
@@ -176,7 +178,8 @@ topology_template:
       properties:
         volume_type:
           get_input: qrouter_volume_type_2
-        size: '(get_input : qrouter_volume_size_2) * 1024'
+        size:
+          get_input: qrouter_volume_size_2
         description:
           get_input: qrouter_volume_name_2
     QRouter1:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
index 13f06302f7..8a5534d0fd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
@@ -320,7 +320,8 @@ topology_template:
       properties:
         volume_type:
           get_input: vLBAgent_volume_type_0
-        size: '(get_input : vLBAgent_volume_size_0) * 1024'
+        size:
+          get_input: vLBAgent_volume_size_0
         description:
           get_input: vLBAgent_volume_name_0
     vLBAgent_volume_1:
@@ -328,7 +329,8 @@ topology_template:
       properties:
         volume_type:
           get_input: vLBAgent_volume_type_1
-        size: '(get_input : vLBAgent_volume_size_1) * 1024'
+        size:
+          get_input: vLBAgent_volume_size_1
         description:
           get_input: vLBAgent_volume_name_1
     oam_private_net_network_port_3:
@@ -358,7 +360,8 @@ topology_template:
       properties:
         volume_type:
           get_input: vLBAgent_volume_type_2
-        size: '(get_input : vLBAgent_volume_size_2) * 1024'
+        size:
+          get_input: vLBAgent_volume_size_2
         description:
           get_input: vLBAgent_volume_name_2
     packet_internal_network_port:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
index af4eef130d..06ecef38f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
@@ -215,19 +215,22 @@ topology_template:
       properties:
         volume_type:
           get_input: vLB_volume_type_1
-        size: '(get_input : vLB_volume_size_1) * 1024'
+        size:
+          get_input: vLB_volume_size_1
     vLB_volume_0:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: vLB_volume_type_0
-        size: '(get_input : vLB_volume_size_0) * 1024'
+        size:
+          get_input: vLB_volume_size_0
     vLB_volume_2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: vLB_volume_type_2
-        size: '(get_input : vLB_volume_size_2) * 1024'
+        size:
+          get_input: vLB_volume_size_2
     vLBInstance:
       type: org.openecomp.resource.vfc.nodes.heat.vLB
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
index 2aaf8e5688..25a3300887 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
@@ -303,7 +303,8 @@ topology_template:
       properties:
         volume_type:
           get_input: vprobe_volume_type_2
-        size: '(get_input : vprobe_volume_size_2) * 1024'
+        size:
+          get_input: vprobe_volume_size_2
         description:
           get_input: vprobe_volume_name_2
     vprobe_volume_1:
@@ -311,7 +312,8 @@ topology_template:
       properties:
         volume_type:
           get_input: vprobe_volume_type_1
-        size: '(get_input : vprobe_volume_size_1) * 1024'
+        size:
+          get_input: vprobe_volume_size_1
         description:
           get_input: vprobe_volume_name_1
     vprobe_volume_0:
@@ -319,7 +321,8 @@ topology_template:
       properties:
         volume_type:
           get_input: vprobe_volume_type_0
-        size: '(get_input : vprobe_volume_size_0) * 1024'
+        size:
+          get_input: vprobe_volume_size_0
         description:
           get_input: vprobe_volume_name_0
     oam_private_net_network_port_1:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml
index d24e318ad8..d87db43ba3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml
@@ -297,13 +297,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml
index c673099252..913354dc2f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml
@@ -131,13 +131,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     FSB1:
       type: org.openecomp.resource.abstract.nodes.FSB1
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml
index 0673c7c66a..a2f0ef717e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml
@@ -408,13 +408,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml
index 9d1263448b..e43cf1f044 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml
@@ -397,13 +397,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
index 9960d9bd30..d7a5393b89 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
@@ -166,13 +166,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
index 609d952fd6..e55f75af39 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
@@ -167,13 +167,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     abstract_FSB:
       type: org.openecomp.resource.abstract.nodes.FSB
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
index af1fd69d98..a5975596a1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
@@ -144,13 +144,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
index 6305a7cae6..774f7182fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
@@ -146,13 +146,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     abstract_FSB:
       type: org.openecomp.resource.abstract.nodes.FSB
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
index 017dd970be..d59f213049 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
@@ -215,25 +215,29 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume3:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume4:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
index dc3eca36bd..ffc6566450 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
@@ -216,25 +216,29 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume3:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume4:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     abstract_FSB:
       type: org.openecomp.resource.abstract.nodes.FSB
       directives:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml
index 8de7a78695..1be19f4058 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml
@@ -297,13 +297,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml
index 8dd35a7ea8..ff21190ab3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml
@@ -297,13 +297,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
index a2ef5b3f80..a23e8b1c3d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
@@ -230,13 +230,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
index 7ace2d34fd..e44a435571 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
@@ -230,13 +230,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml
index 810968f5ec..16206a9695 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml
@@ -247,25 +247,29 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume3:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume4:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     packet_mirror_network:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
index 808ff5602d..a3c6e38b50 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
@@ -248,25 +248,29 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume3:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume4:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     packet_mirror_network:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml
index 91eb3145c3..4cc791ac14 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml
@@ -175,13 +175,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     packet_mirror_network:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
index bb7a1a5c6e..2750a99525 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
@@ -176,13 +176,15 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     packet_mirror_network:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml
index 44df0e1b00..0623b12013 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml
@@ -1598,7 +1598,8 @@ topology_template:
           get_input: FSB_1_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         name:
           get_input: FSB1_volume_name
     FSB1_OAM:
@@ -1631,7 +1632,8 @@ topology_template:
           get_input: FSB_2_image
         volume_type:
           get_input: volume_type
-        size: '(get_input : volume_size) * 1024'
+        size:
+          get_input: volume_size
         name:
           get_input: FSB2_volume_name
     Internal1-net:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
index ae852574f3..a97dff5452 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
@@ -141,7 +141,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml
index acd332331a..200cbedf7b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml
@@ -261,7 +261,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml
index ec0ce2e7e2..664d97fcd2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml
@@ -261,7 +261,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml
index 070dda7a32..2ad049aa3f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml
@@ -258,7 +258,8 @@ topology_template:
       properties:
         volume_type:
           get_input: CMAUI_volume_type
-        size: '(get_input : cmaui_cinder_volume_size) * 1024'
+        size:
+          get_input: cmaui_cinder_volume_size
     cmaui_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java
index b8b6d8dbcb..4cb511b56d 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java
@@ -34,7 +34,6 @@ public class PropertyTypeTest {
   @Test
   public void shouldReturnApproppriatePropertyTypeWhenDisplayNameExist() {
     String s = "scalar-unit.size";
-    Assert
-        .assertEquals(PropertyType.getPropertyTypeByDisplayName(s), PropertyType.SCALAR_UNIT_SIZE);
+    Assert.assertEquals(PropertyType.getPropertyTypeByDisplayName(s), PropertyType.SCALAR_UNIT_SIZE);
   }
 }
author	aribeiro <anderson.ribeiro@est.tech>	2019-10-01 16:47:26 +0100
committer	Ofir Sonsino <ofir.sonsino@intl.att.com>	2019-11-19 07:48:02 +0000
commit	35b5687d60558bac72c1e53ddd9044584964a3d8 (patch)
tree	dc2e184f2cef02c6d1aee0b5baf1585d2b7b3ffe
parent	0f9257b8265404c82ccdfae6aafce940f20a2947 (diff)