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>

3 files changed, 116 insertions, 80 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8959f2fece..d5acb4ca67 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -22,20 +22,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_pd_oam1_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -56,30 +42,70 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_0_vlan_requirements:
+      port_pd_oam1_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd_oam1_port_1_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_oam1_port_1_subinterface_indicator:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd_oam1_port_1_network:
+          type: boolean
+      port_pd_oam1_port_1_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_pd_server_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_oam1_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd_oam1_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_1_network_role:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_oam1_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_oam1_port_1_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd_oam1_port_1_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_oam1_port_0_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd_oam1_port_0_order:
         type: integer
         required: true
@@ -94,10 +120,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd_oam1_port_0_subnetpoolid:
         type: string
         required: true
@@ -106,10 +128,6 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_1_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd_oam1_port_1_vlan_requirements:
         type: list
         required: true
@@ -120,12 +138,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -534,6 +546,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
@@ -541,6 +554,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/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
index 2dd1307517..8728f58f15 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
@@ -844,6 +844,24 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd_oam1_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd_oam1_port_1_subinterface_indicator:
+        - true
+        port_pd_oam1_port_1_network_role_tag: oam
+        compute_pd_server_user_data_format:
+        - RAW
         port_pd_oam1_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -855,29 +873,15 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_pd_oam1_port_1_network:
         - get_input: oam_net_name
-        port_pd_oam1_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
+        port_pd_oam1_port_0_subinterface_indicator:
+        - true
         port_pd_oam1_port_0_network:
         - get_input: oam_net_name
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd_oam1_port_1_network_role_tag: oam
         port_pd_oam1_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
index 105dabef73..ccd2d95f87 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
@@ -22,18 +22,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    port_pd_oam1_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -50,6 +38,40 @@ topology_template:
     port_pd_oam1_port_1_order:
       type: integer
       required: true
+    port_pd_oam1_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd_oam1_port_1_network_role:
+      type: string
+      required: true
+    vm_image_name:
+      type: string
+      required: true
+    port_pd_oam1_port_1_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
+    port_pd_oam1_port_1_network_role_tag:
+      type: string
+      required: true
+    compute_pd_server_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd_oam1_port_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     port_pd_oam1_port_0_vlan_requirements:
       type: list
       required: true
@@ -60,15 +82,14 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd_oam1_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd_oam1_port_1_network_role:
-      type: string
-      required: true
     port_pd_oam1_port_1_subnetpoolid:
       type: string
       required: true
+    port_pd_oam1_port_0_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd_oam1_port_0_order:
       type: integer
       required: true
@@ -80,18 +101,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     port_pd_oam1_port_0_subnetpoolid:
       type: string
       required: true
     port_pd_oam1_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_pd_oam1_port_1_network_role_tag:
-      type: string
-      required: true
     port_pd_oam1_port_1_vlan_requirements:
       type: list
       required: true
@@ -100,11 +115,6 @@ topology_template:
     port_pd_oam1_port_0_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -132,6 +142,10 @@ topology_template:
           get_input: port_pd_oam1_port_1_exCP_naming
         vlan_requirements:
           get_input: port_pd_oam1_port_1_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd_oam1_port_1_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd_oam1_port_1_ip_requirements
         network_role_tag:
@@ -160,6 +174,10 @@ topology_template:
           get_input: port_pd_oam1_port_0_exCP_naming
         vlan_requirements:
           get_input: port_pd_oam1_port_0_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd_oam1_port_0_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd_oam1_port_0_ip_requirements
         network_role_tag: