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>

7 files changed, 140 insertions, 12 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 593d700c0f..ac8621e29b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -729,6 +729,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
@@ -748,6 +749,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
@@ -864,6 +866,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_5_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       compute_cmaui_availability_zone:
         type: list
         required: true
@@ -952,6 +960,12 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_cmaui_port_6_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_cmaui_port_5_vlan_requirements:
         type: list
         required: true
@@ -1119,6 +1133,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
@@ -1137,6 +1152,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
@@ -1429,6 +1445,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_4_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_cmaui_port_4_fixed_ips:
         type: list
         required: true
@@ -1509,6 +1531,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_cmaui_port_3_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_cmaui_port_4_network_role_tag:
         type: string
         required: true
@@ -1689,6 +1717,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
@@ -1712,6 +1741,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
@@ -2228,6 +2258,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
@@ -2288,6 +2319,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
@@ -2317,6 +2349,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
@@ -2441,6 +2474,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
@@ -2514,6 +2548,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
@@ -2521,6 +2556,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
@@ -3236,6 +3272,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
@@ -3586,6 +3623,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
@@ -3770,6 +3808,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cmaui_port_2_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_cmaui_port_1_security_groups:
         type: list
         required: true
@@ -3858,6 +3902,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_cmaui_port_1_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_cmaui_port_1_replacement_policy:
         type: list
         required: true
@@ -4040,6 +4090,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
@@ -4057,6 +4108,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
@@ -4725,6 +4777,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
@@ -4732,6 +4785,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
@@ -4767,6 +4821,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
@@ -5021,6 +5076,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
@@ -5082,6 +5138,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
@@ -5461,6 +5518,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
@@ -6087,6 +6145,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
@@ -6100,6 +6159,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
@@ -6236,6 +6296,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
@@ -6384,6 +6445,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/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
index c457e4de3d..1fc1065837 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_5_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     compute_cmaui_availability_zone:
       type: list
       required: true
@@ -108,6 +113,11 @@ topology_template:
     port_cmaui_port_5_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_cmaui_port_6_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_cmaui_port_5_vlan_requirements:
       type: list
       required: true
@@ -150,18 +160,22 @@ topology_template:
           get_input: port_cmaui_port_5_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_5_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_cmaui_port_5_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_cmaui_port_5_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_5_network_role_tag
         network_role:
           get_input: port_cmaui_port_5_network_role
+        subnetpoolid:
+          get_input: port_cmaui_port_5_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_5_fixed_ips
           - index_value
-        subnetpoolid:
-          get_input: port_cmaui_port_5_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_5_network
@@ -190,18 +204,22 @@ topology_template:
           get_input: port_cmaui_port_6_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_6_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_cmaui_port_6_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_cmaui_port_6_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_6_network_role_tag
         network_role:
           get_input: port_cmaui_port_6_network_role
+        subnetpoolid:
+          get_input: port_cmaui_port_6_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_6_fixed_ips
           - index_value
-        subnetpoolid:
-          get_input: port_cmaui_port_6_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_6_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
index 88e7795e76..178821d0f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
@@ -28,6 +28,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_4_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_cmaui_port_4_fixed_ips:
       type: list
       required: true
@@ -93,6 +98,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_cmaui_port_3_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_cmaui_port_4_network_role_tag:
       type: string
       required: true
@@ -150,18 +160,22 @@ topology_template:
           get_input: port_cmaui_port_4_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_4_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_cmaui_port_4_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_cmaui_port_4_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_4_network_role_tag
         network_role:
           get_input: port_cmaui_port_4_network_role
+        subnetpoolid:
+          get_input: port_cmaui_port_4_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_4_fixed_ips
           - index_value
-        subnetpoolid:
-          get_input: port_cmaui_port_4_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_4_network
@@ -190,18 +204,22 @@ topology_template:
           get_input: port_cmaui_port_3_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_3_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_cmaui_port_3_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_cmaui_port_3_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_3_network_role_tag
         network_role:
           get_input: port_cmaui_port_3_network_role
+        subnetpoolid:
+          get_input: port_cmaui_port_3_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_3_fixed_ips
           - index_value
-        subnetpoolid:
-          get_input: port_cmaui_port_3_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_3_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
index 2b0f9eec43..934995a586 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
@@ -20,6 +20,11 @@ topology_template:
     port_cmaui_port_1_subnetpoolid:
       type: string
       required: true
+    port_cmaui_port_2_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_cmaui_port_1_security_groups:
       type: list
       required: true
@@ -91,6 +96,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_cmaui_port_1_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_cmaui_port_1_replacement_policy:
       type: list
       required: true
@@ -150,18 +160,22 @@ topology_template:
           get_input: port_cmaui_port_1_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_1_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_cmaui_port_1_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_cmaui_port_1_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_1_network_role_tag
         network_role:
           get_input: port_cmaui_port_1_network_role
+        subnetpoolid:
+          get_input: port_cmaui_port_1_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_1_fixed_ips
           - index_value
-        subnetpoolid:
-          get_input: port_cmaui_port_1_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_1_network
@@ -190,18 +204,22 @@ topology_template:
           get_input: port_cmaui_port_2_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_2_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_cmaui_port_2_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_cmaui_port_2_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_2_network_role_tag
         network_role:
           get_input: port_cmaui_port_2_network_role
+        subnetpoolid:
+          get_input: port_cmaui_port_2_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_2_fixed_ips
           - index_value
-        subnetpoolid:
-          get_input: port_cmaui_port_2_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_2_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
index 874a66235e..cacc945f82 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
@@ -62,6 +62,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_cmaui_port_2_subinterface_indicator:
+        - true
         port_cmaui_port_1_security_groups:
         - - get_input: p1
           - get_input: p2
@@ -104,6 +106,8 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        port_cmaui_port_1_subinterface_indicator:
+        - true
         port_cmaui_port_1_replacement_policy:
         - AUTO
         port_cmaui_port_2_replacement_policy:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
index a1af262451..0b844f9664 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
@@ -89,6 +89,8 @@ topology_template:
         - get_input:
           - cmaui_names
           - 0
+        port_cmaui_port_4_subinterface_indicator:
+        - true
         port_cmaui_port_4_fixed_ips:
         - ip_address:
             get_input:
@@ -121,6 +123,8 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        port_cmaui_port_3_subinterface_indicator:
+        - true
         port_cmaui_port_4_replacement_policy:
         - AUTO
         port_cmaui_port_3_replacement_policy:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
index bfff4ade12..5f47aa5ee7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
@@ -115,6 +115,8 @@ topology_template:
         - get_input:
           - cmaui_names
           - 0
+        port_cmaui_port_5_subinterface_indicator:
+        - true
         compute_cmaui_availability_zone:
         - get_input: availability_zone_0
         vm_image_name:
@@ -159,6 +161,8 @@ topology_template:
         port_cmaui_port_5_mac_requirements:
           mac_count_required:
             is_required: false
+        port_cmaui_port_6_subinterface_indicator:
+        - true
         port_cmaui_port_6_mac_requirements:
           mac_count_required:
             is_required: false