Added new nodes type

Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.

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

12 files changed, 467 insertions, 195 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0cc801ed3d..7087e7d068 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,20 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.FSB1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB1_Internal_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal_2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -30,74 +22,142 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_subnetpoolid:
+      compute_FSB1_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_OAM_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
+      port_FSB2_Internal_2_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_FSB1_metadata:
+      port_FSB1_OAM_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_FSB2_Internal_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB1_Internal_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB1_Internal_network:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_ip_requirements:
+        entry_schema:
+          type: string
+      port_FSB2_Internal_1_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal_2_order:
-        type: integer
+      port_FSB1_OAM_network:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_1_mac_address:
+        entry_schema:
+          type: string
+      port_FSB2_Internal_1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_2_network_role:
         type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_FSB1_OAM_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_2_mac_address:
+      port_FSB2_Internal_1_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_1_ip_requirements:
+      port_FSB2_Internal_2_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_1_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_mac_address:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_2_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_FSB1_OAM_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_1_subinterface_indicator:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal_2_vlan_requirements:
+          type: boolean
+      port_FSB1_OAM_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB1_OAM_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_Internal_network_role_tag:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_1_mac_address:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_vlan_requirements:
+      port_FSB2_Internal_2_mac_address:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_Internal_vlan_requirements:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_2_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB1_Internal_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       port_FSB1_Internal_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -114,13 +174,13 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      compute_FSB1_availability_zone:
+      port_FSB1_Internal_subinterface_indicator:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB1_Internal_network:
+          type: boolean
+      compute_FSB1_availability_zone:
         type: list
         required: true
         status: SUPPORTED
@@ -134,16 +194,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB2_Internal_1_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_2_ip_requirements:
+      port_FSB2_Internal_2_subinterface_indicator:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: boolean
       port_FSB1_OAM_order:
         type: integer
         required: true
@@ -154,28 +210,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal_1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB2_Internal_2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal_2_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_1_network_role_tag:
         type: string
         required: true
@@ -184,14 +224,6 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_1_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
@@ -212,18 +244,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_FSB2_Internal_2_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_1_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
     requirements:
     - dependency_FSB1_FSB1_Internal:
         capability: tosca.capabilities.Node
@@ -326,6 +350,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -333,6 +358,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -522,6 +548,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -581,6 +608,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
index 535fa50cf3..29f618cc5b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
@@ -11,34 +11,98 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_FSB1_Internal_mac_address:
-      type: string
-      required: true
     port_FSB1_Internal_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB2_Internal_2_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
     port_FSB2_Internal_2_subnetpoolid:
       type: string
       required: true
-    port_FSB1_OAM_subnetpoolid:
-      type: string
-      required: true
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_FSB1_OAM_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
+    port_FSB2_Internal_2_order:
+      type: integer
+      required: true
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB1_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB1_Internal_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_1_order:
+      type: integer
+      required: true
+    port_FSB2_Internal_2_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB1_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_2_network_role:
+      type: string
+      required: true
+    port_FSB1_OAM_network_role:
+      type: string
+      required: true
+    port_FSB2_Internal_1_network_role:
+      type: string
+      required: true
+    port_FSB2_Internal_2_network_role_tag:
+      type: string
+      required: true
+    port_FSB2_Internal_1_subnetpoolid:
+      type: string
+      required: true
+    port_FSB1_Internal_mac_address:
+      type: string
+      required: true
+    port_FSB2_Internal_2_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_FSB1_OAM_subnetpoolid:
+      type: string
+      required: true
     port_FSB2_Internal_1_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_FSB2_Internal_1_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_OAM_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -47,15 +111,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB2_Internal_2_order:
-      type: integer
-      required: true
     port_FSB2_Internal_1_mac_address:
       type: string
       required: true
-    vm_flavor_name:
-      type: string
-      required: true
     port_FSB2_Internal_2_mac_address:
       type: string
       required: true
@@ -72,16 +130,6 @@ topology_template:
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
-    port_FSB1_OAM_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB1_Internal_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB1_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -94,12 +142,12 @@ topology_template:
     port_FSB1_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    compute_FSB1_availability_zone:
+    port_FSB1_Internal_subinterface_indicator:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB1_Internal_network:
+        type: boolean
+    compute_FSB1_availability_zone:
       type: list
       required: true
       entry_schema:
@@ -111,14 +159,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB2_Internal_1_order:
-      type: integer
-      required: true
-    port_FSB2_Internal_2_ip_requirements:
+    port_FSB2_Internal_2_subinterface_indicator:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
+        type: boolean
     port_FSB1_OAM_order:
       type: integer
       required: true
@@ -127,36 +172,17 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB1_OAM_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_FSB2_Internal_1_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_FSB2_Internal_2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal_2_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_1_network_role_tag:
       type: string
       required: true
     port_FSB1_Internal_order:
       type: integer
       required: true
-    port_FSB1_OAM_network_role:
-      type: string
-      required: true
-    port_FSB2_Internal_1_network_role:
-      type: string
-      required: true
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -173,15 +199,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_FSB2_Internal_2_network_role_tag:
-      type: string
-      required: true
     port_FSB2_Internal_2_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_FSB2_Internal_1_subnetpoolid:
-      type: string
-      required: true
   node_templates:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -190,6 +210,10 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -220,6 +244,10 @@ topology_template:
           get_input: port_FSB2_Internal_1_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_1_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB2_Internal_1_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB2_Internal_1_ip_requirements
         network_role_tag:
@@ -250,6 +278,10 @@ topology_template:
           get_input: port_FSB2_Internal_2_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_2_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB2_Internal_2_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB2_Internal_2_ip_requirements
         network_role_tag:
@@ -280,6 +312,10 @@ topology_template:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_OAM_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_OAM_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_OAM_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/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8c748e2a2e..e21fa17343 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -42,6 +42,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_FSB1_OAM_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -98,6 +104,12 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -154,6 +166,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB2_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
@@ -249,6 +267,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -423,6 +442,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -470,6 +490,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
index e5ebd6aa8b..e1a6f40602 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
@@ -38,6 +38,11 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
+    port_FSB1_OAM_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_OAM_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -82,6 +87,11 @@ topology_template:
     port_FSB1_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_FSB1_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -127,6 +137,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB2_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -154,6 +169,10 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -184,6 +203,10 @@ topology_template:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB2_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
         network_role_tag:
@@ -214,6 +237,10 @@ topology_template:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_OAM_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_OAM_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_OAM_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/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 504c059abd..8113a8048f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -74,6 +74,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -116,6 +122,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB2_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_Internal_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -203,6 +215,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -355,6 +368,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
index 3509df1630..72d2ee6f1f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -63,6 +63,11 @@ topology_template:
     port_FSB1_Internal_network_role:
       type: string
       required: true
+    port_FSB1_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -97,6 +102,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB2_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -116,6 +126,10 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -146,6 +160,10 @@ topology_template:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB2_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB2_Internal_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/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d197cd7c54..52effbbc3a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -42,6 +42,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_FSB1_OAM_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -98,6 +104,12 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -154,6 +166,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB2_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
@@ -273,6 +291,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -447,6 +466,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -494,6 +514,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
index c72dee50d8..0fb34fd252 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -38,6 +38,11 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
+    port_FSB1_OAM_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_OAM_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -82,6 +87,11 @@ topology_template:
     port_FSB1_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_FSB1_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -127,6 +137,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB2_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -154,6 +169,10 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -184,6 +203,10 @@ topology_template:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB2_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
         network_role_tag:
@@ -214,6 +237,10 @@ topology_template:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_OAM_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_OAM_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_OAM_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/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6e788ce110..c88962628d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,48 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_FSB2_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB2_Internal_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -56,52 +98,30 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_mac_address:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB1_Internal_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal_subnetpoolid:
-        type: string
+      port_FSB2_Internal_subinterface_indicator:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_Internal_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -112,14 +132,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_network_role_tag:
         type: string
         required: true
@@ -197,6 +209,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -349,6 +362,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
index 69b999862e..b1ba634c79 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -35,6 +35,39 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB2_Internal_network_role:
+      type: string
+      required: true
+    port_FSB1_Internal_network_role_tag:
+      type: string
+      required: true
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB2_Internal_subnetpoolid:
+      type: string
+      required: true
+    port_FSB1_Internal_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_FSB1_Internal_network_role:
+      type: string
+      required: true
+    port_FSB1_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -50,42 +83,25 @@ topology_template:
     port_FSB2_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_FSB2_Internal_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_flavor_name:
-      type: string
-      required: true
     port_FSB2_Internal_mac_address:
       type: string
       required: true
-    port_FSB2_Internal_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_FSB1_Internal_network_role_tag:
-      type: string
-      required: true
     port_FSB1_Internal_order:
       type: integer
       required: true
-    port_FSB1_Internal_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal_subnetpoolid:
-      type: string
+    port_FSB2_Internal_subinterface_indicator:
+      type: list
       required: true
+      entry_schema:
+        type: boolean
     port_FSB1_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -94,12 +110,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_FSB1_Internal_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_network_role_tag:
       type: string
       required: true
@@ -111,6 +121,10 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -137,18 +151,24 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_order
+        mac_address:
+          get_input: port_FSB2_Internal_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB2_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_order
         network_role:
           get_input: port_FSB2_Internal_network_role
         subnetpoolid:
@@ -161,8 +181,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8b3a09474c..7fd691c1d9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -36,6 +36,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_FSB1_OAM_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -92,6 +98,12 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_Internal_network:
         type: list
         required: true
@@ -142,6 +154,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB2_Internal_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
@@ -255,6 +273,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -429,6 +448,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -476,6 +496,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
index 12cc87e626..f0a87d321a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -33,6 +33,11 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
+    port_FSB1_OAM_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_OAM_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -77,6 +82,11 @@ topology_template:
     port_FSB1_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_FSB1_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_Internal_network:
       type: list
       required: true
@@ -117,6 +127,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB2_Internal_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -139,6 +154,10 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -169,6 +188,10 @@ topology_template:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB2_Internal_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
         network_role_tag:
@@ -199,6 +222,10 @@ topology_template:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_OAM_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_FSB1_OAM_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_FSB1_OAM_ip_requirements
         network_role_tag: