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>

1 files changed, 75 insertions, 66 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
index c5e13a106c..8ca8da6bcd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
@@ -19,19 +19,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_vdbe_untr_port_subnetpoolid:
-      type: string
-      required: true
     subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
@@ -68,11 +55,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_1_subports_ip_v6_address:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
       type: list
       required: true
@@ -114,129 +96,152 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_vdbe_untr_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_vdbe_untr_port_subinterface_indicator:
+      type: list
       required: true
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    subinterface_vdbe_untr_1_subports_parent_interface:
+      entry_schema:
+        type: boolean
+    subinterface_vdbe_untr_1_subports_vn_network_list:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_service_template_filter_count:
+    port_vdbe_untr_port_name:
       type: list
       required: true
       entry_schema:
-        type: float
-    subinterface_vdbe_untr_1_subports_service_template_filter_count:
+        type: string
+    port_vdbe_untr_port_network_role:
+      type: string
+      required: true
+    subinterface_vdbe_untr_2_subports_vn_network_list:
       type: list
       required: true
       entry_schema:
-        type: float
-    subinterface_vdbe_untr_1_subports_vn_network_list:
+        type: string
+    subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_name:
+    subinterface_vdbe_untr_2_subports_ip_v6_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_vlan_requirements:
+    subinterface_vdbe_untr_2_subports_mac_address:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    subinterface_vdbe_untr_2_subports_ip_address:
+        type: string
+    subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_network_role:
-      type: string
-      required: true
-    subinterface_vdbe_untr_1_subports_vmac_address:
+    compute_vdbe_name:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
+    subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_vn_network_list:
+    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
+    port_vdbe_untr_port_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
+        type: org.openecomp.datatypes.network.IpRequirements
+    subinterface_vdbe_untr_1_subports_vlan_tag_list:
       type: list
       required: true
       entry_schema:
-        type: string
-    subinterface_vdbe_untr_2_subports_ip_v6_address:
+        type: json
+    subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_mac_address:
+    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
+    port_vdbe_untr_port_subnetpoolid:
+      type: string
+      required: true
+    subinterface_vdbe_untr_1_subports_ip_v6_address:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
+    port_vdbe_untr_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    subinterface_vdbe_untr_1_subports_parent_interface:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_parent_interface:
+    subinterface_vdbe_untr_2_subports_service_template_filter_count:
+      type: list
+      required: true
+      entry_schema:
+        type: float
+    subinterface_vdbe_untr_1_subports_service_template_filter_count:
+      type: list
+      required: true
+      entry_schema:
+        type: float
+    port_vdbe_untr_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    subinterface_vdbe_untr_2_subports_ip_address:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_vdbe_name:
+    subinterface_vdbe_untr_1_subports_vmac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
+    subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
+    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_ip_requirements:
+    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    subinterface_vdbe_untr_1_subports_vlan_tag_list:
+        type: string
+    subinterface_vdbe_untr_2_subports_parent_interface:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
   node_templates:
     vdbe_vdbe_untr_port_vdbe_untr_1_subports:
       type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
@@ -427,6 +432,10 @@ topology_template:
           get_input: port_vdbe_untr_port_exCP_naming
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_vdbe_untr_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_vdbe_untr_port_ip_requirements
         network_role_tag:
@@ -623,9 +632,6 @@ topology_template:
       - vdbe_vdbe_untr_port
       - network.incoming.packets.rate
     requirements:
-      link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports:
-      - vdbe_vdbe_untr_port_vdbe_untr_2_subports
-      - link_vdbe_0_subint_untr_vmi_0
       dependency_vdbe_vdbe_untr_port:
       - vdbe_vdbe_untr_port
       - dependency
@@ -635,21 +641,24 @@ topology_template:
       dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports:
       - vdbe_vdbe_untr_port_vdbe_untr_1_subports
       - dependency
+      subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports:
+      - vdbe_vdbe_untr_port_vdbe_untr_1_subports
+      - subinterface_link_vdbe_0_subint_untr_vmi_0
       dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports:
       - vdbe_vdbe_untr_port_vdbe_untr_2_subports
       - dependency_vdbe_0_subint_untr_vmi_0
       local_storage_vdbe:
       - vdbe
       - local_storage
-      link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports:
-      - vdbe_vdbe_untr_port_vdbe_untr_1_subports
-      - link_vdbe_0_subint_untr_vmi_0
       dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports:
       - vdbe_vdbe_untr_port_vdbe_untr_1_subports
       - dependency_vdbe_0_subint_untr_vmi_0
       dependency_vdbe_vdbe_untr_port_vdbe_untr_2_subports:
       - vdbe_vdbe_untr_port_vdbe_untr_2_subports
       - dependency
+      subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports:
+      - vdbe_vdbe_untr_port_vdbe_untr_2_subports
+      - subinterface_link_vdbe_0_subint_untr_vmi_0
       dependency_vdbe:
       - vdbe
-      - dependency
\ No newline at end of file
+      - dependency