Evaluate subinterface_indicator property

Corrected the condition to mark subinterface_indicator true/false

Change-Id: I3f21924defbc89a5fcd9a89ffc1ea0d28eec8c36
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

12 files changed, 72 insertions, 72 deletions

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 bc08b781f9..53edc4aa75 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
@@ -74,7 +74,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal2-mac
         network: Internal2-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -86,7 +86,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal1-mac
         network: Internal1-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -103,7 +103,7 @@ topology_template:
         - ip_address:
             get_input: fsb1-oam-ip
         network: jsa_net1
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -185,7 +185,7 @@ topology_template:
         port_FSB1_Internal_mac_address:
           get_input: fsb1-Internal1-mac
         port_FSB1_OAM_subinterface_indicator:
-        - true
+        - false
         vm_flavor_name:
           get_input: fsb-flavor
         vm_image_name:
@@ -193,7 +193,7 @@ topology_template:
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
         port_FSB1_Internal_subinterface_indicator:
-        - true
+        - false
         port_FSB1_Internal_network:
         - Internal1-net
         port_FSB2_Internal_mac_address:
@@ -207,7 +207,7 @@ topology_template:
           - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
         port_FSB2_Internal_subinterface_indicator:
-        - true
+        - false
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         port_FSB1_OAM_fixed_ips:
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 5c86ef6c5b..1ece0e77db 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
@@ -69,7 +69,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal2-mac
         network: Internal2-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -81,7 +81,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal1-mac
         network: Internal1-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -161,7 +161,7 @@ topology_template:
       - substitutable
       properties:
         port_FSB1_Internal_2_subinterface_indicator:
-        - true
+        - false
         vm_flavor_name:
           get_input: fsb-flavor
         vm_image_name:
@@ -171,7 +171,7 @@ topology_template:
         port_FSB1_Internal_1_mac_address:
           get_input: fsb1-Internal1-mac
         port_FSB1_Internal_1_subinterface_indicator:
-        - true
+        - false
         port_FSB1_Internal_1_network:
         - Internal1-net
         port_FSB1_Internal_2_mac_address:
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 9b54fbea73..74af8bd259 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
@@ -94,7 +94,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
@@ -106,7 +106,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
@@ -118,7 +118,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
@@ -134,7 +134,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
@@ -257,8 +257,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
@@ -275,8 +275,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/inputoutputparamtype/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
index cf83056eb9..cb4c364068 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
@@ -260,7 +260,7 @@ topology_template:
       - substitutable
       properties:
         port_VMI_subinterface_indicator:
-        - true
+        - false
         port_FSB1_Port_network:
         - Internal1-net
         vm_flavor_name:
@@ -268,7 +268,7 @@ topology_template:
         port_FSB1_Port_mac_address:
           get_input: fsb1-Internal1-mac
         port_FSB1_Port_subinterface_indicator:
-        - true
+        - false
         compute_FSB1_availability_zone:
         - get_input: fsb_zone
         port_VMI_port_tuple_refs:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
index a46b7613ae..33cf0ab91a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/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
@@ -254,8 +254,8 @@ topology_template:
         - OPTIONAL-DATA-FSB1
         - null
         port_FSB1_Internal_subinterface_indicator:
-        - true
-        - true
+        - false
+        - false
         port_FSB1_Internal_network:
         - Internal1-net-fsb1-Internal1
         - Internal1-net-fsb1-Internal2
@@ -272,8 +272,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/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
index 9efe855849..bf66e19579 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
@@ -57,7 +57,7 @@ topology_template:
         replacement_policy: AUTO
         network:
           get_input: port_name
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -89,7 +89,7 @@ topology_template:
         replacement_policy: AUTO
         network:
           get_input: port_name
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -109,7 +109,7 @@ topology_template:
         vm_image_name:
           get_input: image_smp_name
         port_port_1_subinterface_indicator:
-        - true
+        - false
         port_port_2_replacement_policy:
         - AUTO
         compute_smp_name:
@@ -119,7 +119,7 @@ topology_template:
         port_port_1_network:
         - get_input: port_name
         port_port_2_subinterface_indicator:
-        - true
+        - false
         port_port_2_network:
         - get_input: port_name
         compute_smp_metadata:
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
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
index f2d7a0b7f9..6315ba5ec4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/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
@@ -254,8 +254,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
@@ -272,8 +272,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/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
index c4d02a16cd..03086cc4a9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
@@ -79,7 +79,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal2-mac
         network: Internal2-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -91,7 +91,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal1-mac
         network: Internal1-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -108,7 +108,7 @@ topology_template:
         - ip_address:
             get_input: fsb1-oam-ip
         network: jsa_net1
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -179,7 +179,7 @@ topology_template:
         port_FSB1_Internal_mac_address:
           get_input: fsb1-Internal1-mac
         port_FSB1_OAM_subinterface_indicator:
-        - true
+        - false
         vm_flavor_name:
           get_input: fsb-flavor
         vm_image_name:
@@ -187,7 +187,7 @@ topology_template:
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
         port_FSB1_Internal_subinterface_indicator:
-        - true
+        - false
         port_FSB1_Internal_network:
         - Internal1-net
         port_FSB2_Internal_mac_address:
@@ -201,7 +201,7 @@ topology_template:
           - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
         port_FSB2_Internal_subinterface_indicator:
-        - true
+        - false
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         port_FSB1_OAM_fixed_ips:
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 82e7614811..511aa0ccbe 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
@@ -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
@@ -294,8 +294,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
@@ -312,8 +312,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/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 8e411bde02..41a5177c3d 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
@@ -79,7 +79,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal2-mac
         network: Internal2-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -91,7 +91,7 @@ topology_template:
         mac_address:
           get_input: fsb1-Internal1-mac
         network: Internal1-net
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -108,7 +108,7 @@ topology_template:
         - ip_address:
             get_input: fsb1-oam-ip
         network: jsa_net1
-        subinterface_indicator: true
+        subinterface_indicator: false
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -199,7 +199,7 @@ topology_template:
         port_FSB1_Internal_mac_address:
           get_input: fsb1-Internal1-mac
         port_FSB1_OAM_subinterface_indicator:
-        - true
+        - false
         vm_flavor_name:
           get_input: fsb-flavor
         vm_image_name:
@@ -207,7 +207,7 @@ topology_template:
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
         port_FSB1_Internal_subinterface_indicator:
-        - true
+        - false
         port_FSB1_Internal_network:
         - Internal1-net
         port_FSB2_Internal_mac_address:
@@ -221,7 +221,7 @@ topology_template:
           - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
         port_FSB2_Internal_subinterface_indicator:
-        - true
+        - false
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         port_FSB1_OAM_fixed_ips: