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 | 6 ++++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++++-- .../multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml | 6 ++++-- .../nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml | 6 ++++-- .../nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml | 3 ++- .../nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml | 3 ++- .../sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml | 6 ++++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 6 ++++-- 10 files changed, 36 insertions(+), 18 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection') 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: -- cgit 1.2.3-korg