From f691a83954e8fe1148d2a4386cba509bddfa95d5 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Mon, 9 Apr 2018 21:40:24 +0530 Subject: Evaluate subinterface_indicator property Corrected the condition to mark subinterface_indicator true/false Change-Id: I3f21924defbc89a5fcd9a89ffc1ea0d28eec8c36 Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../consolidation/out/MainServiceTemplate.yaml | 16 ++++++++-------- .../noConsolidation/out/MainServiceTemplate.yaml | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml index 7691174c4c..f0d017909c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml @@ -104,7 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -267,8 +267,8 @@ topology_template: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 port_FSB1_Internal_subinterface_indicator: - - true - - true + - false + - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -285,8 +285,8 @@ topology_template: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 port_FSB2_Internal_subinterface_indicator: - - true - - true + - false + - false compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml index 386d6cd7fb..796d4db974 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: properties: network: get_input: cdr_network - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -66,7 +66,7 @@ topology_template: properties: network: get_input: oam_private_net_name - subinterface_indicator: true + subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -102,7 +102,7 @@ topology_template: vm_flavor_name: FLAVOR-test vm_image_name: Image-test port_oam_private_net_network_port_subinterface_indicator: - - true + - false compute_QRouter_availability_zone: - Availability-test compute_QRouter_config_drive: @@ -114,7 +114,7 @@ topology_template: compute_QRouter_name: - QRouter-name port_cdr_network_port_subinterface_indicator: - - true + - false service_template_filter: substitute_service_template: Nested_QRouterServiceTemplate.yaml count: 1 -- cgit 1.2.3-korg