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, 108 insertions, 32 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b976cba502..1849248662 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -48,6 +48,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd_server_port_network_role_tag:
         type: string
         required: true
@@ -375,6 +381,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
@@ -894,6 +901,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
@@ -990,6 +998,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
@@ -1446,6 +1455,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
@@ -1796,6 +1806,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
@@ -1964,6 +1975,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_oam_server_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_oam_server_port_replacement_policy:
         type: list
         required: true
@@ -2210,6 +2227,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
@@ -2416,6 +2434,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_sm_server_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       compute_sm_server_name:
         type: list
         required: true
@@ -2493,6 +2517,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
@@ -2856,6 +2881,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_ps_server_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_ps_server_port_ip_requirements:
         type: list
         required: true
@@ -3165,6 +3196,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/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
index faffcfb4aa..3a5ee71b1a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
@@ -26,6 +26,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_oam_server_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_oam_server_port_replacement_policy:
       type: list
       required: true
@@ -96,30 +101,34 @@ topology_template:
     oam_server_oam_server_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_oam_server_port_exCP_naming
         replacement_policy:
           get_input:
           - port_oam_server_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_oam_server_port_mac_requirements
+        order:
+          get_input: port_oam_server_port_order
+        exCP_naming:
+          get_input: port_oam_server_port_exCP_naming
         vlan_requirements:
           get_input: port_oam_server_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_oam_server_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_oam_server_port_ip_requirements
         network_role_tag:
           get_input: port_oam_server_port_network_role_tag
-        mac_requirements:
-          get_input: port_oam_server_port_mac_requirements
-        order:
-          get_input: port_oam_server_port_order
         network_role:
           get_input: port_oam_server_port_network_role
-        subnetpoolid:
-          get_input: port_oam_server_port_subnetpoolid
         fixed_ips:
           get_input:
           - port_oam_server_port_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_oam_server_port_subnetpoolid
         network:
           get_input:
           - port_oam_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
index 7e85a3b36c..54906d7701 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_pd_server_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd_server_port_network_role_tag:
       type: string
       required: true
@@ -96,30 +101,34 @@ topology_template:
     pd_server_pd_server_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd_server_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd_server_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd_server_port_mac_requirements
+        order:
+          get_input: port_pd_server_port_order
+        exCP_naming:
+          get_input: port_pd_server_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd_server_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd_server_port_ip_requirements
         network_role_tag:
           get_input: port_pd_server_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd_server_port_mac_requirements
-        order:
-          get_input: port_pd_server_port_order
         network_role:
           get_input: port_pd_server_port_network_role
-        subnetpoolid:
-          get_input: port_pd_server_port_subnetpoolid
         fixed_ips:
           get_input:
           - port_pd_server_port_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_pd_server_port_subnetpoolid
         network:
           get_input:
           - port_pd_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
index c4f91c67a1..de0ad423a0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
@@ -58,6 +58,11 @@ topology_template:
     port_ps_server_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_ps_server_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_ps_server_port_ip_requirements:
       type: list
       required: true
@@ -81,30 +86,34 @@ topology_template:
     ps_server_ps_server_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_ps_server_port_exCP_naming
         replacement_policy:
           get_input:
           - port_ps_server_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_ps_server_port_mac_requirements
+        order:
+          get_input: port_ps_server_port_order
+        exCP_naming:
+          get_input: port_ps_server_port_exCP_naming
         vlan_requirements:
           get_input: port_ps_server_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_ps_server_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_ps_server_port_ip_requirements
         network_role_tag:
           get_input: port_ps_server_port_network_role_tag
-        mac_requirements:
-          get_input: port_ps_server_port_mac_requirements
-        order:
-          get_input: port_ps_server_port_order
         network_role:
           get_input: port_ps_server_port_network_role
-        subnetpoolid:
-          get_input: port_ps_server_port_subnetpoolid
         fixed_ips:
           get_input:
           - port_ps_server_port_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_ps_server_port_subnetpoolid
         network:
           get_input:
           - port_ps_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
index 57d6ce0980..bb990b977e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
@@ -46,6 +46,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_sm_server_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     compute_sm_server_name:
       type: list
       required: true
@@ -96,30 +101,34 @@ topology_template:
     sm_server_sm_server_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_sm_server_port_exCP_naming
         replacement_policy:
           get_input:
           - port_sm_server_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_sm_server_port_mac_requirements
+        order:
+          get_input: port_sm_server_port_order
+        exCP_naming:
+          get_input: port_sm_server_port_exCP_naming
         vlan_requirements:
           get_input: port_sm_server_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_sm_server_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_sm_server_port_ip_requirements
         network_role_tag:
           get_input: port_sm_server_port_network_role_tag
-        mac_requirements:
-          get_input: port_sm_server_port_mac_requirements
-        order:
-          get_input: port_sm_server_port_order
         network_role:
           get_input: port_sm_server_port_network_role
-        subnetpoolid:
-          get_input: port_sm_server_port_subnetpoolid
         fixed_ips:
           get_input:
           - port_sm_server_port_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_sm_server_port_subnetpoolid
         network:
           get_input:
           - port_sm_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
index 2a9e6dd584..e3f3dd567e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
@@ -104,6 +104,8 @@ topology_template:
         - get_input: net
         vm_flavor_name:
           get_input: pd_server_flavor
+        port_pd_server_port_subinterface_indicator:
+        - true
         port_pd_server_port_fixed_ips:
         - ip_address:
             get_input:
@@ -144,6 +146,8 @@ topology_template:
             - 0
         vm_flavor_name:
           get_input: ps_server_flavor
+        port_ps_server_port_subinterface_indicator:
+        - true
         port_ps_server_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
index c658658c95..d60b76bbda 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
@@ -87,6 +87,8 @@ topology_template:
           get_input: sm_server_flavor
         port_sm_server_port_network:
         - get_input: net
+        port_sm_server_port_subinterface_indicator:
+        - true
         compute_sm_server_name:
         - get_input:
           - sm_server_names
@@ -131,6 +133,8 @@ topology_template:
       properties:
         port_oam_server_port_network:
         - get_input: net
+        port_oam_server_port_subinterface_indicator:
+        - true
         port_oam_server_port_replacement_policy:
         - AUTO
         vm_flavor_name: