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>

11 files changed, 117 insertions, 345 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 565834cea3..7a1ce8554b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -960,12 +960,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_pcm_port_2_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pcm_port_3_network_role:
         type: string
         required: true
@@ -1064,12 +1058,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pcm_port_3_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pcm_port_2_order:
         type: integer
         required: true
@@ -2130,12 +2118,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_1c2_t1_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_1c2_t2_port_network_role:
         type: string
         required: true
@@ -2176,12 +2158,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_1c2_t2_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_1c2_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2692,12 +2668,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
@@ -2762,12 +2732,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pcm_port_1_network:
         type: list
         required: true
@@ -3277,64 +3241,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1b_t1_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_1b_t1_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t1_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
-      compute_b_single_1b_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_1b_t2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -3359,6 +3265,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1b_t1_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
       port_1b_t2_port_vlan_requirements:
         type: list
         required: true
@@ -3371,13 +3281,29 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_subinterface_indicator:
+      port_1b_t1_port_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: boolean
-      port_1b_t1_port_network_role_tag:
+          type: org.openecomp.datatypes.network.IpRequirements
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
@@ -3395,18 +3321,44 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1b_t2_port_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
       port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       compute_b_single_1b_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1b_t2_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     attributes:
       b_single_1b_instance_name:
         type: string
@@ -3859,12 +3811,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_1c1_t2_port_network_role_tag:
         type: string
         required: true
@@ -3993,12 +3939,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_1c1_t1_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_1c1_t1_port_order:
         type: integer
         required: true
@@ -4529,22 +4469,10 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_1a_t2_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_1a_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_1a_t1_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_1a_t2_port_vlan_requirements:
         type: list
         required: true
@@ -5045,12 +4973,6 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_1b_t2_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       compute_b_single_1b_user_data_format:
         type: list
         required: true
@@ -5105,12 +5027,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_1b_t1_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/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index d920487490..166119ea31 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -216,20 +216,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_1b_t1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1b_t2_port_subinterface_indicator:
-        - false
-        compute_b_single_1b_user_data_format:
-        - RAW
         port_1b_t2_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -243,13 +229,23 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1b_t1_port_subinterface_indicator:
-        - false
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
+        compute_b_single_1b_user_data_format:
+        - RAW
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names
@@ -275,9 +271,6 @@ topology_template:
         compute_1c1_scalling_instance_user_data_format:
         - RAW2
         - RAW1
-        port_1c1_t2_port_subinterface_indicator:
-        - false
-        - false
         port_1c1_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
@@ -354,9 +347,6 @@ topology_template:
         compute_1c1_scalling_instance_scheduler_hints:
         - group: BE_Affinity_group
         - group: BE_Affinity_group
-        port_1c1_t1_port_subinterface_indicator:
-        - false
-        - false
         service_template_filter:
           substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -425,8 +415,6 @@ topology_template:
       properties:
         compute_1c2_catalog_instance_availability_zone:
         - get_input: availabilityzone_name
-        port_1c2_t1_port_subinterface_indicator:
-        - false
         vm_flavor_name:
           get_input: pd_flavor_name
         vm_image_name:
@@ -437,8 +425,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1c2_t2_port_subinterface_indicator:
-        - false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -484,8 +470,6 @@ topology_template:
       properties:
         compute_1c2_catalog_instance_availability_zone:
         - get_input: availabilityzone_name
-        port_1c2_t1_port_subinterface_indicator:
-        - false
         vm_flavor_name:
           get_input: pd_flavor_name
         vm_image_name:
@@ -496,8 +480,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1c2_t2_port_subinterface_indicator:
-        - false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -695,10 +677,6 @@ topology_template:
         - get_input: availabilityzone_name
         compute_a_single_1a_scheduler_hints:
         - group: BE_Affinity_group
-        port_1a_t2_port_subinterface_indicator:
-        - false
-        port_1a_t1_port_subinterface_indicator:
-        - false
         compute_a_single_1a_user_data_format:
         - RAW
         compute_a_single_1a_name:
@@ -864,8 +842,6 @@ topology_template:
             is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_1b_t2_port_subinterface_indicator:
-        - false
         compute_b_single_1b_user_data_format:
         - RAW
         port_1b_t2_port_mac_requirements:
@@ -881,8 +857,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1b_t1_port_subinterface_indicator:
-        - false
         port_1b_t1_port_network_role_tag: oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
@@ -1018,4 +992,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
\ No newline at end of file
+      - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index f52324068f..268118dc64 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_1c1_t2_port_network_role_tag:
       type: string
       required: true
@@ -132,11 +127,6 @@ topology_template:
     port_1c1_t1_port_network_role:
       type: string
       required: true
-    port_1c1_t1_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_1c1_t1_port_order:
       type: integer
       required: true
@@ -152,10 +142,7 @@ topology_template:
           get_input: port_1c1_t1_port_exCP_naming
         vlan_requirements:
           get_input: port_1c1_t1_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1c1_t1_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t1_port_ip_requirements
         network_role_tag:
@@ -215,10 +202,7 @@ topology_template:
           get_input: port_1c1_t2_port_exCP_naming
         vlan_requirements:
           get_input: port_1c1_t2_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1c1_t2_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t2_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/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 30ca14f281..2c11c084ec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
     port_1c2_t2_port_subnetpoolid:
       type: string
       required: true
-    port_1c2_t1_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_1c2_t2_port_network_role:
       type: string
       required: true
@@ -58,11 +53,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_1c2_t2_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_1c2_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -151,10 +141,7 @@ topology_template:
           get_input: port_1c2_t2_port_exCP_naming
         vlan_requirements:
           get_input: port_1c2_t2_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1c2_t2_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
           get_input: port_1c2_t1_port_exCP_naming
         vlan_requirements:
           get_input: port_1c2_t1_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1c2_t1_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1c2_t1_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/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
index c72b1eb54c..5169d022a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
@@ -83,19 +83,9 @@ topology_template:
     port_1a_t1_port_order:
       type: integer
       required: true
-    port_1a_t2_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_1a_t2_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_1a_t1_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_1a_t2_port_vlan_requirements:
       type: list
       required: true
@@ -128,10 +118,7 @@ topology_template:
           get_input: port_1a_t1_port_exCP_naming
         vlan_requirements:
           get_input: port_1a_t1_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1a_t1_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
           get_input: port_1a_t2_port_exCP_naming
         vlan_requirements:
           get_input: port_1a_t2_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1a_t2_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1a_t2_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/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
index 3ba6c8079f..391eba68f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
@@ -11,51 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1b_t1_port_order:
-      type: integer
-      required: true
-    port_1b_t1_port_network_role:
-      type: string
-      required: true
-    port_1b_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    vm_flavor_name:
-      type: string
-      required: true
-    port_1b_t1_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_image_name:
-      type: string
-      required: true
-    port_1b_t2_port_network_role:
-      type: string
-      required: true
-    port_1b_t2_port_order:
-      type: integer
-      required: true
-    port_1b_t2_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
-    compute_b_single_1b_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_1b_t2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_1b_t2_port_network_role_tag:
-      type: string
-      required: true
-    port_1b_t2_port_subnetpoolid:
-      type: string
-      required: true
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -76,6 +31,9 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_1b_t1_port_order:
+      type: integer
+      required: true
     port_1b_t2_port_vlan_requirements:
       type: list
       required: true
@@ -86,12 +44,24 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_subinterface_indicator:
+    port_1b_t1_port_network_role:
+      type: string
+      required: true
+    port_1b_t1_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_network_role_tag:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: boolean
-    port_1b_t1_port_network_role_tag:
+        type: org.openecomp.datatypes.network.IpRequirements
+    vm_image_name:
       type: string
       required: true
     port_1b_t1_port_subnetpoolid:
@@ -105,16 +75,36 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_1b_t2_port_network_role:
+      type: string
+      required: true
+    port_1b_t2_port_order:
+      type: integer
+      required: true
     port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     compute_b_single_1b_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1b_t2_port_network_role_tag:
+      type: string
+      required: true
+    port_1b_t2_port_subnetpoolid:
+      type: string
+      required: true
   node_templates:
     b_single_1b:
       type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b
@@ -146,10 +136,7 @@ topology_template:
           get_input: port_1b_t1_port_exCP_naming
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1b_t1_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -178,10 +165,7 @@ topology_template:
           get_input: port_1b_t2_port_exCP_naming
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1b_t2_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1b_t2_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/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 06e90acd93..ed3dde70f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
     port_1b_t2_port_order:
       type: integer
       required: true
-    port_1b_t2_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     compute_b_single_1b_user_data_format:
       type: list
       required: true
@@ -86,11 +81,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_1b_t1_port_network_role_tag:
       type: string
       required: true
@@ -151,10 +141,7 @@ topology_template:
           get_input: port_1b_t1_port_exCP_naming
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1b_t1_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
           get_input: port_1b_t2_port_exCP_naming
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_1b_t2_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_1b_t2_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/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
index 45191338e8..42c8b54010 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_pcm_port_2_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pcm_port_3_network_role:
       type: string
       required: true
@@ -106,11 +101,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pcm_port_3_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pcm_port_2_order:
       type: integer
       required: true
@@ -188,10 +178,7 @@ topology_template:
           get_input: port_pcm_port_3_exCP_naming
         vlan_requirements:
           get_input: port_pcm_port_3_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pcm_port_3_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_3_ip_requirements
         network_role_tag:
@@ -228,10 +215,7 @@ topology_template:
           get_input: port_pcm_port_2_exCP_naming
         vlan_requirements:
           get_input: port_pcm_port_2_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pcm_port_2_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_2_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/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
index 7a3ec20712..d42796a554 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
     port_pcm_port_0_network_role:
       type: string
       required: true
-    port_pcm_port_0_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pcm_port_1_network_role_tag:
       type: string
       required: true
@@ -69,11 +64,6 @@ topology_template:
     port_pcm_port_1_network_role:
       type: string
       required: true
-    port_pcm_port_1_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_pcm_port_1_network:
       type: list
       required: true
@@ -179,10 +169,7 @@ topology_template:
           get_input: port_pcm_port_0_exCP_naming
         vlan_requirements:
           get_input: port_pcm_port_0_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pcm_port_0_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         network_role_tag:
@@ -219,10 +206,7 @@ topology_template:
           get_input: port_pcm_port_1_exCP_naming
         vlan_requirements:
           get_input: port_pcm_port_1_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pcm_port_1_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_1_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/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 564dc8e9f8..3398598b22 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -108,8 +108,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_0_subinterface_indicator:
-        - false
         port_pcm_port_1_network_role_tag: oam
         port_pcm_port_0_fixed_ips:
         - ip_address:
@@ -123,8 +121,6 @@ topology_template:
         vm_image_name:
           get_input: pcma_image_name
         port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_1_subinterface_indicator:
-        - false
         port_pcm_port_1_network:
         - get_input: oam_net_name
         port_pcm_port_0_ip_requirements:
@@ -177,8 +173,6 @@ topology_template:
         port_pcm_port_2_fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        port_pcm_port_2_subinterface_indicator:
-        - false
         vm_flavor_name:
           get_input: pcma_flavor_name
         port_pcm_port_3_security_groups:
@@ -206,8 +200,6 @@ topology_template:
             get_input: oam_net_ip
         compute_pcma_server_user_data_format:
         - RAW
-        port_pcm_port_3_subinterface_indicator:
-        - false
         port_pcm_port_2_network:
         - get_input: cps_net_name
         port_pcm_port_2_ip_requirements:
@@ -673,4 +665,4 @@ topology_template:
       - dependency_pcma_server_pcm_port_1
       dependency_pcm_port_2:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_2
\ No newline at end of file
+      - dependency_pcma_server_pcm_port_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index a99b0d53d2..7b34372e08 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -166,6 +166,7 @@ topology_template:
           get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_00_mac_requirements
+        subinterface_indicator: false
         exCP_naming:
           get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
@@ -213,6 +214,7 @@ topology_template:
           get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
+        subinterface_indicator: false
         exCP_naming:
           get_input: port_pcm_port_01_exCP_naming
         vlan_requirements: