From 7a9073719da3db83024e66a1da9ba14546cfd175 Mon Sep 17 00:00:00 2001 From: eleonorali Date: Tue, 10 Apr 2018 15:19:51 +0300 Subject: Defect 451622: Fix for defect 430981 not correct Only one default ipVersion - version4 should be created Change-Id: I27aad6acdacf66cf48f71f0a17cdd414aa510f93 Issue-ID: SDC-1203 Signed-off-by: eleonorali --- .../out/nested1ServiceTemplate.yaml | 12 +----------- .../out/nested2ServiceTemplate.yaml | 12 +----------- .../out/nested3ServiceTemplate.yaml | 20 -------------------- 3 files changed, 2 insertions(+), 42 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml index 39aeaace84..9c4ebd296a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml @@ -88,11 +88,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_cmaui_port_2_security_groups: - - get_input: p2 port_cmaui_port_1_ip_requirements: @@ -101,11 +96,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_cmaui_port_1_subinterface_indicator: - false port_cmaui_port_1_replacement_policy: @@ -1028,4 +1018,4 @@ topology_template: - dependency_cmaui dependency_cmaui_port_4_test_nested2Level: - test_nested2Level - - dependency_cmaui_port_4 + - dependency_cmaui_port_4 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml index de9e176c66..d607379ed9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml @@ -118,11 +118,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_cmaui_port_3_subinterface_indicator: - false port_cmaui_port_4_replacement_policy: @@ -137,11 +132,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_cmaui_port_3_security_groups: - - get_input: p2 - get_input: p1 @@ -816,4 +806,4 @@ topology_template: - dependency_cmaui_cmaui_port_3 dependency_cmaui_port_5_test_nested3Level: - test_nested3Level - - dependency_cmaui_port_5 + - dependency_cmaui_port_5 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml index c482972e06..8d6cae825d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml @@ -83,22 +83,12 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_cmaui_port_8_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false abstract_cmaui: type: org.openecomp.resource.abstract.nodes.cmaui directives: @@ -129,11 +119,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_cmaui_port_5_fixed_ips: - ip_address: get_input: @@ -145,11 +130,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_cmaui_port_5_network: - get_input: net port_cmaui_port_5_replacement_policy: -- cgit 1.2.3-korg