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>

5 files changed, 60 insertions, 22 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5f32192a6f..a2a3bc67dd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -210,6 +210,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_vmi_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
@@ -330,6 +336,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_oam_vmi_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_vdbe_untr_vmi_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -391,7 +403,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1:
+    - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -437,7 +449,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2:
+    - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -619,6 +631,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
@@ -692,6 +705,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
@@ -929,7 +943,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vdbe_0_subint_untr_vmi_0:
+    - subinterface_link_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1041,7 +1055,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vdbe_1_subint_oam_vmi_1:
+    - subinterface_link_vdbe_1_subint_oam_vmi_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1059,4 +1073,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/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
index c973648470..1e7c8c88c7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
@@ -581,6 +581,9 @@ topology_template:
         subinterface_vlan2_vmac_address:
         - get_input: vdbe_untrusted_vmac_address
         - get_input: vdbe_untrusted_vmac_address
+        port_vdbe_untr_vmi_subinterface_indicator:
+        - true
+        - true
         subinterface_vlan1_aap_untrusted_ip_prefix:
         - get_input: vdbe_aap_untrusted_ip_prefix
         - get_input: vdbe_aap_untrusted_ip_prefix
@@ -650,6 +653,9 @@ topology_template:
         subinterface_vlan2_aap_untrusted_v6_ip_prefix_len:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
         - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+        port_vdbe_oam_vmi_subinterface_indicator:
+        - true
+        - true
         subinterface_vlan2_service_template_filter_count:
         - 5
         - 5
@@ -676,7 +682,7 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: fabric_int_net
           relationship: tosca.relationships.network.LinksTo
-      - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2:
+      - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2:
           capability: tosca.capabilities.network.Linkable
           node: fabric_int_net
           relationship: tosca.relationships.network.LinksTo
@@ -712,4 +718,4 @@ topology_template:
           get_input: oam_vfc_instance_group_function
         subinterface_role: oam
       members:
-      - abstract_vdbe
\ No newline at end of file
+      - abstract_vdbe
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
index e256c4fd7c..2bb75a89ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
@@ -176,6 +176,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_vmi_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     subinterface_vlan1_aap_untrusted_ip_prefix:
       type: list
       required: true
@@ -275,6 +280,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_oam_vmi_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_vdbe_untr_vmi_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -417,6 +427,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_vdbe_untr_vmi_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_vdbe_untr_vmi_subinterface_indicator
+          - index_value
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_vmi_virtual_network_refs
@@ -457,6 +471,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_vdbe_oam_vmi_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_vdbe_oam_vmi_subinterface_indicator
+          - index_value
         virtual_network_refs:
           get_input:
           - port_vdbe_oam_vmi_virtual_network_refs
@@ -768,12 +786,18 @@ topology_template:
       - vdbe
       - disk.read.bytes
     requirements:
+      subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1:
+      - vdbe_vdbe_untr_vmi_vlan1
+      - subinterface_link_vdbe_0_subint_untr_vmi_0
       link_vdbe_vdbe_untr_vmi:
       - vdbe_vdbe_untr_vmi
       - link
       dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1:
       - vdbe_vdbe_untr_vmi_vlan1
       - dependency_vdbe_0_subint_untr_vmi_0
+      subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2:
+      - vdbe_vdbe_oam_vmi_vlan2
+      - subinterface_link_vdbe_1_subint_oam_vmi_1
       dependency_vdbe_vdbe_oam_vmi:
       - vdbe_vdbe_oam_vmi
       - dependency
@@ -786,9 +810,6 @@ topology_template:
       local_storage_vdbe:
       - vdbe
       - local_storage
-      link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1:
-      - vdbe_vdbe_untr_vmi_vlan1
-      - link_vdbe_0_subint_untr_vmi_0
       dependency_vdbe_vdbe_untr_vmi:
       - vdbe_vdbe_untr_vmi
       - dependency
@@ -801,6 +822,3 @@ topology_template:
       dependency_vdbe:
       - vdbe
       - dependency
-      link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2:
-      - vdbe_vdbe_oam_vmi_vlan2
-      - link_vdbe_1_subint_oam_vmi_1
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml
index ef5f4913e8..a8b78bf267 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml
@@ -92,7 +92,7 @@ topology_template:
       description: ip prefix length for the primary vDBE VM on the VAN untrusted network
   node_templates:
     vdbe_0_subint_untr_vmi_0:
-      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
@@ -163,9 +163,9 @@ topology_template:
       dependency_vdbe_0_subint_untr_vmi_0:
       - vdbe_0_subint_untr_vmi_0
       - dependency
+      subinterface_link_vdbe_0_subint_untr_vmi_0:
+      - vdbe_0_subint_untr_vmi_0
+      - subinterface_link
       binding_vdbe_0_subint_untr_vmi_0:
       - vdbe_0_subint_untr_vmi_0
       - binding
-      link_vdbe_0_subint_untr_vmi_0:
-      - vdbe_0_subint_untr_vmi_0
-      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml
index 2fcab81b61..4cc2faab29 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml
@@ -92,7 +92,7 @@ topology_template:
       description: ip prefix length for the primary vDBE VM on the VAN untrusted network
   node_templates:
     vdbe_1_subint_oam_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
@@ -160,12 +160,12 @@ topology_template:
       - vdbe_1_subint_oam_vmi_1
       - feature
     requirements:
-      link_vdbe_1_subint_oam_vmi_1:
-      - vdbe_1_subint_oam_vmi_1
-      - link
       dependency_vdbe_1_subint_oam_vmi_1:
       - vdbe_1_subint_oam_vmi_1
       - dependency
+      subinterface_link_vdbe_1_subint_oam_vmi_1:
+      - vdbe_1_subint_oam_vmi_1
+      - subinterface_link
       binding_vdbe_1_subint_oam_vmi_1:
       - vdbe_1_subint_oam_vmi_1
-      - binding
\ No newline at end of file
+      - binding