Subinterface_indicator property issue

It should only be present under port implementation

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

37 files changed, 31 insertions, 310 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 11ab827c9b..62768365f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1113,12 +1113,6 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
@@ -1139,12 +1133,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd_server_2b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_2b_port_network_role:
         type: string
         required: true
@@ -1680,12 +1668,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_ps_server_2b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_ps_server_2b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -1712,12 +1694,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_ps_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 21bc68dae8..1904d92b73 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -94,11 +94,6 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -115,11 +110,6 @@ topology_template:
     port_pd_server_1b_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd_server_2b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_2b_port_network_role:
       type: string
       required: true
@@ -161,10 +151,7 @@ topology_template:
           get_input: port_pd_server_2b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_2b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_2b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_2b_port_ip_requirements
         network_role_tag:
@@ -241,10 +228,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index 1ed349aea4..0d17953bf2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -46,11 +46,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_ps_server_2b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_ps_server_2b_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -72,11 +67,6 @@ topology_template:
     port_ps_server_1b_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_ps_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -161,10 +151,7 @@ topology_template:
           get_input: port_ps_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_ps_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
         network_role_tag:
@@ -201,10 +188,7 @@ topology_template:
           get_input: port_ps_server_2b_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_2b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_ps_server_2b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_2b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
index aafd2aad7d..17d059e72f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -152,15 +152,11 @@ topology_template:
             is_required: false
         subinterface_nested_vlan_service_template_filter_count:
         - 9
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
         port_pd_server_1b_port_replacement_policy:
         - AUTO
         port_pd_server_1b_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd_server_2b_port_subinterface_indicator:
-        - false
         port_pd_server_1b_port_network:
         - packet_internal_network
         port_pd_server_2b_port_replacement_policy:
@@ -212,8 +208,6 @@ topology_template:
             get_input:
             - ps_server_2b_ips
             - 0
-        port_ps_server_2b_port_subinterface_indicator:
-        - false
         compute_ps_server_1b_availability_zone:
         - get_input: availability_zone_0
         compute_ps_server_1b_name:
@@ -223,8 +217,6 @@ topology_template:
         port_ps_server_1b_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_ps_server_1b_port_subinterface_indicator:
-        - false
         port_ps_server_1b_port_network:
         - packet_internal_network
         port_ps_server_1b_port_ip_requirements:
@@ -726,4 +718,4 @@ topology_template:
       - link_pd_server_1b_pd_server_2b_port
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5833433c36..a80a91c227 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -930,12 +930,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index ffbd33cba3..033465e290 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -106,8 +106,6 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
         subinterface_nested_vlan_net1:
         - packet_external_network
         vm_image_name:
@@ -591,4 +589,4 @@ topology_template:
       - dependency
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 85b75c7544..0f2212017f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -148,6 +148,7 @@ topology_template:
           get_input: port_ps_server_1b_port_1_subnetpoolid
         mac_requirements:
           get_input: port_ps_server_1b_port_1_mac_requirements
+        subinterface_indicator: true
         exCP_naming:
           get_input: port_ps_server_1b_port_1_exCP_naming
         vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d7ea458bf6..19ea2cdaec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1288,12 +1288,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
@@ -2593,12 +2587,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
-      port_ps_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index f518d262b3..b7e7e4a0df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
       required: true
       entry_schema:
         type: float
-    port_ps_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_ps_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_ps_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_ps_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index cb769d3137..bbc680fb1c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -97,8 +97,6 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
         subinterface_nested_vlan_net1:
         - packet_external_network
         vm_image_name:
@@ -762,4 +760,4 @@ topology_template:
       - dependency
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 78d812d65f..cf76c3e13c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -88,9 +88,6 @@ topology_template:
         subinterface_nested_vlan_service_template_filter_count:
         - 9
         - 9
-        port_ps_server_1b_port_subinterface_indicator:
-        - true
-        - true
         port_ps_server_1b_port_fixed_ips:
         - - ip_address:
               get_input:
@@ -557,4 +554,4 @@ topology_template:
       - dependency_ps_server_1b
       dependency_server_1b_ps_2:
       - abstract_ps_server_1b
-      - dependency_ps_server_1b
\ No newline at end of file
+      - dependency_ps_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f730fd451..d7df807be0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -861,12 +861,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
index cca8d74d41..fc9893df82 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -115,8 +115,6 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
         subinterface_nested_vlan_net1:
         - get_input: sub_inf_net
         vm_image_name:
@@ -541,4 +539,4 @@ topology_template:
       - dependency
       local_storage_server_1b_pd_1_test_nested_level2:
       - test_nested_level2
-      - local_storage_server_1b_pd_1
\ No newline at end of file
+      - local_storage_server_1b_pd_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 019e6cf76e..e415457bec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -147,6 +147,7 @@ topology_template:
           get_input: port_pd_server_1b_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_1b_port_1_mac_requirements
+        subinterface_indicator: true
         exCP_naming:
           get_input: port_pd_server_1b_port_1_exCP_naming
         vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f671973941..e4265b87a2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,12 +32,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
@@ -2028,12 +2022,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
@@ -2459,12 +2447,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
-      port_ps_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
index 7c56f7b75a..c76ef1bf49 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
@@ -139,11 +139,6 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
-        - true
-        - true
-        - true
         subinterface_nested_vlan_net1:
         - packet_externalmain_network
         - packet_externalmain_network
@@ -257,4 +252,4 @@ topology_template:
       - packet_internalmain_network
       - test_nested_level1
       - packet_externalmain_network
-      - abstract_pd_server_1b_1
\ No newline at end of file
+      - abstract_pd_server_1b_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 71c4d654a2..c3bad7cb18 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -26,11 +26,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -113,10 +108,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
index f3ebc433f9..eba7e8bdb0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index f518d262b3..b7e7e4a0df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
       required: true
       entry_schema:
         type: float
-    port_ps_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_ps_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_ps_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_ps_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index 35cb12a9d1..b706d0cfb8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -102,9 +102,6 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - false
-        - false
         vm_image_name:
           get_input: pd_server_1b_image
         port_pd_server_1b_port_replacement_policy:
@@ -173,9 +170,6 @@ topology_template:
         subinterface_nested_vlan_service_template_filter_count:
         - 9
         - 9
-        port_ps_server_1b_port_subinterface_indicator:
-        - true
-        - true
         port_ps_server_1b_port_fixed_ips:
         - - ip_address:
               get_input:
@@ -979,4 +973,4 @@ topology_template:
       - dependency_pd_server_1b
       dependency_server_1b_pd_3:
       - abstract_pd_server_1b
-      - dependency_pd_server_1b
\ No newline at end of file
+      - dependency_pd_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 974e584ce7..12b12abf68 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -891,12 +891,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index 6bb9df2728..a9ce4973af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -121,9 +121,6 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
-        - true
         subinterface_nested_vlan_net1:
         - packet_external_network
         - packet_external_network
@@ -584,4 +581,4 @@ topology_template:
       - dependency_pd_server_1b_pd_server_1b_port
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1387e5c045..594f24d7bb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1264,12 +1264,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
@@ -2539,12 +2533,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_ps_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -2978,12 +2966,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
-      port_ps_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index f518d262b3..b7e7e4a0df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
       required: true
       entry_schema:
         type: float
-    port_ps_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_ps_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_ps_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_ps_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
index fa14eab377..27604b5ede 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
@@ -19,11 +19,6 @@ topology_template:
     port_ps_server_1b_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_ps_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_ps_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -113,10 +108,7 @@ topology_template:
           get_input: port_ps_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_ps_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
index 2db4e0145a..5b9bd4c74d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -97,8 +97,6 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
         subinterface_nested_vlan_net1:
         - packet_external_network
         vm_image_name:
@@ -750,4 +748,4 @@ topology_template:
       - dependency
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index c732306c51..5aa4c84390 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -85,8 +85,6 @@ topology_template:
         port_ps_server_1b_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_ps_server_1b_port_subinterface_indicator:
-        - false
         port_ps_server_1b_port_fixed_ips:
         - ip_address:
             get_input:
@@ -135,8 +133,6 @@ topology_template:
             is_required: false
         subinterface_nested_vlan_service_template_filter_count:
         - 9
-        port_ps_server_1b_port_subinterface_indicator:
-        - true
         port_ps_server_1b_port_fixed_ips:
         - ip_address:
             get_input:
@@ -575,4 +571,4 @@ topology_template:
       - dependency_ps_server_1b
       dependency_server_1b_ps_2:
       - abstract_ps_server_1b_1
-      - dependency_ps_server_1b
\ No newline at end of file
+      - dependency_ps_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1e5a598b9e..fcb2bb1802 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1288,12 +1288,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
@@ -2593,12 +2587,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
-      port_ps_server_1b_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index a429c0a6ea..aecb447d5c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index bda2ced2cf..aa2205acd3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
       required: true
       entry_schema:
         type: float
-    port_ps_server_1b_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_ps_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -153,10 +148,7 @@ topology_template:
           get_input: port_ps_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_1b_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_ps_server_1b_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
index 2cd856b0bf..3993f75f99 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -103,8 +103,6 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_1b_port_subinterface_indicator:
-        - true
         subinterface_nested_vlan_net1:
         - packet_external_network
         vm_image_name:
@@ -779,4 +777,4 @@ topology_template:
       - dependency
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 088577523f..2bba8fd0f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -83,8 +83,6 @@ topology_template:
             is_required: false
         subinterface_nested_vlan_service_template_filter_count:
         - 9
-        port_ps_server_1b_port_subinterface_indicator:
-        - true
         port_ps_server_1b_port_fixed_ips:
         - ip_address:
             get_input:
@@ -151,8 +149,6 @@ topology_template:
             is_required: false
         subinterface_nested_vlan_service_template_filter_count:
         - 19
-        port_ps_server_1b_port_subinterface_indicator:
-        - true
         port_ps_server_1b_port_fixed_ips:
         - ip_address:
             get_input:
@@ -615,4 +611,4 @@ topology_template:
       - dependency_ps_server_1b
       dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1:
       - test_resourceGroup_1
-      - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file
+      - dependency_template_subint_Vlan_vmi_1