Fix for scalar-unit type value.

Issue-ID: SDC-323
Change-Id: I7f19a7356e1cd34deca0a168b3cb707ef657b9cb
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>

1 files changed, 16 insertions, 12 deletions

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