Fix for scalar-unit type value.

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

9 files changed, 71 insertions, 35 deletions

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