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/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4ba9976dee..3053ba7550 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -50,6 +50,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_template_VMInt_OAM_lb_virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
         required: true
@@ -260,6 +266,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_template_VMInt_OAM_lb_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_template_VMInt_OAM_lb_name:
         type: list
         required: true
@@ -672,6 +684,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
@@ -774,6 +787,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/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
index 0f12e75b18..a8ceff1ec0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
@@ -424,6 +424,8 @@ topology_template:
             is_required: true
         vm_image_name:
           get_input: pd_image_name
+        port_pd01_port_subinterface_indicator:
+        - true
         port_pd01_port_device_id:
         - PORT_PD_DEVICE_ID
         port_pd01_port_admin_state_up:
@@ -494,6 +496,8 @@ topology_template:
             - fq_name
         port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses:
         - - get_input: mac_address
+        port_template_VMInt_OAM_lb_subinterface_indicator:
+        - true
         port_template_VMInt_OAM_lb_name:
         - template_VMInt_OAM_lb_NAME
         port_pd01_port_port_security_enabled:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/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/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
index 41ee8c066f..1536b33544 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/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/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_template_VMInt_OAM_lb_virtual_machine_interface_properties:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
       required: true
@@ -217,6 +222,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_template_VMInt_OAM_lb_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_template_VMInt_OAM_lb_name:
       type: list
       required: true
@@ -359,6 +369,10 @@ topology_template:
           get_input:
           - port_template_VMInt_OAM_lb_virtual_machine_interface_properties
           - index_value
+        subinterface_indicator:
+          get_input:
+          - port_template_VMInt_OAM_lb_subinterface_indicator
+          - index_value
         security_group_refs:
           get_input:
           - port_template_VMInt_OAM_lb_security_group_refs
@@ -427,6 +441,10 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         qos_policy:
           get_input:
           - port_pd01_port_qos_policy