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>

25 files changed, 260 insertions, 80 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 43b1e55eff..95f99fc457 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -117,7 +123,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_1_pd_server_pd01_port_nested:
+    - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -345,6 +351,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
@@ -529,7 +536,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_1:
+    - subinterface_link_template_Vlan_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -603,6 +610,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_ps01_port_order:
         type: integer
         required: true
@@ -660,7 +673,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_1_ps_server_ps01_port_nested:
+    - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -955,6 +968,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
@@ -1015,4 +1029,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml
index 885ae52726..0ea4a68d1e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml
@@ -738,6 +738,8 @@ topology_template:
             is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_subinterface_indicator:
+        - true
         subinterface_nested_net1:
         - test_net1
         port_pd01_port_network_role_tag: oam
@@ -752,7 +754,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_1_pd_server_pd01_port_nested:
+      - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -775,6 +777,8 @@ topology_template:
           get_input: pd_flavor_name
         subinterface_nested_p1:
         - ps01_port_0
+        port_ps01_port_subinterface_indicator:
+        - true
         vm_image_name:
           get_input: pd_image_name
         port_ps01_port_mac_requirements:
@@ -805,7 +809,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_1_ps_server_ps01_port_nested:
+      - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -819,4 +823,4 @@ topology_template:
       - test_net2
       - test_net1
       - abstract_pd_server
-      - abstract_ps_server
\ No newline at end of file
+      - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index 9bec8b6463..ae47cfa092 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,6 +60,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -139,6 +144,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -341,12 +350,12 @@ topology_template:
       dependency_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
       - dependency
-      link_template_Vlan_1_pd_server_pd01_port_nested:
-      - pd_server_pd01_port_nested
-      - link_template_Vlan_1
       dependency_pd_server:
       - pd_server
       - dependency
+      subinterface_link_template_Vlan_1_pd_server_pd01_port_nested:
+      - pd_server_pd01_port_nested
+      - subinterface_link_template_Vlan_1
       dependency_template_Vlan_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - dependency_template_Vlan_1
\ No newline at end of file
+      - dependency_template_Vlan_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
index d05d3f6aca..cbe6b147ec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
@@ -54,6 +54,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_ps01_port_order:
       type: integer
       required: true
@@ -139,6 +144,10 @@ topology_template:
           get_input: port_ps01_port_exCP_naming
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_ps01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -329,6 +338,9 @@ topology_template:
       - ps_server_ps01_port
       - network.outgoing.bytes
     requirements:
+      subinterface_link_template_Vlan_1_ps_server_ps01_port_nested:
+      - ps_server_ps01_port_nested
+      - subinterface_link_template_Vlan_1
       dependency_ps_server:
       - ps_server
       - dependency
@@ -344,9 +356,6 @@ topology_template:
       dependency_template_Vlan_1_ps_server_ps01_port_nested:
       - ps_server_ps01_port_nested
       - dependency_template_Vlan_1
-      link_template_Vlan_1_ps_server_ps01_port_nested:
-      - ps_server_ps01_port_nested
-      - link_template_Vlan_1
       local_storage_ps_server:
       - ps_server
-      - local_storage
\ No newline at end of file
+      - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml
index a82a0563f8..7f0188fcfe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: float
   node_templates:
     template_Vlan_1:
-      type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
       properties:
         virtual_machine_interface_refs:
         - get_input: p1
@@ -111,9 +111,9 @@ topology_template:
       dependency_template_Vlan_1:
       - template_Vlan_1
       - dependency
-      link_template_Vlan_1:
+      subinterface_link_template_Vlan_1:
       - template_Vlan_1
-      - link
+      - subinterface_link
       binding_template_Vlan_1:
       - template_Vlan_1
       - binding
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a839d67cc1..d6fa3c4559 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,6 +56,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -297,6 +303,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
@@ -488,6 +495,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -537,7 +550,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+    - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -765,6 +778,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
@@ -949,7 +963,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1:
+    - subinterface_link_template_Vlan_vmi_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -967,4 +981,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml
index 57be376a5d..3284aad2f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml
@@ -734,6 +734,8 @@ topology_template:
             is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_subinterface_indicator:
+        - true
         port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
@@ -780,6 +782,8 @@ topology_template:
             is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_subinterface_indicator:
+        - true
         subinterface_nested_net1:
         - test_net1
         port_pd01_port_network_role_tag: oam
@@ -794,7 +798,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+      - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -808,4 +812,4 @@ topology_template:
       - test_net2
       - test_net1
       - abstract_pd_server
-      - abstract_pd_server_1
\ No newline at end of file
+      - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
index 3d9ebd74ae..54070a9852 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,6 +50,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -99,6 +104,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
index 537d0dbef7..0ca34a79a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -60,6 +60,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -139,6 +144,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -332,9 +341,6 @@ topology_template:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
-      - pd_server_pd01_port_nested
-      - link_template_Vlan_vmi_1
       link_pd_server_pd01_port:
       - pd_server_pd01_port
       - link
@@ -349,4 +355,7 @@ topology_template:
       - dependency
       dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - dependency_template_Vlan_vmi_1
\ No newline at end of file
+      - dependency_template_Vlan_vmi_1
+      subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+      - pd_server_pd01_port_nested
+      - subinterface_link_template_Vlan_vmi_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml
index bbc48d76ec..c5195c51e1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: float
   node_templates:
     template_Vlan_vmi_1:
-      type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
       properties:
         virtual_machine_interface_refs:
         - get_input: p1
@@ -108,12 +108,12 @@ topology_template:
       - template_Vlan_vmi_1
       - feature
     requirements:
-      link_template_Vlan_vmi_1:
-      - template_Vlan_vmi_1
-      - link
       dependency_template_Vlan_vmi_1:
       - template_Vlan_vmi_1
       - dependency
+      subinterface_link_template_Vlan_vmi_1:
+      - template_Vlan_vmi_1
+      - subinterface_link
       binding_template_Vlan_vmi_1:
       - template_Vlan_vmi_1
       - binding
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 43b1e55eff..95f99fc457 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -117,7 +123,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_1_pd_server_pd01_port_nested:
+    - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -345,6 +351,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
@@ -529,7 +536,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_1:
+    - subinterface_link_template_Vlan_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -603,6 +610,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_ps01_port_order:
         type: integer
         required: true
@@ -660,7 +673,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_1_ps_server_ps01_port_nested:
+    - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -955,6 +968,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
@@ -1015,4 +1029,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml
index 5f16f354ab..bb8c2a7214 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml
@@ -736,6 +736,8 @@ topology_template:
             is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_subinterface_indicator:
+        - true
         subinterface_nested_net1:
         - test_net1
         port_pd01_port_network_role_tag: oam
@@ -750,7 +752,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_1_pd_server_pd01_port_nested:
+      - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -771,6 +773,8 @@ topology_template:
           get_input: pd_flavor_name
         subinterface_nested_p1:
         - ps01_port_0
+        port_ps01_port_subinterface_indicator:
+        - true
         vm_image_name:
           get_input: pd_image_name
         port_ps01_port_mac_requirements:
@@ -801,7 +805,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_1_ps_server_ps01_port_nested:
+      - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index e54889ba0f..8a4a553505 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,6 +60,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -138,6 +143,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -340,12 +349,12 @@ topology_template:
       dependency_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
       - dependency
-      link_template_Vlan_1_pd_server_pd01_port_nested:
-      - pd_server_pd01_port_nested
-      - link_template_Vlan_1
       dependency_pd_server:
       - pd_server
       - dependency
+      subinterface_link_template_Vlan_1_pd_server_pd01_port_nested:
+      - pd_server_pd01_port_nested
+      - subinterface_link_template_Vlan_1
       dependency_template_Vlan_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - dependency_template_Vlan_1
\ No newline at end of file
+      - dependency_template_Vlan_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
index d90ee86983..dd03ca0248 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
@@ -54,6 +54,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_ps01_port_order:
       type: integer
       required: true
@@ -138,6 +143,10 @@ topology_template:
           get_input: port_ps01_port_exCP_naming
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_ps01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -328,6 +337,9 @@ topology_template:
       - ps_server_ps01_port
       - network.outgoing.bytes
     requirements:
+      subinterface_link_template_Vlan_1_ps_server_ps01_port_nested:
+      - ps_server_ps01_port_nested
+      - subinterface_link_template_Vlan_1
       dependency_ps_server:
       - ps_server
       - dependency
@@ -343,9 +355,6 @@ topology_template:
       dependency_template_Vlan_1_ps_server_ps01_port_nested:
       - ps_server_ps01_port_nested
       - dependency_template_Vlan_1
-      link_template_Vlan_1_ps_server_ps01_port_nested:
-      - ps_server_ps01_port_nested
-      - link_template_Vlan_1
       local_storage_ps_server:
       - ps_server
-      - local_storage
\ No newline at end of file
+      - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml
index a82a0563f8..7f0188fcfe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: float
   node_templates:
     template_Vlan_1:
-      type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
       properties:
         virtual_machine_interface_refs:
         - get_input: p1
@@ -111,9 +111,9 @@ topology_template:
       dependency_template_Vlan_1:
       - template_Vlan_1
       - dependency
-      link_template_Vlan_1:
+      subinterface_link_template_Vlan_1:
       - template_Vlan_1
-      - link
+      - subinterface_link
       binding_template_Vlan_1:
       - template_Vlan_1
       - binding
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 62d9868dd6..eb19ee1ea8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,6 +54,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_ps01_port_order:
         type: integer
         required: true
@@ -117,7 +123,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1_pd_server_ps01_port_nested:
+    - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -417,6 +423,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
@@ -536,6 +543,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -585,7 +598,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+    - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -813,6 +826,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
@@ -997,7 +1011,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1:
+    - subinterface_link_template_Vlan_vmi_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1015,4 +1029,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml
index d18b63d88b..4c70e386ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml
@@ -720,6 +720,8 @@ topology_template:
           get_input: pd_flavor_name
         subinterface_nested_p1:
         - ps01_port_0
+        port_ps01_port_subinterface_indicator:
+        - true
         vm_image_name:
           get_input: pd_image_name
         port_ps01_port_mac_requirements:
@@ -752,7 +754,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_vmi_1_pd_server_ps01_port_nested:
+      - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -791,6 +793,8 @@ topology_template:
             is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_subinterface_indicator:
+        - true
         subinterface_nested_net1:
         - test_net1
         port_pd01_port_network_role_tag: oam
@@ -805,7 +809,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+      - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -819,4 +823,4 @@ topology_template:
       - test_net2
       - test_net1
       - abstract_pd_server
-      - abstract_pd_server_1
\ No newline at end of file
+      - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index 6a798fde3e..66c054bc84 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -49,6 +49,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_ps01_port_order:
       type: integer
       required: true
@@ -120,6 +125,10 @@ topology_template:
           get_input: port_ps01_port_exCP_naming
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_ps01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -329,9 +338,6 @@ topology_template:
       - pd_server
       - disk.device.iops
     requirements:
-      link_template_Vlan_vmi_1_pd_server_ps01_port_nested:
-      - pd_server_ps01_port_nested
-      - link_template_Vlan_vmi_1
       local_storage_pd_server:
       - pd_server
       - local_storage
@@ -347,6 +353,9 @@ topology_template:
       dependency_pd_server:
       - pd_server
       - dependency
+      subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested:
+      - pd_server_ps01_port_nested
+      - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_ps01_port_nested:
       - pd_server_ps01_port_nested
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
index 537d0dbef7..0ca34a79a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -60,6 +60,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -139,6 +144,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -332,9 +341,6 @@ topology_template:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
-      - pd_server_pd01_port_nested
-      - link_template_Vlan_vmi_1
       link_pd_server_pd01_port:
       - pd_server_pd01_port
       - link
@@ -349,4 +355,7 @@ topology_template:
       - dependency
       dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - dependency_template_Vlan_vmi_1
\ No newline at end of file
+      - dependency_template_Vlan_vmi_1
+      subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+      - pd_server_pd01_port_nested
+      - subinterface_link_template_Vlan_vmi_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml
index bbc48d76ec..c5195c51e1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: float
   node_templates:
     template_Vlan_vmi_1:
-      type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
       properties:
         virtual_machine_interface_refs:
         - get_input: p1
@@ -108,12 +108,12 @@ topology_template:
       - template_Vlan_vmi_1
       - feature
     requirements:
-      link_template_Vlan_vmi_1:
-      - template_Vlan_vmi_1
-      - link
       dependency_template_Vlan_vmi_1:
       - template_Vlan_vmi_1
       - dependency
+      subinterface_link_template_Vlan_vmi_1:
+      - template_Vlan_vmi_1
+      - subinterface_link
       binding_template_Vlan_vmi_1:
       - template_Vlan_vmi_1
       - binding
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a839d67cc1..d6fa3c4559 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,6 +56,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -297,6 +303,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
@@ -488,6 +495,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -537,7 +550,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+    - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -765,6 +778,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
@@ -949,7 +963,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1:
+    - subinterface_link_template_Vlan_vmi_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -967,4 +981,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml
index 57be376a5d..3284aad2f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml
@@ -734,6 +734,8 @@ topology_template:
             is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_subinterface_indicator:
+        - true
         port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
@@ -780,6 +782,8 @@ topology_template:
             is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_subinterface_indicator:
+        - true
         subinterface_nested_net1:
         - test_net1
         port_pd01_port_network_role_tag: oam
@@ -794,7 +798,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+      - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -808,4 +812,4 @@ topology_template:
       - test_net2
       - test_net1
       - abstract_pd_server
-      - abstract_pd_server_1
\ No newline at end of file
+      - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
index 3d9ebd74ae..54070a9852 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,6 +50,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -99,6 +104,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
index 537d0dbef7..0ca34a79a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -60,6 +60,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -139,6 +144,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -332,9 +341,6 @@ topology_template:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
-      - pd_server_pd01_port_nested
-      - link_template_Vlan_vmi_1
       link_pd_server_pd01_port:
       - pd_server_pd01_port
       - link
@@ -349,4 +355,7 @@ topology_template:
       - dependency
       dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - dependency_template_Vlan_vmi_1
\ No newline at end of file
+      - dependency_template_Vlan_vmi_1
+      subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
+      - pd_server_pd01_port_nested
+      - subinterface_link_template_Vlan_vmi_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml
index bbc48d76ec..c5195c51e1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: float
   node_templates:
     template_Vlan_vmi_1:
-      type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
       properties:
         virtual_machine_interface_refs:
         - get_input: p1
@@ -108,12 +108,12 @@ topology_template:
       - template_Vlan_vmi_1
       - feature
     requirements:
-      link_template_Vlan_vmi_1:
-      - template_Vlan_vmi_1
-      - link
       dependency_template_Vlan_vmi_1:
       - template_Vlan_vmi_1
       - dependency
+      subinterface_link_template_Vlan_vmi_1:
+      - template_Vlan_vmi_1
+      - subinterface_link
       binding_template_Vlan_vmi_1:
       - template_Vlan_vmi_1
       - binding