1 files changed, 26 insertions, 13 deletions
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