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, 36 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8add335fc5..55cbc86f16 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -40,6 +40,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_0_replacement_policy:
         type: list
         required: true
@@ -104,6 +110,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_pd01_port_1_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_1_order:
         type: integer
         required: true
@@ -184,6 +196,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
@@ -202,6 +215,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/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 2166dafe83..6b3f264e01 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -205,6 +205,8 @@ topology_template:
         - get_input:
           - pd_server_names
           - 0
+        port_pd01_port_0_subinterface_indicator:
+        - true
         port_pd01_port_0_replacement_policy:
         - AUTO
         vm_flavor_name:
@@ -226,6 +228,8 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        port_pd01_port_1_subinterface_indicator:
+        - true
         port_pd01_port_1_mac_requirements:
           mac_count_required:
             is_required: false
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 7c391c928b..a45b794a03 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -37,6 +37,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_0_replacement_policy:
       type: list
       required: true
@@ -88,6 +93,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_pd01_port_1_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_1_order:
       type: integer
       required: true
@@ -146,6 +156,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_1_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_1_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
         network_role_tag:
@@ -178,6 +192,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_0_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_0_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
         network_role_tag: