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>

4 files changed, 41 insertions, 20 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f0406ad372..974e584ce7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -706,6 +706,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
@@ -719,6 +720,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
@@ -889,6 +891,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_1b_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
@@ -980,7 +988,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+    - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1088,6 +1096,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
@@ -1384,7 +1393,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:
@@ -1402,4 +1411,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/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 057aac895e..e37886cc8b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_pd_server_1b_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
@@ -136,30 +141,34 @@ topology_template:
     pd_server_1b_pd_server_1b_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd_server_1b_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd_server_1b_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd_server_1b_port_mac_requirements
+        order:
+          get_input: port_pd_server_1b_port_order
+        exCP_naming:
+          get_input: port_pd_server_1b_port_exCP_naming
         vlan_requirements:
           get_input: port_pd_server_1b_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd_server_1b_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd_server_1b_port_mac_requirements
-        order:
-          get_input: port_pd_server_1b_port_order
         network_role:
           get_input: port_pd_server_1b_port_network_role
-        subnetpoolid:
-          get_input: port_pd_server_1b_port_subnetpoolid
         fixed_ips:
           get_input:
           - port_pd_server_1b_port_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_pd_server_1b_port_subnetpoolid
         network:
           get_input:
           - port_pd_server_1b_port_network
@@ -338,9 +347,6 @@ topology_template:
       - pd_server_1b
       - disk.write.requests.rate
     requirements:
-      link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
-      - link_template_Vlan_vmi_1
       dependency_pd_server_1b:
       - pd_server_1b
       - dependency
@@ -356,6 +362,9 @@ topology_template:
       dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
       - pd_server_1b_pd_server_1b_port_nested_vlan
       - dependency_template_Vlan_vmi_1
+      subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_nested_vlan
+      - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - 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/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index 5ad77ff461..a8f96e268e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -121,6 +121,9 @@ topology_template:
         - 9
         vm_flavor_name:
           get_input: pd_server_1b_flavor
+        port_pd_server_1b_port_subinterface_indicator:
+        - true
+        - true
         subinterface_nested_vlan_net1:
         - packet_external_network
         - packet_external_network
@@ -184,7 +187,7 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
-      - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+      - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
           capability: tosca.capabilities.network.Linkable
           node: packet_external_network
           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/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml
index ed59356950..9a7f270928 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml
@@ -47,7 +47,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: parent_interface
@@ -100,12 +100,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