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>

32 files changed, 2104 insertions, 1876 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2aab911a51..c618732ca8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,6 +62,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -303,6 +309,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/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
index 4bfad639fb..aeaeda46f0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
@@ -1,143 +1,146 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-  node_templates:

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO_PORT_1

-        - AUTO_PORT_0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-1

-        - Network-0

-        compute_pd_server_user_data_format:

-        - RAW_SERVER_PD_2

-        - RAW_SERVER_PD_1

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - abstract_pd_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+  node_templates:
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-1
+        - Network-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - RAW_SERVER_PD_2
+        - RAW_SERVER_PD_1
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 934495ab29..2e8cac336a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0cab2c17b7..9add418772 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,6 +62,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -313,6 +319,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/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
index b74492bbb5..2c371cd6be 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
@@ -1,167 +1,170 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-  node_templates:

-    network_policy_server_pd_01:

-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules

-      properties:

-        name:

-          get_attribute:

-          - abstract_pd_server

-          - pd_server_accessIPv4

-    network_policy_server_pd_02:

-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules

-      properties:

-        name:

-          get_attribute:

-          - abstract_pd_server

-          - pd_server_accessIPv6

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO_PORT_1

-        - AUTO_PORT_0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-1

-        - Network-0

-        compute_pd_server_user_data_format:

-        - RAW_SERVER_PD_2

-        - RAW_SERVER_PD_1

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-    network_policy_port0:

-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules

-      properties:

-        entries:

-          get_attribute:

-          - abstract_pd_server

-          - pd_server_pd01_port_device_owner

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - network_policy_server_pd_01

-      - network_policy_server_pd_02

-      - network_policy_port0

-      - abstract_pd_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+  node_templates:
+    network_policy_server_pd_01:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
+      properties:
+        name:
+          get_attribute:
+          - abstract_pd_server
+          - pd_server_accessIPv4
+    network_policy_server_pd_02:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
+      properties:
+        name:
+          get_attribute:
+          - abstract_pd_server
+          - pd_server_accessIPv6
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-1
+        - Network-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - RAW_SERVER_PD_2
+        - RAW_SERVER_PD_1
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+    network_policy_port0:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
+      properties:
+        entries:
+          get_attribute:
+          - abstract_pd_server
+          - pd_server_pd01_port_device_owner
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - network_policy_server_pd_01
+      - network_policy_server_pd_02
+      - network_policy_port0
+      - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index e83e81c207..516a938e81 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 992a6c7131..4f4dc39cdb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,6 +62,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -309,6 +315,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/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
index c9507d5269..58d4c54c3f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
@@ -1,173 +1,176 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    dummy_net_name_1:

-      label: dummy net name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: dummy_net_name_1

-      type: string

-      description: dummy net name

-      default: Network-1

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-  node_templates:

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - get_attribute:

-          - network_policy_server

-          - name

-        - AUTO_PORT_0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-1

-        - Network-0

-        compute_pd_server_user_data_format:

-        - RAW_SERVER_PD_2

-        - get_attribute:

-          - network_policy_server

-          - name

-        compute_pd_server_metadata:

-        - get_attribute:

-          - network_policy_server

-          - name

-        - null

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-    network_policy_server:

-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules

-      properties:

-        name:

-          get_input: dummy_net_name_1

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - network_policy_server

-      - abstract_pd_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    dummy_net_name_1:
+      label: dummy net name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: dummy_net_name_1
+      type: string
+      description: dummy net name
+      default: Network-1
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+  node_templates:
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - get_attribute:
+          - network_policy_server
+          - name
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-1
+        - Network-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - RAW_SERVER_PD_2
+        - get_attribute:
+          - network_policy_server
+          - name
+        compute_pd_server_metadata:
+        - get_attribute:
+          - network_policy_server
+          - name
+        - null
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+    network_policy_server:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
+      properties:
+        name:
+          get_input: dummy_net_name_1
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - network_policy_server
+      - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
index cfe0c56ce1..8e79cec55a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -117,6 +122,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 63a1e1964a..f6309b4565 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,6 +56,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -291,6 +297,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/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
index 7619d12ebb..b8d5cd6647 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
@@ -1,137 +1,140 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-  node_templates:

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-1

-        - Network-0

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - abstract_pd_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+  node_templates:
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-1
+        - Network-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
index 36669edf18..4f3939bd00 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,6 +50,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -98,6 +103,10 @@ topology_template:
           - accessIPv4
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 413b91c5ce..a397543a9e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -309,6 +315,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/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
index 0a497cb72a..7ac39945a6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -1,187 +1,190 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    packet_mirror_network_name:

-      label: packet mirror network name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: packet_mirror_network_name

-      type: string

-      description: name of the oam network

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-  node_templates:

-    jsa_security_group:

-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules

-      properties:

-        name: Test-SecurityGroup

-        description: ems security group

-        rules:

-        - protocol: icmp

-          ethertype: IPv6

-          remote_ip_prefix: ::/0

-          direction: ingress

-      requirements:

-      - port:

-          capability: attachment_pd_server_pd01_port

-          node: abstract_pd_server

-          relationship: org.openecomp.relationships.AttachesTo

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO_PORT_1

-        - AUTO_PORT_0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_security_groups:

-        - - jsa_security_group

-        - - jsa_security_group

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-1

-        - Network-0

-        compute_pd_server_user_data_format:

-        - RAW_SERVER_PD_2

-        - RAW_SERVER_PD_1

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-    resource_with_dependOn:

-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net

-      properties:

-        network_name:

-          get_input: packet_mirror_network_name

-      requirements:

-      - dependency:

-          capability: feature_pd_server

-          node: abstract_pd_server

-          relationship: tosca.relationships.DependsOn

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - jsa_security_group

-      - resource_with_dependOn

-      - abstract_pd_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    packet_mirror_network_name:
+      label: packet mirror network name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: packet_mirror_network_name
+      type: string
+      description: name of the oam network
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+  node_templates:
+    jsa_security_group:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
+      properties:
+        name: Test-SecurityGroup
+        description: ems security group
+        rules:
+        - protocol: icmp
+          ethertype: IPv6
+          remote_ip_prefix: ::/0
+          direction: ingress
+      requirements:
+      - port:
+          capability: attachment_pd_server_pd01_port
+          node: abstract_pd_server
+          relationship: org.openecomp.relationships.AttachesTo
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_security_groups:
+        - - jsa_security_group
+        - - jsa_security_group
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-1
+        - Network-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - RAW_SERVER_PD_2
+        - RAW_SERVER_PD_1
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+    resource_with_dependOn:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_mirror_network_name
+      requirements:
+      - dependency:
+          capability: feature_pd_server
+          node: abstract_pd_server
+          relationship: tosca.relationships.DependsOn
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - jsa_security_group
+      - resource_with_dependOn
+      - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index ba596578fc..b1ffb37314 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,6 +60,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -105,26 +110,30 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        replacement_policy:
+          get_input:
+          - port_pd01_port_replacement_policy
+          - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
         security_groups:
           get_input:
           - port_pd01_port_security_groups
           - index_value
         exCP_naming:
           get_input: port_pd01_port_exCP_naming
-        replacement_policy:
-          get_input:
-          - port_pd01_port_replacement_policy
-          - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2aab911a51..c618732ca8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,6 +62,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -303,6 +309,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/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
index b2a4098917..20fd689f56 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -1,226 +1,229 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd01_cinder_volume_size:

-      label: volume size

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd01_cinder_volume_size

-      type: string

-      description: volume size

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    packet_mirror_network_name:

-      label: packet mirror network name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: packet_mirror_network_name

-      type: string

-      description: name of the network

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-    pd01_volume_type:

-      label: volume type

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd01_volume_type

-      type: string

-      description: volume type

-  node_templates:

-    packet_mirror_network:

-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net

-      properties:

-        network_name:

-          get_input: packet_mirror_network_name

-    pd01_volume:

-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume

-      properties:

-        volume_type:

-          get_input: pd01_volume_type

-        size: '(get_input : pd01_cinder_volume_size) * 1024'

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO_PORT_1

-        - AUTO_PORT_0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - packet_mirror_network

-        - packet_mirror_network

-        compute_pd_server_user_data_format:

-        - RAW_SERVER_PD_2

-        - RAW_SERVER_PD_1

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-      requirements:

-      - dependency_pd_server:

-          capability: tosca.capabilities.Node

-          node: packet_mirror_network

-          relationship: tosca.relationships.DependsOn

-      - link_pd_server_pd01_port:

-          capability: tosca.capabilities.network.Linkable

-          node: packet_mirror_network

-          relationship: tosca.relationships.network.LinksTo

-      - local_storage_pd_server:

-          capability: tosca.capabilities.Attachment

-          node: pd01_volume

-          relationship: pd02_volume_attachment

-      - local_storage_pd_server:

-          capability: tosca.capabilities.Attachment

-          node: pd01_volume

-          relationship: pd01_volume_attachment

-  relationship_templates:

-    pd01_volume_attachment:

-      type: org.openecomp.relationships.VolumeAttachesTo

-      properties:

-        volume_id: pd01_volume

-        instance_uuid: abstract_pd_server

-    pd02_volume_attachment:

-      type: org.openecomp.relationships.VolumeAttachesTo

-      properties:

-        volume_id: pd01_volume

-        instance_uuid: abstract_pd_server

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - packet_mirror_network

-      - pd01_volume

-      - abstract_pd_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd01_cinder_volume_size:
+      label: volume size
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd01_cinder_volume_size
+      type: string
+      description: volume size
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    packet_mirror_network_name:
+      label: packet mirror network name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: packet_mirror_network_name
+      type: string
+      description: name of the network
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+    pd01_volume_type:
+      label: volume type
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd01_volume_type
+      type: string
+      description: volume type
+  node_templates:
+    packet_mirror_network:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_mirror_network_name
+    pd01_volume:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: pd01_volume_type
+        size: '(get_input : pd01_cinder_volume_size) * 1024'
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - packet_mirror_network
+        - packet_mirror_network
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - RAW_SERVER_PD_2
+        - RAW_SERVER_PD_1
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+      requirements:
+      - dependency_pd_server:
+          capability: tosca.capabilities.Node
+          node: packet_mirror_network
+          relationship: tosca.relationships.DependsOn
+      - link_pd_server_pd01_port:
+          capability: tosca.capabilities.network.Linkable
+          node: packet_mirror_network
+          relationship: tosca.relationships.network.LinksTo
+      - local_storage_pd_server:
+          capability: tosca.capabilities.Attachment
+          node: pd01_volume
+          relationship: pd02_volume_attachment
+      - local_storage_pd_server:
+          capability: tosca.capabilities.Attachment
+          node: pd01_volume
+          relationship: pd01_volume_attachment
+  relationship_templates:
+    pd01_volume_attachment:
+      type: org.openecomp.relationships.VolumeAttachesTo
+      properties:
+        volume_id: pd01_volume
+        instance_uuid: abstract_pd_server
+    pd02_volume_attachment:
+      type: org.openecomp.relationships.VolumeAttachesTo
+      properties:
+        volume_id: pd01_volume
+        instance_uuid: abstract_pd_server
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - packet_mirror_network
+      - pd01_volume
+      - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 934495ab29..2e8cac336a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 136beed812..a601dbb5e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -309,6 +315,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/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
index 54a5e568e6..972bf385c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
@@ -1,158 +1,161 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-  node_templates:

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_scheduler_hints:

-        - group: BE_Affinity_group

-        - group: BE_Affinity_group

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO_PORT_1

-        - AUTO_PORT_0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-1

-        - Network-0

-        compute_pd_server_user_data_format:

-        - RAW_SERVER_PD_2

-        - RAW_SERVER_PD_1

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - abstract_pd_server

-    BE_Affinity_group:

-      type: tosca.groups.Root

-      members:

-      - abstract_pd_server

-  policies:

-    BE_Affinity_policy:

-      type: org.openecomp.policies.placement.Colocate

-      properties:

-        name: Policy_BE_Affinity

-        affinity: host

-      targets:

-      - BE_Affinity_group

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+  node_templates:
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_scheduler_hints:
+        - group: BE_Affinity_group
+        - group: BE_Affinity_group
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-1
+        - Network-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - RAW_SERVER_PD_2
+        - RAW_SERVER_PD_1
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - abstract_pd_server
+    BE_Affinity_group:
+      type: tosca.groups.Root
+      members:
+      - abstract_pd_server
+  policies:
+    BE_Affinity_policy:
+      type: org.openecomp.policies.placement.Colocate
+      properties:
+        name: Policy_BE_Affinity
+        affinity: host
+      targets:
+      - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
index 3930dd96bd..a14f0c9043 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,6 +60,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -117,6 +122,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cec889b729..a82d2208e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,6 +62,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -313,6 +319,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/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index bcee7d58cb..9785f5bf03 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -1,162 +1,165 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-  node_templates:

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO_PORT_1

-        - AUTO_PORT_0

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-1

-        - Network-0

-        compute_pd_server_user_data_format:

-        - RAW_SERVER_PD_2

-        - RAW_SERVER_PD_1

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - abstract_pd_server

-  outputs:

-    output_attr_port_pd_0:

-      description: output attr port0

-      value:

-        get_attribute:

-        - abstract_pd_server

-        - pd_server_pd01_port_device_id

-    output_attr_server_pd_1:

-      description: output attr pd1

-      value:

-        get_attribute:

-        - abstract_pd_server

-        - pd_server_accessIPv4

-    output_attr_server_pd_2:

-      description: output attr pd2

-      value:

-        get_attribute:

-        - abstract_pd_server

-        - pd_server_accessIPv6

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+  node_templates:
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-1
+        - Network-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - RAW_SERVER_PD_2
+        - RAW_SERVER_PD_1
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - abstract_pd_server
+  outputs:
+    output_attr_port_pd_0:
+      description: output attr port0
+      value:
+        get_attribute:
+        - abstract_pd_server
+        - pd_server_pd01_port_device_id
+    output_attr_server_pd_1:
+      description: output attr pd1
+      value:
+        get_attribute:
+        - abstract_pd_server
+        - pd_server_accessIPv4
+    output_attr_server_pd_2:
+      description: output attr pd2
+      value:
+        get_attribute:
+        - abstract_pd_server
+        - pd_server_accessIPv6
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 2c5375f7a2..562554f743 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 367c3bb280..102326a14f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,6 +62,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -303,6 +309,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
@@ -474,6 +481,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_ps01_port_order:
         type: integer
         required: true
@@ -796,6 +809,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/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
index 9f29064a0f..96b39a73f6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
@@ -1,255 +1,261 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    ps_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: ps_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPS001

-      - ZRDM1MOGX01MPS002

-      - ZRDM1MOGX01MPS003

-      - ZRDM1MOGX01MPS004

-      entry_schema:

-        type: string

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    ps_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: ps_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-    ps_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: ps_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-  node_templates:

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO

-        - AUTO

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-PD-1

-        - Network-PD-0

-        compute_pd_server_user_data_format:

-        - null

-        - RAW

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-    abstract_ps_server:

-      type: org.openecomp.resource.abstract.nodes.ps_server

-      directives:

-      - substitutable

-      properties:

-        compute_ps_server_name:

-        - get_input:

-          - ps_server_names

-          - 0

-        - get_input:

-          - ps_server_names

-          - 1

-        compute_ps_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_ps_server_user_data_format:

-        - null

-        - RAW

-        vm_flavor_name:

-          get_input: ps_flavor_name

-        vm_image_name:

-          get_input: ps_image_name

-        port_ps01_port_replacement_policy:

-        - AUTO

-        - AUTO

-        port_ps01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        port_ps01_port_network:

-        - Network-PS-0

-        - Network-PS-1

-        port_ps01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        service_template_filter:

-          substitute_service_template: Nested_ps_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - abstract_pd_server

-      - abstract_ps_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    ps_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: ps_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPS001
+      - ZRDM1MOGX01MPS002
+      - ZRDM1MOGX01MPS003
+      - ZRDM1MOGX01MPS004
+      entry_schema:
+        type: string
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    ps_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: ps_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+    ps_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: ps_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+  node_templates:
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO
+        - AUTO
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-PD-1
+        - Network-PD-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - null
+        - RAW
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+    abstract_ps_server:
+      type: org.openecomp.resource.abstract.nodes.ps_server
+      directives:
+      - substitutable
+      properties:
+        compute_ps_server_name:
+        - get_input:
+          - ps_server_names
+          - 0
+        - get_input:
+          - ps_server_names
+          - 1
+        compute_ps_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_ps_server_user_data_format:
+        - null
+        - RAW
+        vm_flavor_name:
+          get_input: ps_flavor_name
+        port_ps01_port_subinterface_indicator:
+        - true
+        - true
+        vm_image_name:
+          get_input: ps_image_name
+        port_ps01_port_replacement_policy:
+        - AUTO
+        - AUTO
+        port_ps01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_ps01_port_network:
+        - Network-PS-0
+        - Network-PS-1
+        port_ps01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        service_template_filter:
+          substitute_service_template: Nested_ps_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - abstract_pd_server
+      - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 934495ab29..2e8cac336a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
index fe95a3ba16..5636f4b752 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_ps01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_ps01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1d716d84ee..3b488ab0e8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,6 +62,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_pd01_port_order:
         type: integer
         required: true
@@ -307,6 +313,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
@@ -478,6 +485,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_subinterface_indicator:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
       port_ps01_port_order:
         type: integer
         required: true
@@ -804,6 +817,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/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
index d3916f9b9a..f1589d077b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
@@ -1,259 +1,265 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Main

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-topology_template:

-  inputs:

-    pd_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-    ps_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: ps_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPS001

-      - ZRDM1MOGX01MPS002

-      - ZRDM1MOGX01MPS003

-      - ZRDM1MOGX01MPS004

-      entry_schema:

-        type: string

-    availabilityzone_name:

-      label: availabilityzone name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: availabilityzone_name

-      type: string

-      description: availabilityzone name

-      default: nova

-    ps_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: ps_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_image_name:

-      label: image name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_image_name

-      type: string

-      description: PD image name

-      default: MOG_BASE_8.0

-    pd_server_names:

-      label: PD server names

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: pd_server_names

-      type: list

-      description: name of the PD instance

-      default:

-      - ZRDM1MOGX01MPD001

-      - ZRDM1MOGX01MPD002

-      entry_schema:

-        type: string

-    ps_flavor_name:

-      label: PD flavor name

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - hot-mog-0108-bs1271

-            source_type: HEAT

-            param_name: ps_flavor_name

-      type: string

-      description: flavor name of PD instance

-      default: m3.xlarge

-  node_templates:

-    abstract_pd_server:

-      type: org.openecomp.resource.abstract.nodes.pd_server

-      directives:

-      - substitutable

-      properties:

-        compute_pd_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_pd_server_name:

-        - get_input:

-          - pd_server_names

-          - 1

-        - get_input:

-          - pd_server_names

-          - 0

-        port_pd01_port_replacement_policy:

-        - AUTO

-        - AUTO

-        vm_flavor_name:

-          get_input: pd_flavor_name

-        port_pd01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        vm_image_name:

-          get_input: pd_image_name

-        port_pd01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        port_pd01_port_network:

-        - Network-PD-1

-        - Network-PD-0

-        compute_pd_server_user_data_format:

-        - null

-        - get_attribute:

-          - abstract_ps_server

-          - ps_server_accessIPv4

-        service_template_filter:

-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-    abstract_ps_server:

-      type: org.openecomp.resource.abstract.nodes.ps_server

-      directives:

-      - substitutable

-      properties:

-        compute_ps_server_name:

-        - get_input:

-          - ps_server_names

-          - 0

-        - get_input:

-          - ps_server_names

-          - 1

-        compute_ps_server_availability_zone:

-        - get_input: availabilityzone_name

-        - get_input: availabilityzone_name

-        compute_ps_server_user_data_format:

-        - get_attribute:

-          - abstract_pd_server

-          - pd_server_accessIPv4

-        - null

-        vm_flavor_name:

-          get_input: ps_flavor_name

-        vm_image_name:

-          get_input: ps_image_name

-        port_ps01_port_replacement_policy:

-        - AUTO

-        - AUTO

-        port_ps01_port_mac_requirements:

-          mac_count_required:

-            is_required: false

-        port_ps01_port_network:

-        - Network-PS-0

-        - Network-PS-1

-        port_ps01_port_ip_requirements:

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        - - ip_version: 4

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-          - ip_version: 6

-            ip_count_required:

-              is_required: false

-            floating_ip_count_required:

-              is_required: false

-        service_template_filter:

-          substitute_service_template: Nested_ps_serverServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-  groups:

-    hot-mog-0108-bs1271_group:

-      type: org.openecomp.groups.heat.HeatStack

-      properties:

-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

-        description: heat template that creates MOG stack

-      members:

-      - abstract_pd_server

-      - abstract_ps_server

+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    pd_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+    ps_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: ps_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPS001
+      - ZRDM1MOGX01MPS002
+      - ZRDM1MOGX01MPS003
+      - ZRDM1MOGX01MPS004
+      entry_schema:
+        type: string
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: availabilityzone_name
+      type: string
+      description: availabilityzone name
+      default: nova
+    ps_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: ps_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_image_name
+      type: string
+      description: PD image name
+      default: MOG_BASE_8.0
+    pd_server_names:
+      label: PD server names
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: pd_server_names
+      type: list
+      description: name of the PD instance
+      default:
+      - ZRDM1MOGX01MPD001
+      - ZRDM1MOGX01MPD002
+      entry_schema:
+        type: string
+    ps_flavor_name:
+      label: PD flavor name
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - hot-mog-0108-bs1271
+            source_type: HEAT
+            param_name: ps_flavor_name
+      type: string
+      description: flavor name of PD instance
+      default: m3.xlarge
+  node_templates:
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
+      directives:
+      - substitutable
+      properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO
+        - AUTO
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - Network-PD-1
+        - Network-PD-0
+        port_pd01_port_subinterface_indicator:
+        - true
+        - true
+        compute_pd_server_user_data_format:
+        - null
+        - get_attribute:
+          - abstract_ps_server
+          - ps_server_accessIPv4
+        service_template_filter:
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+    abstract_ps_server:
+      type: org.openecomp.resource.abstract.nodes.ps_server
+      directives:
+      - substitutable
+      properties:
+        compute_ps_server_name:
+        - get_input:
+          - ps_server_names
+          - 0
+        - get_input:
+          - ps_server_names
+          - 1
+        compute_ps_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_ps_server_user_data_format:
+        - get_attribute:
+          - abstract_pd_server
+          - pd_server_accessIPv4
+        - null
+        vm_flavor_name:
+          get_input: ps_flavor_name
+        port_ps01_port_subinterface_indicator:
+        - true
+        - true
+        vm_image_name:
+          get_input: ps_image_name
+        port_ps01_port_replacement_policy:
+        - AUTO
+        - AUTO
+        port_ps01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_ps01_port_network:
+        - Network-PS-0
+        - Network-PS-1
+        port_ps01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+          - ip_version: 6
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        service_template_filter:
+          substitute_service_template: Nested_ps_serverServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+  groups:
+    hot-mog-0108-bs1271_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
+        description: heat template that creates MOG stack
+      members:
+      - abstract_pd_server
+      - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
index 2926457146..51bcd3b538 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_pd01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_pd01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
index 0f7eac2983..edf777c2a6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps01_port_subinterface_indicator:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
     port_ps01_port_order:
       type: integer
       required: true
@@ -108,6 +113,10 @@ topology_template:
           - index_value
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
+        subinterface_indicator:
+          get_input:
+          - port_ps01_port_subinterface_indicator
+          - index_value
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -310,4 +319,4 @@ topology_template:
       - dependency
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file