Fix for scalar-unit type value.

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

13 files changed, 36 insertions, 28 deletions

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