From 35b5687d60558bac72c1e53ddd9044584964a3d8 Mon Sep 17 00:00:00 2001 From: aribeiro Date: Tue, 1 Oct 2019 16:47:26 +0100 Subject: Fix for scalar-unit type value. Issue-ID: SDC-323 Change-Id: I7f19a7356e1cd34deca0a168b3cb707ef657b9cb Signed-off-by: aribeiro --- .../expectedoutputfiles/MainServiceTemplate.yaml | 3 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 10 +++--- .../out/MainServiceTemplate.yaml | 18 ++++++---- .../duplicateReqs/out/MainServiceTemplate.yaml | 12 ++++--- .../out/MainServiceTemplate.yaml | 42 ++++++++++++++-------- .../myTest/out/MainServiceTemplate.yaml | 12 ++++--- .../out/MainServiceTemplate.yaml | 3 +- .../out/MainServiceTemplate.yaml | 3 +- .../out/MainServiceTemplate.yaml | 3 +- .../generalVf/out/MainServiceTemplate.yaml | 6 ++-- .../out/MainServiceTemplate.yaml | 7 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 3 +- .../inputfiles/hot-nimbus-oam-volumes_v1.0.env | 2 +- .../out/MainServiceTemplate.yaml | 13 ++++--- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 3 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 3 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- ...d_On_Module_QRouterTemplateServiceTemplate.yaml | 9 +++-- ..._On_Module_vLBAgentTemplateServiceTemplate.yaml | 9 +++-- ...FEAdd_On_Module_vLBTemplateServiceTemplate.yaml | 9 +++-- ...dd_On_Module_vProbeTemplateServiceTemplate.yaml | 9 +++-- .../consolidation/in/MainServiceTemplate.yaml | 6 ++-- .../consolidation/out/MainServiceTemplate.yaml | 6 ++-- .../in/MainServiceTemplate.yaml | 6 ++-- .../WithIndex/in/MainServiceTemplate.yaml | 6 ++-- .../in/MainServiceTemplate.yaml | 6 ++-- .../out/MainServiceTemplate.yaml | 6 ++-- .../in/MainServiceTemplate.yaml | 6 ++-- .../out/MainServiceTemplate.yaml | 6 ++-- .../in/MainServiceTemplate.yaml | 12 ++++--- .../out/MainServiceTemplate.yaml | 12 ++++--- .../consolidation/in/MainServiceTemplate.yaml | 6 ++-- .../consolidation/out/MainServiceTemplate.yaml | 6 ++-- .../noConsolidation/in/MainServiceTemplate.yaml | 6 ++-- .../noConsolidation/out/MainServiceTemplate.yaml | 6 ++-- .../consolidation/in/MainServiceTemplate.yaml | 12 ++++--- .../consolidation/out/MainServiceTemplate.yaml | 12 ++++--- .../noConsolidation/in/MainServiceTemplate.yaml | 6 ++-- .../noConsolidation/out/MainServiceTemplate.yaml | 6 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++-- .../out/nestedServiceTemplate.yaml | 3 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 3 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 3 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 3 +- 53 files changed, 258 insertions(+), 131 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services') 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: -- cgit 1.2.3-korg