3 files changed, 2103 insertions, 2088 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ef80586599..b4f43f271c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1,843 +1,840 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: GlobalSubstitutionTypes

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-node_types:

-  org.openecomp.resource.abstract.nodes.vdbe:

-    derived_from: org.openecomp.resource.abstract.nodes.VFC

-    properties:

-      subinterface_vlan1_aap_untrusted_v6_ip_prefix:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_aap_sec_untrusted_ip_prefix:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_vmac_address:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      compute_vdbe_availability_zone:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: json

-      port_vdbe_untr_2_port_network_role_tag:

-        type: string

-        required: true

-        status: SUPPORTED

-      vm_flavor_name:

-        type: string

-        required: true

-        status: SUPPORTED

-      untrusted_num_vn:

-        type: float

-        description: Number of vDBE subinterface virtual Networks

-        required: true

-        status: SUPPORTED

-        constraints:

-        - in_range:

-          - 1

-          - 77

-      subinterface_vlan1_counter:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: float

-      vm_image_name:

-        type: string

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_2_port_network_role:

-        type: string

-        required: true

-        status: SUPPORTED

-      compute_vdbe_metadata:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: json

-      subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_1_port_ip_requirements:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: org.openecomp.datatypes.network.IpRequirements

-      port_vdbe_untr_2_port_vlan_requirements:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: org.openecomp.datatypes.network.VlanRequirements

-      port_vdbe_untr_2_port_exCP_naming:

-        type: org.openecomp.datatypes.Naming

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_2_port_ip_requirements:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: org.openecomp.datatypes.network.IpRequirements

-      port_vdbe_untr_1_port_mac_requirements:

-        type: org.openecomp.datatypes.network.MacRequirements

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_1_port_order:

-        type: integer

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_1_port_subnetpoolid:

-        type: string

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_2_port_mac_requirements:

-        type: org.openecomp.datatypes.network.MacRequirements

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:

-        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs

-        required: true

-        status: SUPPORTED

-      subinterface_vlan1_mac_address:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_aap_untrusted_ip_prefix_len:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_ip_address:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      compute_vdbe_name:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_1_port_network_role_tag:

-        type: string

-        required: true

-        status: SUPPORTED

-      subinterface_vlan1_ip_v6_address:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_aap_untrusted_ip_prefix:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_2_port_virtual_network_refs:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: json

-      subinterface_vlan1_subinterfaces_name_prefix:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_1_port_network_role:

-        type: string

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_2_port_name:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_1_port_virtual_network_refs:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: json

-      subinterface_vlan1_vn_network_list:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_2_port_subnetpoolid:

-        type: string

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_2_port_order:

-        type: integer

-        required: true

-        status: SUPPORTED

-      subinterface_vlan1_parent_interface:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_aap_address_mode:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      index_value:

-        type: integer

-        description: Index value of this substitution service template runtime instance

-        required: false

-        default: 0

-        status: SUPPORTED

-        constraints:

-        - greater_or_equal: 0

-      port_vdbe_untr_1_port_exCP_naming:

-        type: org.openecomp.datatypes.Naming

-        required: true

-        status: SUPPORTED

-      subinterface_vlan1_optional_property_1:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_1_port_name:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_optional_property_2:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:

-        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs

-        required: true

-        status: SUPPORTED

-      port_vdbe_untr_1_port_vlan_requirements:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: org.openecomp.datatypes.network.VlanRequirements

-      port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: json

-      subinterface_vlan1_vlan_tag_list:

-        type: list

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: json

-    requirements:

-    - dependency_vdbe:

-        capability: tosca.capabilities.Node

-        node: tosca.nodes.Root

-        relationship: tosca.relationships.DependsOn

-        occurrences:

-        - 0

-        - UNBOUNDED

-    - local_storage_vdbe:

-        capability: tosca.capabilities.Attachment

-        node: tosca.nodes.BlockStorage

-        relationship: tosca.relationships.AttachesTo

-        occurrences:

-        - 0

-        - UNBOUNDED

-    - dependency_vdbe_vdbe_untr_2_port:

-        capability: tosca.capabilities.Node

-        node: tosca.nodes.Root

-        relationship: tosca.relationships.DependsOn

-        occurrences:

-        - 0

-        - UNBOUNDED

-    - link_vdbe_vdbe_untr_2_port:

-        capability: tosca.capabilities.network.Linkable

-        relationship: tosca.relationships.network.LinksTo

-        occurrences:

-        - 1

-        - 1

-    - dependency_vdbe_vdbe_untr_1_port_vlan1:

-        capability: tosca.capabilities.Node

-        node: tosca.nodes.Root

-        relationship: tosca.relationships.DependsOn

-        occurrences:

-        - 0

-        - UNBOUNDED

-    - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:

-        capability: tosca.capabilities.Node

-        node: tosca.nodes.Root

-        relationship: tosca.relationships.DependsOn

-        occurrences:

-        - 0

-        - UNBOUNDED

-    - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:

-        capability: tosca.capabilities.network.Linkable

-        relationship: tosca.relationships.network.LinksTo

-        occurrences:

-        - 1

-        - 1

-    - dependency_vdbe_vdbe_untr_1_port:

-        capability: tosca.capabilities.Node

-        node: tosca.nodes.Root

-        relationship: tosca.relationships.DependsOn

-        occurrences:

-        - 0

-        - UNBOUNDED

-    - link_vdbe_vdbe_untr_1_port:

-        capability: tosca.capabilities.network.Linkable

-        relationship: tosca.relationships.network.LinksTo

-        occurrences:

-        - 1

-        - 1

-    capabilities:

-      feature_vdbe:

-        type: tosca.capabilities.Node

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.iops_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      endpoint_vdbe:

-        type: tosca.capabilities.Endpoint.Admin

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.ephemeral.size_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      feature_vdbe_vdbe_untr_2_port:

-        type: tosca.capabilities.Node

-        occurrences:

-        - 1

-        - UNBOUNDED

-      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:

-        type: tosca.capabilities.Node

-        occurrences:

-        - 1

-        - UNBOUNDED

-      cpu_util_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      vcpus_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.write.requests_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      feature_vdbe_vdbe_untr_1_port_vlan1:

-        type: tosca.capabilities.Node

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.latency_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.write.requests.rate_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.packets_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      feature_vdbe_vdbe_untr_1_port:

-        type: tosca.capabilities.Node

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.write.bytes.rate_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.bytes.rate_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.packets.rate_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      scalable_vdbe:

-        type: tosca.capabilities.Scalable

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.iops_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.write.requests_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.capacity_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outgoing.bytes_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.allocation_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.usage_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      memory.usage_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outpoing.packets_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.read.requests_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.bytes_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      instance_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      cpu.delta_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outgoing.packets.rate_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      binding_vdbe_vdbe_untr_1_port:

-        type: tosca.capabilities.network.Bindable

-        valid_source_types:

-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface

-        occurrences:

-        - 0

-        - UNBOUNDED

-      disk.device.read.bytes.rate_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.write.bytes.rate_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      memory.resident_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      forwarder_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.Forwarder

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.write.requests.rate_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      cpu_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.write.bytes_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      forwarder_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.Forwarder

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.usage_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.read.bytes_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.latency_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.capacity_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      host_vdbe:

-        type: tosca.capabilities.Container

-        valid_source_types:

-        - tosca.nodes.SoftwareComponent

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.allocation_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outpoing.packets_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.packets_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.read.bytes.rate_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.bytes_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      os_vdbe:

-        type: tosca.capabilities.OperatingSystem

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.read.requests_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.packets.rate_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.root.size_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.incoming.bytes.rate_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      binding_vdbe_vdbe_untr_2_port:

-        type: tosca.capabilities.network.Bindable

-        valid_source_types:

-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface

-        occurrences:

-        - 0

-        - UNBOUNDED

-      memory_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      binding_vdbe:

-        type: tosca.capabilities.network.Bindable

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.write.bytes_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outgoing.bytes_vdbe_vdbe_untr_2_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.device.read.requests.rate_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-      disk.read.bytes_vdbe:

-        type: org.openecomp.capabilities.metric.Ceilometer

-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

-        occurrences:

-        - 1

-        - UNBOUNDED

-  org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1:

-    derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute

-    properties:

-      aap_untrusted_ip_prefix:

-        type: string

-        description: ip prefix for primary vDBE VM on the VAN untrusted network

-        required: true

-        status: SUPPORTED

-      aap_sec_untrusted_ip_prefix:

-        type: string

-        description: ip prefix for secondary vDBE VM aap on the VAN untrusted network

-        required: true

-        status: SUPPORTED

-      ip_v6_address:

-        type: string

-        description: IPv6 address associated with subinterfaces

-        required: true

-        status: SUPPORTED

-      counter:

-        type: float

-        description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.

-        required: true

-        status: SUPPORTED

-      subinterfaces_name_prefix:

-        type: string

-        description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource

-        required: true

-        status: SUPPORTED

-      ip_address:

-        type: string

-        description: IPv4 address associated with subinterfaces

-        required: true

-        status: SUPPORTED

-      aap_address_mode:

-        type: string

-        description: Address mode for the vDBE cluster IP

-        required: true

-        status: SUPPORTED

-      aap_untrusted_v6_ip_prefix:

-        type: string

-        description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network

-        required: true

-        status: SUPPORTED

-      parent_interface:

-        type: string

-        description: Parent Contrail interface

-        required: true

-        status: SUPPORTED

-      vn_network_list:

-        type: string

-        description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list

-        required: true

-        status: SUPPORTED

-      optional_property_1:

-        type: string

-        description: Optional property

-        required: true

-        status: SUPPORTED

-      optional_property_2:

-        type: string

-        description: Optional property

-        required: true

-        status: SUPPORTED

-      mac_address:

-        type: string

-        description: HW MAC address to use for subinterface

-        required: true

-        status: SUPPORTED

-      vlan_tag_list:

-        type: list

-        description: List of VLAN IDs to use for subinterfaces

-        required: true

-        status: SUPPORTED

-        entry_schema:

-          type: string

-      aap_sec_untrusted_ip_prefix_len:

-        type: string

-        description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network

-        required: true

-        status: SUPPORTED

-      vmac_address:

-        type: string

-        description: virtual MAC address to use for subinterface

-        required: true

-        status: SUPPORTED

-      aap_untrusted_v6_ip_prefix_len:

-        type: string

-        description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network

-        required: true

-        status: SUPPORTED

-      aap_untrusted_ip_prefix_len:

-        type: string

-        description: ip prefix length for the primary vDBE VM on the VAN untrusted network

-        required: true

-        status: SUPPORTED

-    requirements:

-    - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:

-        capability: tosca.capabilities.Node

-        node: tosca.nodes.Root

-        relationship: tosca.relationships.DependsOn

-        occurrences:

-        - 0

-        - UNBOUNDED

-    - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:

-        capability: tosca.capabilities.network.Linkable

-        relationship: tosca.relationships.network.LinksTo

-        occurrences:

-        - 1

-        - 1

-    - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:

-        capability: tosca.capabilities.network.Bindable

-        node: org.openecomp.resource.cp.nodes.network.Port

-        relationship: tosca.relationships.network.BindsTo

-        occurrences:

-        - 1

-        - 1

-    capabilities:

-      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:

-        type: tosca.capabilities.Node

-        occurrences:

-        - 1

-        - UNBOUNDED
\ No newline at end of file
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: GlobalSubstitutionTypes
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+node_types:
+  org.openecomp.resource.abstract.nodes.vdbe:
+    derived_from: org.openecomp.resource.abstract.nodes.VFC
+    properties:
+      subinterface_vlan1_aap_untrusted_v6_ip_prefix:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_aap_sec_untrusted_ip_prefix:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_vmac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_vdbe_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_vdbe_untr_2_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_counter:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: float
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_2_port_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_vdbe_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vdbe_untr_2_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vdbe_untr_2_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vdbe_untr_1_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_1_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_1_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_2_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_aap_untrusted_ip_prefix_len:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_ip_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_vdbe_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_1_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_ip_v6_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_aap_untrusted_ip_prefix:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_2_port_virtual_network_refs:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      subinterface_vlan1_subinterfaces_name_prefix:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_1_port_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_2_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_1_port_virtual_network_refs:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      subinterface_vlan1_vn_network_list:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_2_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_2_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_service_template_filter_count:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: float
+      subinterface_vlan1_parent_interface:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_aap_address_mode:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_vdbe_untr_1_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_optional_property_1:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_1_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_optional_property_2:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
+        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      subinterface_vlan1_vlan_tag_list:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+    requirements:
+    - dependency_vdbe:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_vdbe:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_vdbe_vdbe_untr_2_port:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_vdbe_vdbe_untr_2_port:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_vdbe_vdbe_untr_1_port_vlan1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_vdbe_vdbe_untr_1_port:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_vdbe_vdbe_untr_1_port:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
+      feature_vdbe:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.iops_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      endpoint_vdbe:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_vdbe_vdbe_untr_2_port:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_vdbe_vdbe_untr_1_port_vlan1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_vdbe_vdbe_untr_1_port:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_vdbe:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.usage_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.requests_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      instance_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_vdbe_vdbe_untr_1_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.read.bytes.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.usage_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_vdbe:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.allocation_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      os_vdbe:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_vdbe_vdbe_untr_2_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      memory_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_vdbe:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_vdbe_vdbe_untr_2_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+  org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1:
+    derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
+    properties:
+      aap_untrusted_ip_prefix:
+        type: string
+        description: ip prefix for primary vDBE VM on the VAN untrusted network
+        required: true
+        status: SUPPORTED
+      aap_sec_untrusted_ip_prefix:
+        type: string
+        description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
+        required: true
+        status: SUPPORTED
+      ip_v6_address:
+        type: string
+        description: IPv6 address associated with subinterfaces
+        required: true
+        status: SUPPORTED
+      counter:
+        type: float
+        description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
+        required: true
+        status: SUPPORTED
+      subinterfaces_name_prefix:
+        type: string
+        description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
+        required: true
+        status: SUPPORTED
+      ip_address:
+        type: string
+        description: IPv4 address associated with subinterfaces
+        required: true
+        status: SUPPORTED
+      aap_address_mode:
+        type: string
+        description: Address mode for the vDBE cluster IP
+        required: true
+        status: SUPPORTED
+      aap_untrusted_v6_ip_prefix:
+        type: string
+        description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
+        required: true
+        status: SUPPORTED
+      parent_interface:
+        type: string
+        description: Parent Contrail interface
+        required: true
+        status: SUPPORTED
+      vn_network_list:
+        type: string
+        description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
+        required: true
+        status: SUPPORTED
+      optional_property_1:
+        type: string
+        description: Optional property
+        required: true
+        status: SUPPORTED
+      optional_property_2:
+        type: string
+        description: Optional property
+        required: true
+        status: SUPPORTED
+      mac_address:
+        type: string
+        description: HW MAC address to use for subinterface
+        required: true
+        status: SUPPORTED
+      vlan_tag_list:
+        type: list
+        description: List of VLAN IDs to use for subinterfaces
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      aap_sec_untrusted_ip_prefix_len:
+        type: string
+        description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
+        required: true
+        status: SUPPORTED
+      vmac_address:
+        type: string
+        description: virtual MAC address to use for subinterface
+        required: true
+        status: SUPPORTED
+      aap_untrusted_v6_ip_prefix_len:
+        type: string
+        description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
+        required: true
+        status: SUPPORTED
+      aap_untrusted_ip_prefix_len:
+        type: string
+        description: ip prefix length for the primary vDBE VM on the VAN untrusted network
+        required: true
+        status: SUPPORTED
+    requirements:
+    - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
+        capability: tosca.capabilities.network.Bindable
+        node: org.openecomp.resource.cp.nodes.network.Port
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
+      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
index 90cdb208c7..649026024e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
@@ -1,600 +1,620 @@
-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:

-    vf_module_id:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vf_module_id

-      type: string

-      description: Unique ID for this VF module inst

-    fabric_int_net_rpf:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: fabric_int_net_rpf

-      type: string

-      description: Reverse Path Filtering enable or disable for the fabric virtual network

-    control_int_net_rpf:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: control_int_net_rpf

-      type: string

-      description: Reverse Path Filtering enable or disable for the control virtual network

-    control_int_net_forwarding_mode:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: control_int_net_forwarding_mode

-      type: string

-      description: forwarding mode of the control virtual network

-    vnf_name:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vnf_name

-      type: string

-      description: Unique name for this VF instance

-    vdbe_untrusted_ip_1:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_untrusted_ip_1

-      type: string

-      description: IPV4 address of the secondary vDBE VM on the VAN untrusted network

-    vdbe_aap_untrusted_ip_prefix_len:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_aap_untrusted_ip_prefix_len

-      type: string

-      description: ip prefix length for the primary vDBE VM on the VAN untrusted network

-    aap_address_mode:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: aap_address_mode

-      type: string

-      description: Address mode for the vDBE cluster IP

-    control_int_net_shared:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: control_int_net_shared

-      type: boolean

-      description: control virtual network shared

-    vdbe_untrusted_v6_ip_1:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_untrusted_v6_ip_1

-      type: string

-      description: IPV6 address of the secondary vDBE VM on the VAN untrusted network

-    vdbe_untrusted_vmac_address:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_untrusted_vmac_address

-      type: string

-      description: Virtual MAC of the primary vDBE VM on the VAN untrusted network

-    control_int_net_flood_unknown_unicast:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: control_int_net_flood_unknown_unicast

-      type: boolean

-      description: forwarding mode of the control virtual network

-    vdbe_aap_sec_untrusted_ip_prefix:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_aap_sec_untrusted_ip_prefix

-      type: string

-      description: ip prefix for secondary vDBE VM aap on the VAN untrusted network

-    vnf_id:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vnf_id

-      type: string

-      description: Unique ID for this VF inst

-    vdbe_name_1:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_name_1

-      type: string

-      description: VM Name for this vdbe node 1

-    availability_zone_1:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: availability_zone_1

-      type: string

-      description: The availability zone of secondary node1 vDBE vm in the local HA pair.

-    untrusted_vn_networks:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: untrusted_vn_networks

-      type: list

-      description: List of subinterface virtual networks

-      entry_schema:

-        type: string

-    vdbe_image_name:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_image_name

-      type: string

-      description: Image to use for vDBE

-    oam_net_name:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: oam_net_name

-      type: string

-      description: Name of NSDNet network from which the management IP addresses will be allocated

-    vdbe_aap_sec_untrusted_ip_prefix_len:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_aap_sec_untrusted_ip_prefix_len

-      type: string

-      description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network

-    vdbe_aap_untrusted_v6_ip_prefix:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_aap_untrusted_v6_ip_prefix

-      type: string

-      description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network

-    vdbe_aap_untrusted_v6_ip_prefix_len:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_aap_untrusted_v6_ip_prefix_len

-      type: string

-      description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network

-    fabric_int_net_flood_unknown_unicast:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: fabric_int_net_flood_unknown_unicast

-      type: boolean

-      description: forwarding mode of the fabric virtual network

-    untrusted_vlan_tags:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: untrusted_vlan_tags

-      type: list

-      description: List of subinterface vlan tags

-      entry_schema:

-        type: string

-    vdbe_flavor_name:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_flavor_name

-      type: string

-      description: Flavor to use for vDBE

-    counter:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: counter

-      type: float

-      description: Counter.

-    fabric_int_net_forwarding_mode:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: fabric_int_net_forwarding_mode

-      type: string

-      description: forwarding mode of the fabric virtual network

-    fabric_int_net_shared:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: fabric_int_net_shared

-      description: fabric virtual network shared

-    vdbe_hw_untr_mac_1:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_hw_untr_mac_1

-      type: string

-      description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network

-    untrusted_net_name:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: untrusted_net_name

-      type: string

-      description: Name of public untrusted network into which this vDBE HA cluster is deployed

-    vdbe_device_name:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_device_name

-      type: string

-      description: VDBE device Name for this vdbe VNF

-    vdbe_aap_untrusted_ip_prefix:

-      hidden: false

-      immutable: false

-      annotations:

-        source:

-          type: org.openecomp.annotations.Source

-          properties:

-            vf_module_label:

-            - main

-            source_type: HEAT

-            param_name: vdbe_aap_untrusted_ip_prefix

-      type: string

-      description: ip prefix for primary vDBE VM on the VAN untrusted network

-  node_templates:

-    fabric_int_net:

-      type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork

-      properties:

-        network_name:

-          str_replace:

-            template: template-fabric-int

-            params:

-              VNF_NAME:

-                get_input: vnf_name

-    control_int_net:

-      type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork

-      properties:

-        network_name:

-          str_replace:

-            template: VNF_NAME_control_net

-            params:

-              VNF_NAME:

-                get_input: vnf_name

-    abstract_vdbe:

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

-      directives:

-      - substitutable

-      properties:

-        subinterface_vlan1_aap_untrusted_v6_ip_prefix:

-        - get_input: vdbe_aap_untrusted_v6_ip_prefix

-        - get_input: vdbe_aap_untrusted_v6_ip_prefix

-        subinterface_vlan1_aap_sec_untrusted_ip_prefix:

-        - get_input: vdbe_aap_sec_untrusted_ip_prefix

-        - get_input: vdbe_aap_sec_untrusted_ip_prefix

-        subinterface_vlan1_vmac_address:

-        - get_input: vdbe_untrusted_vmac_address

-        - get_input: vdbe_untrusted_vmac_address

-        compute_vdbe_availability_zone:

-        - get_input: availability_zone_1

-        - get_input: availability_zone_1

-        port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:

-        - - get_input: vdbe_hw_untr_mac_1

-        - - get_input: vdbe_hw_untr_mac_1

-        vm_flavor_name:

-          get_input: vdbe_flavor_name

-        subinterface_vlan1_counter:

-        - get_input: counter

-        - get_input: counter

-        vm_image_name:

-          get_input: vdbe_image_name

-        compute_vdbe_metadata:

-        - vf_module_id:

-            get_input: vf_module_id

-          vnf_id:

-            get_input: vnf_id

-          vnf_name:

-            get_input: vnf_name

-        - vf_module_id:

-            get_input: vf_module_id

-          vnf_id:

-            get_input: vnf_id

-          vnf_name:

-            get_input: vnf_name

-        subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:

-        - get_input: vdbe_aap_untrusted_v6_ip_prefix_len

-        - get_input: vdbe_aap_untrusted_v6_ip_prefix_len

-        subinterface_vlan1_mac_address:

-        - get_input: vdbe_hw_untr_mac_1

-        - get_input: vdbe_hw_untr_mac_1

-        subinterface_vlan1_aap_untrusted_ip_prefix_len:

-        - get_input: vdbe_aap_untrusted_ip_prefix_len

-        - get_input: vdbe_aap_untrusted_ip_prefix_len

-        subinterface_vlan1_ip_address:

-        - get_input: vdbe_untrusted_ip_1

-        - get_input: vdbe_untrusted_ip_1

-        compute_vdbe_name:

-        - get_input: vdbe_name_1

-        - get_input: vdbe_name_1

-        subinterface_vlan1_ip_v6_address:

-        - get_input: vdbe_untrusted_v6_ip_1

-        - get_input: vdbe_untrusted_v6_ip_1

-        subinterface_vlan1_aap_untrusted_ip_prefix:

-        - get_input: vdbe_aap_untrusted_ip_prefix

-        - get_input: vdbe_aap_untrusted_ip_prefix

-        port_vdbe_untr_2_port_virtual_network_refs:

-        - - fabric_int_net

-        - - fabric_int_net

-        subinterface_vlan1_subinterfaces_name_prefix:

-        - str_replace:

-            template: VM_NAMEDBE001p1n004

-            params:

-              DBE:

-                get_input: vdbe_device_name

-              VM_NAME:

-                get_input: vdbe_name_1

-        - str_replace:

-            template: VM_NAMEDBE001p1n004

-            params:

-              DBE:

-                get_input: vdbe_device_name

-              VM_NAME:

-                get_input: vdbe_name_1

-        port_vdbe_untr_2_port_name:

-        - Port_2

-        - Port_4

-        port_vdbe_untr_1_port_virtual_network_refs:

-        - - control_int_net

-        - - control_int_net

-        subinterface_vlan1_vn_network_list:

-        - get_input: untrusted_vn_networks

-        - get_input: untrusted_vn_networks

-        subinterface_vlan1_parent_interface:

-        - vdbe_untr_1_port_1

-        - vdbe_untr_1_port_2

-        subinterface_vlan1_aap_address_mode:

-        - get_input: aap_address_mode

-        - get_input: aap_address_mode

-        subinterface_vlan1_optional_property_1:

-        - OPTIONAL_VALUE_SUBPORT_1

-        - null

-        port_vdbe_untr_1_port_name:

-        - str_replace:

-            template: VM_NAMEDBE001p1n004

-            params:

-              DBE:

-                get_input: vdbe_device_name

-              VM_NAME:

-                get_input: vdbe_name_1

-        - str_replace:

-            template: Port 3

-            params:

-              DBE:

-                get_input: vdbe_device_name

-              VM_NAME:

-                get_input: vdbe_name_1

-        subinterface_vlan1_optional_property_2:

-        - null

-        - OPTIONAL_VALUE_SUBPORT_2

-        subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:

-        - get_input: vdbe_aap_sec_untrusted_ip_prefix_len

-        - get_input: vdbe_aap_sec_untrusted_ip_prefix_len

-        port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:

-        - - get_input: vdbe_hw_untr_mac_1

-        - - get_input: vdbe_hw_untr_mac_1

-        subinterface_vlan1_vlan_tag_list:

-        - get_input: untrusted_vlan_tags

-        - get_input: untrusted_vlan_tags

-        service_template_filter:

-          substitute_service_template: Nested_vdbeServiceTemplate.yaml

-          count: 2

-        index_value:

-          get_property:

-          - SELF

-          - service_template_filter

-          - index_value

-      requirements:

-      - link_vdbe_vdbe_untr_1_port:

-          capability: tosca.capabilities.network.Linkable

-          node: control_int_net

-          relationship: tosca.relationships.network.LinksTo

-      - link_vdbe_vdbe_untr_2_port:

-          capability: tosca.capabilities.network.Linkable

-          node: fabric_int_net

-          relationship: tosca.relationships.network.LinksTo

-  groups:

-    main_group:

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

-      properties:

-        heat_file: ../Artifacts/main.yml

-        description: |

-          Version 2.0 02-09-2016 (Authors: John Doe, user PROD)

-      members:

-      - fabric_int_net

-      - control_int_net

-      - abstract_vdbe
\ No newline at end of file
+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:
+    vf_module_id:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vf_module_id
+      type: string
+      description: Unique ID for this VF module inst
+    fabric_int_net_rpf:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: fabric_int_net_rpf
+      type: string
+      description: Reverse Path Filtering enable or disable for the fabric virtual network
+    control_int_net_rpf:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: control_int_net_rpf
+      type: string
+      description: Reverse Path Filtering enable or disable for the control virtual network
+    control_int_net_forwarding_mode:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: control_int_net_forwarding_mode
+      type: string
+      description: forwarding mode of the control virtual network
+    vnf_name:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vnf_name
+      type: string
+      description: Unique name for this VF instance
+    vdbe_untrusted_ip_1:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_untrusted_ip_1
+      type: string
+      description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
+    vdbe_aap_untrusted_ip_prefix_len:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_aap_untrusted_ip_prefix_len
+      type: string
+      description: ip prefix length for the primary vDBE VM on the VAN untrusted network
+    untrusted_num_vn:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: untrusted_num_vn
+      type: float
+      description: Number of vDBE subinterface virtual Networks
+      constraints:
+      - in_range:
+        - 1
+        - 77
+    aap_address_mode:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: aap_address_mode
+      type: string
+      description: Address mode for the vDBE cluster IP
+    control_int_net_shared:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: control_int_net_shared
+      type: boolean
+      description: control virtual network shared
+    vdbe_untrusted_v6_ip_1:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_untrusted_v6_ip_1
+      type: string
+      description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
+    vdbe_untrusted_vmac_address:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_untrusted_vmac_address
+      type: string
+      description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
+    control_int_net_flood_unknown_unicast:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: control_int_net_flood_unknown_unicast
+      type: boolean
+      description: forwarding mode of the control virtual network
+    vdbe_aap_sec_untrusted_ip_prefix:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_aap_sec_untrusted_ip_prefix
+      type: string
+      description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
+    vnf_id:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vnf_id
+      type: string
+      description: Unique ID for this VF inst
+    vdbe_name_1:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_name_1
+      type: string
+      description: VM Name for this vdbe node 1
+    availability_zone_1:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: availability_zone_1
+      type: string
+      description: The availability zone of secondary node1 vDBE vm in the local HA pair.
+    untrusted_vn_networks:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: untrusted_vn_networks
+      type: list
+      description: List of subinterface virtual networks
+      entry_schema:
+        type: string
+    vdbe_image_name:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_image_name
+      type: string
+      description: Image to use for vDBE
+    oam_net_name:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: oam_net_name
+      type: string
+      description: Name of NSDNet network from which the management IP addresses will be allocated
+    vdbe_aap_sec_untrusted_ip_prefix_len:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_aap_sec_untrusted_ip_prefix_len
+      type: string
+      description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
+    vdbe_aap_untrusted_v6_ip_prefix:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_aap_untrusted_v6_ip_prefix
+      type: string
+      description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
+    vdbe_aap_untrusted_v6_ip_prefix_len:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_aap_untrusted_v6_ip_prefix_len
+      type: string
+      description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
+    fabric_int_net_flood_unknown_unicast:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: fabric_int_net_flood_unknown_unicast
+      type: boolean
+      description: forwarding mode of the fabric virtual network
+    untrusted_vlan_tags:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: untrusted_vlan_tags
+      type: list
+      description: List of subinterface vlan tags
+      entry_schema:
+        type: string
+    vdbe_flavor_name:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_flavor_name
+      type: string
+      description: Flavor to use for vDBE
+    counter:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: counter
+      type: float
+      description: Counter.
+    fabric_int_net_forwarding_mode:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: fabric_int_net_forwarding_mode
+      type: string
+      description: forwarding mode of the fabric virtual network
+    fabric_int_net_shared:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: fabric_int_net_shared
+      description: fabric virtual network shared
+    vdbe_hw_untr_mac_1:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_hw_untr_mac_1
+      type: string
+      description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
+    untrusted_net_name:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: untrusted_net_name
+      type: string
+      description: Name of public untrusted network into which this vDBE HA cluster is deployed
+    vdbe_device_name:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_device_name
+      type: string
+      description: VDBE device Name for this vdbe VNF
+    vdbe_aap_untrusted_ip_prefix:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vdbe_aap_untrusted_ip_prefix
+      type: string
+      description: ip prefix for primary vDBE VM on the VAN untrusted network
+  node_templates:
+    fabric_int_net:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
+      properties:
+        network_name:
+          str_replace:
+            template: template-fabric-int
+            params:
+              VNF_NAME:
+                get_input: vnf_name
+    control_int_net:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
+      properties:
+        network_name:
+          str_replace:
+            template: VNF_NAME_control_net
+            params:
+              VNF_NAME:
+                get_input: vnf_name
+    abstract_vdbe:
+      type: org.openecomp.resource.abstract.nodes.vdbe
+      directives:
+      - substitutable
+      properties:
+        subinterface_vlan1_aap_untrusted_v6_ip_prefix:
+        - get_input: vdbe_aap_untrusted_v6_ip_prefix
+        - get_input: vdbe_aap_untrusted_v6_ip_prefix
+        subinterface_vlan1_aap_sec_untrusted_ip_prefix:
+        - get_input: vdbe_aap_sec_untrusted_ip_prefix
+        - get_input: vdbe_aap_sec_untrusted_ip_prefix
+        subinterface_vlan1_vmac_address:
+        - get_input: vdbe_untrusted_vmac_address
+        - get_input: vdbe_untrusted_vmac_address
+        compute_vdbe_availability_zone:
+        - get_input: availability_zone_1
+        - get_input: availability_zone_1
+        port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
+        - - get_input: vdbe_hw_untr_mac_1
+        - - get_input: vdbe_hw_untr_mac_1
+        vm_flavor_name:
+          get_input: vdbe_flavor_name
+        subinterface_vlan1_counter:
+        - get_input: counter
+        - get_input: counter
+        vm_image_name:
+          get_input: vdbe_image_name
+        compute_vdbe_metadata:
+        - vf_module_id:
+            get_input: vf_module_id
+          vnf_id:
+            get_input: vnf_id
+          vnf_name:
+            get_input: vnf_name
+        - vf_module_id:
+            get_input: vf_module_id
+          vnf_id:
+            get_input: vnf_id
+          vnf_name:
+            get_input: vnf_name
+        subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+        - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+        - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+        subinterface_vlan1_mac_address:
+        - get_input: vdbe_hw_untr_mac_1
+        - get_input: vdbe_hw_untr_mac_1
+        subinterface_vlan1_aap_untrusted_ip_prefix_len:
+        - get_input: vdbe_aap_untrusted_ip_prefix_len
+        - get_input: vdbe_aap_untrusted_ip_prefix_len
+        subinterface_vlan1_ip_address:
+        - get_input: vdbe_untrusted_ip_1
+        - get_input: vdbe_untrusted_ip_1
+        compute_vdbe_name:
+        - get_input: vdbe_name_1
+        - get_input: vdbe_name_1
+        subinterface_vlan1_ip_v6_address:
+        - get_input: vdbe_untrusted_v6_ip_1
+        - get_input: vdbe_untrusted_v6_ip_1
+        subinterface_vlan1_aap_untrusted_ip_prefix:
+        - get_input: vdbe_aap_untrusted_ip_prefix
+        - get_input: vdbe_aap_untrusted_ip_prefix
+        port_vdbe_untr_2_port_virtual_network_refs:
+        - - fabric_int_net
+        - - fabric_int_net
+        subinterface_vlan1_subinterfaces_name_prefix:
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        port_vdbe_untr_2_port_name:
+        - Port_2
+        - Port_4
+        port_vdbe_untr_1_port_virtual_network_refs:
+        - - control_int_net
+        - - control_int_net
+        subinterface_vlan1_vn_network_list:
+        - get_input: untrusted_vn_networks
+        - get_input: untrusted_vn_networks
+        subinterface_vlan1_service_template_filter_count:
+        - get_input: untrusted_num_vn
+        - get_input: untrusted_num_vn
+        subinterface_vlan1_parent_interface:
+        - vdbe_untr_1_port_1
+        - vdbe_untr_1_port_2
+        subinterface_vlan1_aap_address_mode:
+        - get_input: aap_address_mode
+        - get_input: aap_address_mode
+        subinterface_vlan1_optional_property_1:
+        - OPTIONAL_VALUE_SUBPORT_1
+        - null
+        port_vdbe_untr_1_port_name:
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        - str_replace:
+            template: Port 3
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        subinterface_vlan1_optional_property_2:
+        - null
+        - OPTIONAL_VALUE_SUBPORT_2
+        subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
+        - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
+        - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
+        port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
+        - - get_input: vdbe_hw_untr_mac_1
+        - - get_input: vdbe_hw_untr_mac_1
+        subinterface_vlan1_vlan_tag_list:
+        - get_input: untrusted_vlan_tags
+        - get_input: untrusted_vlan_tags
+        service_template_filter:
+          substitute_service_template: Nested_vdbeServiceTemplate.yaml
+          count: 2
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+      requirements:
+      - link_vdbe_vdbe_untr_1_port:
+          capability: tosca.capabilities.network.Linkable
+          node: control_int_net
+          relationship: tosca.relationships.network.LinksTo
+      - link_vdbe_vdbe_untr_2_port:
+          capability: tosca.capabilities.network.Linkable
+          node: fabric_int_net
+          relationship: tosca.relationships.network.LinksTo
+  groups:
+    main_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/main.yml
+        description: |
+          Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+      members:
+      - fabric_int_net
+      - control_int_net
+      - abstract_vdbe
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
index 0d08d1e133..407cd60118 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
@@ -1,645 +1,643 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-metadata:

-  template_name: Nested_vdbe

-imports:

-- openecomp_heat_index:

-    file: openecomp-heat/_index.yml

-- GlobalSubstitutionTypes:

-    file: GlobalSubstitutionTypesServiceTemplate.yaml

-node_types:

-  org.openecomp.resource.vfc.compute.nodes.heat.vdbe:

-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server

-topology_template:

-  inputs:

-    subinterface_vlan1_aap_untrusted_v6_ip_prefix:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_aap_sec_untrusted_ip_prefix:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_vmac_address:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    compute_vdbe_availability_zone:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:

-      type: list

-      required: true

-      entry_schema:

-        type: json

-    port_vdbe_untr_2_port_network_role_tag:

-      type: string

-      required: true

-    vm_flavor_name:

-      type: string

-      required: true

-    untrusted_num_vn:

-      hidden: false

-      immutable: false

-      type: float

-      description: Number of vDBE subinterface virtual Networks

-      constraints:

-      - in_range:

-        - 1

-        - 77

-    subinterface_vlan1_counter:

-      type: list

-      required: true

-      entry_schema:

-        type: float

-    vm_image_name:

-      type: string

-      required: true

-    port_vdbe_untr_2_port_network_role:

-      type: string

-      required: true

-    compute_vdbe_metadata:

-      type: list

-      required: true

-      entry_schema:

-        type: json

-    subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_1_port_ip_requirements:

-      type: list

-      required: true

-      entry_schema:

-        type: org.openecomp.datatypes.network.IpRequirements

-    port_vdbe_untr_2_port_vlan_requirements:

-      type: list

-      required: true

-      entry_schema:

-        type: org.openecomp.datatypes.network.VlanRequirements

-    port_vdbe_untr_2_port_exCP_naming:

-      type: org.openecomp.datatypes.Naming

-      required: true

-    port_vdbe_untr_2_port_ip_requirements:

-      type: list

-      required: true

-      entry_schema:

-        type: org.openecomp.datatypes.network.IpRequirements

-    port_vdbe_untr_1_port_mac_requirements:

-      type: org.openecomp.datatypes.network.MacRequirements

-      required: true

-    port_vdbe_untr_1_port_order:

-      type: integer

-      required: true

-    port_vdbe_untr_1_port_subnetpoolid:

-      type: string

-      required: true

-    port_vdbe_untr_2_port_mac_requirements:

-      type: org.openecomp.datatypes.network.MacRequirements

-      required: true

-    port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:

-      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs

-      required: true

-    subinterface_vlan1_mac_address:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_aap_untrusted_ip_prefix_len:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_ip_address:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    compute_vdbe_name:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_1_port_network_role_tag:

-      type: string

-      required: true

-    subinterface_vlan1_ip_v6_address:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_aap_untrusted_ip_prefix:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_2_port_virtual_network_refs:

-      type: list

-      required: true

-      entry_schema:

-        type: json

-    subinterface_vlan1_subinterfaces_name_prefix:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_1_port_network_role:

-      type: string

-      required: true

-    port_vdbe_untr_2_port_name:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_1_port_virtual_network_refs:

-      type: list

-      required: true

-      entry_schema:

-        type: json

-    subinterface_vlan1_vn_network_list:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_2_port_subnetpoolid:

-      type: string

-      required: true

-    port_vdbe_untr_2_port_order:

-      type: integer

-      required: true

-    subinterface_vlan1_parent_interface:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_aap_address_mode:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    index_value:

-      type: integer

-      description: Index value of this substitution service template runtime instance

-      required: false

-      default: 0

-      constraints:

-      - greater_or_equal: 0

-    port_vdbe_untr_1_port_exCP_naming:

-      type: org.openecomp.datatypes.Naming

-      required: true

-    subinterface_vlan1_optional_property_1:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_1_port_name:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_optional_property_2:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:

-      type: list

-      required: true

-      entry_schema:

-        type: string

-    port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:

-      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs

-      required: true

-    port_vdbe_untr_1_port_vlan_requirements:

-      type: list

-      required: true

-      entry_schema:

-        type: org.openecomp.datatypes.network.VlanRequirements

-    port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:

-      type: list

-      required: true

-      entry_schema:

-        type: json

-    subinterface_vlan1_vlan_tag_list:

-      type: list

-      required: true

-      entry_schema:

-        type: json

-  node_templates:

-    vdbe:

-      type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe

-      properties:

-        availability_zone:

-          get_input:

-          - compute_vdbe_availability_zone

-          - index_value

-        flavor:

-          get_input: vm_flavor_name

-        metadata:

-          get_input:

-          - compute_vdbe_metadata

-          - index_value

-        image:

-          get_input: vm_image_name

-        name:

-          get_input:

-          - compute_vdbe_name

-          - index_value

-    vdbe_vdbe_untr_2_port:

-      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface

-      properties:

-        mac_requirements:

-          get_input: port_vdbe_untr_2_port_mac_requirements

-        order:

-          get_input: port_vdbe_untr_2_port_order

-        exCP_naming:

-          get_input: port_vdbe_untr_2_port_exCP_naming

-        virtual_machine_interface_allowed_address_pairs:

-          get_input:

-          - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs

-          - index_value

-        vlan_requirements:

-          get_input: port_vdbe_untr_2_port_vlan_requirements

-        virtual_network_refs:

-          get_input:

-          - port_vdbe_untr_2_port_virtual_network_refs

-          - index_value

-        ip_requirements:

-          get_input: port_vdbe_untr_2_port_ip_requirements

-        network_role_tag:

-          get_input: port_vdbe_untr_2_port_network_role_tag

-        virtual_machine_interface_mac_addresses:

-          get_input:

-          - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses

-          - index_value

-        network_role:

-          get_input: port_vdbe_untr_2_port_network_role

-        subnetpoolid:

-          get_input: port_vdbe_untr_2_port_subnetpoolid

-        name:

-          get_input:

-          - port_vdbe_untr_2_port_name

-          - index_value

-      requirements:

-      - binding:

-          capability: tosca.capabilities.network.Bindable

-          node: vdbe

-          relationship: tosca.relationships.network.BindsTo

-    vdbe_vdbe_untr_1_port_vlan1:

-      type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1

-      directives:

-      - substitutable

-      properties:

-        aap_untrusted_ip_prefix:

-          get_input:

-          - subinterface_vlan1_aap_untrusted_ip_prefix

-          - index_value

-        aap_sec_untrusted_ip_prefix:

-          get_input:

-          - subinterface_vlan1_aap_sec_untrusted_ip_prefix

-          - index_value

-        ip_v6_address:

-          get_input:

-          - subinterface_vlan1_ip_v6_address

-          - index_value

-        counter:

-          get_input:

-          - subinterface_vlan1_counter

-          - index_value

-        ip_address:

-          get_input:

-          - subinterface_vlan1_ip_address

-          - index_value

-        subinterfaces_name_prefix:

-          get_input:

-          - subinterface_vlan1_subinterfaces_name_prefix

-          - index_value

-        aap_address_mode:

-          get_input:

-          - subinterface_vlan1_aap_address_mode

-          - index_value

-        service_template_filter:

-          substitute_service_template: vlan1ServiceTemplate.yaml

-          count:

-            get_input: untrusted_num_vn

-          mandatory: false

-        aap_untrusted_v6_ip_prefix:

-          get_input:

-          - subinterface_vlan1_aap_untrusted_v6_ip_prefix

-          - index_value

-        parent_interface:

-          get_input:

-          - subinterface_vlan1_parent_interface

-          - index_value

-        vn_network_list:

-          get_input:

-          - subinterface_vlan1_vn_network_list

-          - index_value

-        optional_property_1:

-          get_input:

-          - subinterface_vlan1_optional_property_1

-          - index_value

-        optional_property_2:

-          get_input:

-          - subinterface_vlan1_optional_property_2

-          - index_value

-        mac_address:

-          get_input:

-          - subinterface_vlan1_mac_address

-          - index_value

-        vlan_tag_list:

-          get_input:

-          - subinterface_vlan1_vlan_tag_list

-          - index_value

-        aap_sec_untrusted_ip_prefix_len:

-          get_input:

-          - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len

-          - index_value

-        vmac_address:

-          get_input:

-          - subinterface_vlan1_vmac_address

-          - index_value

-        aap_untrusted_v6_ip_prefix_len:

-          get_input:

-          - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len

-          - index_value

-        aap_untrusted_ip_prefix_len:

-          get_input:

-          - subinterface_vlan1_aap_untrusted_ip_prefix_len

-          - index_value

-      requirements:

-      - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:

-          capability: tosca.capabilities.network.Bindable

-          node: vdbe_vdbe_untr_1_port

-          relationship: tosca.relationships.network.BindsTo

-    vdbe_vdbe_untr_1_port:

-      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface

-      properties:

-        mac_requirements:

-          get_input: port_vdbe_untr_1_port_mac_requirements

-        order:

-          get_input: port_vdbe_untr_1_port_order

-        exCP_naming:

-          get_input: port_vdbe_untr_1_port_exCP_naming

-        virtual_machine_interface_allowed_address_pairs:

-          get_input:

-          - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs

-          - index_value

-        vlan_requirements:

-          get_input: port_vdbe_untr_1_port_vlan_requirements

-        virtual_network_refs:

-          get_input:

-          - port_vdbe_untr_1_port_virtual_network_refs

-          - index_value

-        ip_requirements:

-          get_input: port_vdbe_untr_1_port_ip_requirements

-        network_role_tag:

-          get_input: port_vdbe_untr_1_port_network_role_tag

-        virtual_machine_interface_mac_addresses:

-          get_input:

-          - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses

-          - index_value

-        network_role:

-          get_input: port_vdbe_untr_1_port_network_role

-        subnetpoolid:

-          get_input: port_vdbe_untr_1_port_subnetpoolid

-        name:

-          get_input:

-          - port_vdbe_untr_1_port_name

-          - index_value

-      requirements:

-      - binding:

-          capability: tosca.capabilities.network.Bindable

-          node: vdbe

-          relationship: tosca.relationships.network.BindsTo

-  substitution_mappings:

-    node_type: org.openecomp.resource.abstract.nodes.vdbe

-    capabilities:

-      feature_vdbe:

-      - vdbe

-      - feature

-      disk.device.iops_vdbe:

-      - vdbe

-      - disk.device.iops

-      endpoint_vdbe:

-      - vdbe

-      - endpoint

-      disk.ephemeral.size_vdbe:

-      - vdbe

-      - disk.ephemeral.size

-      feature_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - feature

-      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:

-      - vdbe_vdbe_untr_1_port_vlan1

-      - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport

-      cpu_util_vdbe:

-      - vdbe

-      - cpu_util

-      vcpus_vdbe:

-      - vdbe

-      - vcpus

-      disk.write.requests_vdbe:

-      - vdbe

-      - disk.write.requests

-      feature_vdbe_vdbe_untr_1_port_vlan1:

-      - vdbe_vdbe_untr_1_port_vlan1

-      - feature

-      disk.device.latency_vdbe:

-      - vdbe

-      - disk.device.latency

-      disk.device.write.requests.rate_vdbe:

-      - vdbe

-      - disk.device.write.requests.rate

-      network.incoming.packets_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.incoming.packets

-      feature_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - feature

-      disk.write.bytes.rate_vdbe:

-      - vdbe

-      - disk.write.bytes.rate

-      network.incoming.bytes.rate_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.incoming.bytes.rate

-      network.incoming.packets.rate_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.incoming.packets.rate

-      scalable_vdbe:

-      - vdbe

-      - scalable

-      disk.iops_vdbe:

-      - vdbe

-      - disk.iops

-      disk.device.write.requests_vdbe:

-      - vdbe

-      - disk.device.write.requests

-      disk.device.capacity_vdbe:

-      - vdbe

-      - disk.device.capacity

-      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.outgoing.bytes.rate

-      network.outgoing.bytes_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.outgoing.bytes

-      disk.device.allocation_vdbe:

-      - vdbe

-      - disk.device.allocation

-      disk.usage_vdbe:

-      - vdbe

-      - disk.usage

-      memory.usage_vdbe:

-      - vdbe

-      - memory.usage

-      network.outpoing.packets_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.outpoing.packets

-      disk.read.requests_vdbe:

-      - vdbe

-      - disk.read.requests

-      network.incoming.bytes_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.incoming.bytes

-      instance_vdbe:

-      - vdbe

-      - instance

-      cpu.delta_vdbe:

-      - vdbe

-      - cpu.delta

-      network.outgoing.packets.rate_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.outgoing.packets.rate

-      binding_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - binding

-      disk.device.read.bytes.rate_vdbe:

-      - vdbe

-      - disk.device.read.bytes.rate

-      disk.device.write.bytes.rate_vdbe:

-      - vdbe

-      - disk.device.write.bytes.rate

-      memory.resident_vdbe:

-      - vdbe

-      - memory.resident

-      forwarder_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - forwarder

-      disk.write.requests.rate_vdbe:

-      - vdbe

-      - disk.write.requests.rate

-      cpu_vdbe:

-      - vdbe

-      - cpu

-      disk.write.bytes_vdbe:

-      - vdbe

-      - disk.write.bytes

-      forwarder_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - forwarder

-      disk.device.usage_vdbe:

-      - vdbe

-      - disk.device.usage

-      disk.device.read.bytes_vdbe:

-      - vdbe

-      - disk.device.read.bytes

-      disk.latency_vdbe:

-      - vdbe

-      - disk.latency

-      network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.outgoing.packets.rate

-      disk.capacity_vdbe:

-      - vdbe

-      - disk.capacity

-      host_vdbe:

-      - vdbe

-      - host

-      disk.allocation_vdbe:

-      - vdbe

-      - disk.allocation

-      network.outpoing.packets_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.outpoing.packets

-      network.incoming.packets_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.incoming.packets

-      disk.read.bytes.rate_vdbe:

-      - vdbe

-      - disk.read.bytes.rate

-      network.incoming.bytes_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.incoming.bytes

-      os_vdbe:

-      - vdbe

-      - os

-      disk.device.read.requests_vdbe:

-      - vdbe

-      - disk.device.read.requests

-      network.incoming.packets.rate_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.incoming.packets.rate

-      disk.root.size_vdbe:

-      - vdbe

-      - disk.root.size

-      network.incoming.bytes.rate_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.incoming.bytes.rate

-      binding_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - binding

-      memory_vdbe:

-      - vdbe

-      - memory

-      binding_vdbe:

-      - vdbe

-      - binding

-      disk.device.write.bytes_vdbe:

-      - vdbe

-      - disk.device.write.bytes

-      network.outgoing.bytes_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - network.outgoing.bytes

-      network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - network.outgoing.bytes.rate

-      disk.device.read.requests.rate_vdbe:

-      - vdbe

-      - disk.device.read.requests.rate

-      disk.read.bytes_vdbe:

-      - vdbe

-      - disk.read.bytes

-    requirements:

-      dependency_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - dependency

-      link_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - link

-      local_storage_vdbe:

-      - vdbe

-      - local_storage

-      dependency_vdbe_vdbe_untr_2_port:

-      - vdbe_vdbe_untr_2_port

-      - dependency

-      dependency_vdbe_vdbe_untr_1_port_vlan1:

-      - vdbe_vdbe_untr_1_port_vlan1

-      - dependency

-      dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:

-      - vdbe_vdbe_untr_1_port_vlan1

-      - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport

-      link_vdbe_vdbe_untr_1_port:

-      - vdbe_vdbe_untr_1_port

-      - link

-      link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:

-      - vdbe_vdbe_untr_1_port_vlan1

-      - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport

-      dependency_vdbe:

-      - vdbe

-      - dependency
\ No newline at end of file
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Nested_vdbe
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+  org.openecomp.resource.vfc.compute.nodes.heat.vdbe:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+  inputs:
+    subinterface_vlan1_aap_untrusted_v6_ip_prefix:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_aap_sec_untrusted_ip_prefix:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_vmac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_vdbe_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_vdbe_untr_2_port_network_role_tag:
+      type: string
+      required: true
+    vm_flavor_name:
+      type: string
+      required: true
+    subinterface_vlan1_counter:
+      type: list
+      required: true
+      entry_schema:
+        type: float
+    vm_image_name:
+      type: string
+      required: true
+    port_vdbe_untr_2_port_network_role:
+      type: string
+      required: true
+    compute_vdbe_metadata:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_untr_2_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_vdbe_untr_2_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_vdbe_untr_2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_untr_1_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vdbe_untr_1_port_order:
+      type: integer
+      required: true
+    port_vdbe_untr_1_port_subnetpoolid:
+      type: string
+      required: true
+    port_vdbe_untr_2_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+      required: true
+    subinterface_vlan1_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_aap_untrusted_ip_prefix_len:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_ip_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_vdbe_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_1_port_network_role_tag:
+      type: string
+      required: true
+    subinterface_vlan1_ip_v6_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_aap_untrusted_ip_prefix:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_2_port_virtual_network_refs:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    subinterface_vlan1_subinterfaces_name_prefix:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_1_port_network_role:
+      type: string
+      required: true
+    port_vdbe_untr_2_port_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_1_port_virtual_network_refs:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    subinterface_vlan1_vn_network_list:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_2_port_subnetpoolid:
+      type: string
+      required: true
+    port_vdbe_untr_2_port_order:
+      type: integer
+      required: true
+    subinterface_vlan1_service_template_filter_count:
+      type: list
+      required: true
+      entry_schema:
+        type: float
+    subinterface_vlan1_parent_interface:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_aap_address_mode:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_vdbe_untr_1_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    subinterface_vlan1_optional_property_1:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_1_port_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_optional_property_2:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
+      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+      required: true
+    port_vdbe_untr_1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    subinterface_vlan1_vlan_tag_list:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+  node_templates:
+    vdbe:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe
+      properties:
+        availability_zone:
+          get_input:
+          - compute_vdbe_availability_zone
+          - index_value
+        flavor:
+          get_input: vm_flavor_name
+        metadata:
+          get_input:
+          - compute_vdbe_metadata
+          - index_value
+        image:
+          get_input: vm_image_name
+        name:
+          get_input:
+          - compute_vdbe_name
+          - index_value
+    vdbe_vdbe_untr_2_port:
+      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+      properties:
+        mac_requirements:
+          get_input: port_vdbe_untr_2_port_mac_requirements
+        order:
+          get_input: port_vdbe_untr_2_port_order
+        exCP_naming:
+          get_input: port_vdbe_untr_2_port_exCP_naming
+        virtual_machine_interface_allowed_address_pairs:
+          get_input:
+          - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs
+          - index_value
+        vlan_requirements:
+          get_input: port_vdbe_untr_2_port_vlan_requirements
+        virtual_network_refs:
+          get_input:
+          - port_vdbe_untr_2_port_virtual_network_refs
+          - index_value
+        ip_requirements:
+          get_input: port_vdbe_untr_2_port_ip_requirements
+        network_role_tag:
+          get_input: port_vdbe_untr_2_port_network_role_tag
+        virtual_machine_interface_mac_addresses:
+          get_input:
+          - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses
+          - index_value
+        network_role:
+          get_input: port_vdbe_untr_2_port_network_role
+        subnetpoolid:
+          get_input: port_vdbe_untr_2_port_subnetpoolid
+        name:
+          get_input:
+          - port_vdbe_untr_2_port_name
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: vdbe
+          relationship: tosca.relationships.network.BindsTo
+    vdbe_vdbe_untr_1_port_vlan1:
+      type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
+      directives:
+      - substitutable
+      properties:
+        aap_untrusted_ip_prefix:
+          get_input:
+          - subinterface_vlan1_aap_untrusted_ip_prefix
+          - index_value
+        aap_sec_untrusted_ip_prefix:
+          get_input:
+          - subinterface_vlan1_aap_sec_untrusted_ip_prefix
+          - index_value
+        ip_v6_address:
+          get_input:
+          - subinterface_vlan1_ip_v6_address
+          - index_value
+        counter:
+          get_input:
+          - subinterface_vlan1_counter
+          - index_value
+        ip_address:
+          get_input:
+          - subinterface_vlan1_ip_address
+          - index_value
+        subinterfaces_name_prefix:
+          get_input:
+          - subinterface_vlan1_subinterfaces_name_prefix
+          - index_value
+        aap_address_mode:
+          get_input:
+          - subinterface_vlan1_aap_address_mode
+          - index_value
+        service_template_filter:
+          count:
+            get_input:
+            - subinterface_vlan1_service_template_filter_count
+            - index_value
+          substitute_service_template: vlan1ServiceTemplate.yaml
+          mandatory: false
+        aap_untrusted_v6_ip_prefix:
+          get_input:
+          - subinterface_vlan1_aap_untrusted_v6_ip_prefix
+          - index_value
+        parent_interface:
+          get_input:
+          - subinterface_vlan1_parent_interface
+          - index_value
+        vn_network_list:
+          get_input:
+          - subinterface_vlan1_vn_network_list
+          - index_value
+        optional_property_1:
+          get_input:
+          - subinterface_vlan1_optional_property_1
+          - index_value
+        optional_property_2:
+          get_input:
+          - subinterface_vlan1_optional_property_2
+          - index_value
+        mac_address:
+          get_input:
+          - subinterface_vlan1_mac_address
+          - index_value
+        vlan_tag_list:
+          get_input:
+          - subinterface_vlan1_vlan_tag_list
+          - index_value
+        aap_sec_untrusted_ip_prefix_len:
+          get_input:
+          - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len
+          - index_value
+        vmac_address:
+          get_input:
+          - subinterface_vlan1_vmac_address
+          - index_value
+        aap_untrusted_v6_ip_prefix_len:
+          get_input:
+          - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len
+          - index_value
+        aap_untrusted_ip_prefix_len:
+          get_input:
+          - subinterface_vlan1_aap_untrusted_ip_prefix_len
+          - index_value
+      requirements:
+      - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
+          capability: tosca.capabilities.network.Bindable
+          node: vdbe_vdbe_untr_1_port
+          relationship: tosca.relationships.network.BindsTo
+    vdbe_vdbe_untr_1_port:
+      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+      properties:
+        mac_requirements:
+          get_input: port_vdbe_untr_1_port_mac_requirements
+        order:
+          get_input: port_vdbe_untr_1_port_order
+        exCP_naming:
+          get_input: port_vdbe_untr_1_port_exCP_naming
+        virtual_machine_interface_allowed_address_pairs:
+          get_input:
+          - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs
+          - index_value
+        vlan_requirements:
+          get_input: port_vdbe_untr_1_port_vlan_requirements
+        virtual_network_refs:
+          get_input:
+          - port_vdbe_untr_1_port_virtual_network_refs
+          - index_value
+        ip_requirements:
+          get_input: port_vdbe_untr_1_port_ip_requirements
+        network_role_tag:
+          get_input: port_vdbe_untr_1_port_network_role_tag
+        virtual_machine_interface_mac_addresses:
+          get_input:
+          - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses
+          - index_value
+        network_role:
+          get_input: port_vdbe_untr_1_port_network_role
+        subnetpoolid:
+          get_input: port_vdbe_untr_1_port_subnetpoolid
+        name:
+          get_input:
+          - port_vdbe_untr_1_port_name
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: vdbe
+          relationship: tosca.relationships.network.BindsTo
+  substitution_mappings:
+    node_type: org.openecomp.resource.abstract.nodes.vdbe
+    capabilities:
+      feature_vdbe:
+      - vdbe
+      - feature
+      disk.device.iops_vdbe:
+      - vdbe
+      - disk.device.iops
+      endpoint_vdbe:
+      - vdbe
+      - endpoint
+      disk.ephemeral.size_vdbe:
+      - vdbe
+      - disk.ephemeral.size
+      feature_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - feature
+      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+      - vdbe_vdbe_untr_1_port_vlan1
+      - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      cpu_util_vdbe:
+      - vdbe
+      - cpu_util
+      vcpus_vdbe:
+      - vdbe
+      - vcpus
+      disk.write.requests_vdbe:
+      - vdbe
+      - disk.write.requests
+      feature_vdbe_vdbe_untr_1_port_vlan1:
+      - vdbe_vdbe_untr_1_port_vlan1
+      - feature
+      disk.device.latency_vdbe:
+      - vdbe
+      - disk.device.latency
+      disk.device.write.requests.rate_vdbe:
+      - vdbe
+      - disk.device.write.requests.rate
+      network.incoming.packets_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.incoming.packets
+      feature_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - feature
+      disk.write.bytes.rate_vdbe:
+      - vdbe
+      - disk.write.bytes.rate
+      network.incoming.bytes.rate_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.incoming.bytes.rate
+      network.incoming.packets.rate_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.incoming.packets.rate
+      scalable_vdbe:
+      - vdbe
+      - scalable
+      disk.iops_vdbe:
+      - vdbe
+      - disk.iops
+      disk.device.write.requests_vdbe:
+      - vdbe
+      - disk.device.write.requests
+      disk.device.capacity_vdbe:
+      - vdbe
+      - disk.device.capacity
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.outgoing.bytes
+      disk.device.allocation_vdbe:
+      - vdbe
+      - disk.device.allocation
+      disk.usage_vdbe:
+      - vdbe
+      - disk.usage
+      memory.usage_vdbe:
+      - vdbe
+      - memory.usage
+      network.outpoing.packets_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.outpoing.packets
+      disk.read.requests_vdbe:
+      - vdbe
+      - disk.read.requests
+      network.incoming.bytes_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.incoming.bytes
+      instance_vdbe:
+      - vdbe
+      - instance
+      cpu.delta_vdbe:
+      - vdbe
+      - cpu.delta
+      network.outgoing.packets.rate_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.outgoing.packets.rate
+      binding_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - binding
+      disk.device.read.bytes.rate_vdbe:
+      - vdbe
+      - disk.device.read.bytes.rate
+      disk.device.write.bytes.rate_vdbe:
+      - vdbe
+      - disk.device.write.bytes.rate
+      memory.resident_vdbe:
+      - vdbe
+      - memory.resident
+      forwarder_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - forwarder
+      disk.write.requests.rate_vdbe:
+      - vdbe
+      - disk.write.requests.rate
+      cpu_vdbe:
+      - vdbe
+      - cpu
+      disk.write.bytes_vdbe:
+      - vdbe
+      - disk.write.bytes
+      forwarder_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - forwarder
+      disk.device.usage_vdbe:
+      - vdbe
+      - disk.device.usage
+      disk.device.read.bytes_vdbe:
+      - vdbe
+      - disk.device.read.bytes
+      disk.latency_vdbe:
+      - vdbe
+      - disk.latency
+      network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.outgoing.packets.rate
+      disk.capacity_vdbe:
+      - vdbe
+      - disk.capacity
+      host_vdbe:
+      - vdbe
+      - host
+      disk.allocation_vdbe:
+      - vdbe
+      - disk.allocation
+      network.outpoing.packets_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.outpoing.packets
+      network.incoming.packets_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.incoming.packets
+      disk.read.bytes.rate_vdbe:
+      - vdbe
+      - disk.read.bytes.rate
+      network.incoming.bytes_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.incoming.bytes
+      os_vdbe:
+      - vdbe
+      - os
+      disk.device.read.requests_vdbe:
+      - vdbe
+      - disk.device.read.requests
+      network.incoming.packets.rate_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.incoming.packets.rate
+      disk.root.size_vdbe:
+      - vdbe
+      - disk.root.size
+      network.incoming.bytes.rate_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.incoming.bytes.rate
+      binding_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - binding
+      memory_vdbe:
+      - vdbe
+      - memory
+      binding_vdbe:
+      - vdbe
+      - binding
+      disk.device.write.bytes_vdbe:
+      - vdbe
+      - disk.device.write.bytes
+      network.outgoing.bytes_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - network.outgoing.bytes
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - network.outgoing.bytes.rate
+      disk.device.read.requests.rate_vdbe:
+      - vdbe
+      - disk.device.read.requests.rate
+      disk.read.bytes_vdbe:
+      - vdbe
+      - disk.read.bytes
+    requirements:
+      dependency_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - dependency
+      link_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - link
+      local_storage_vdbe:
+      - vdbe
+      - local_storage
+      dependency_vdbe_vdbe_untr_2_port:
+      - vdbe_vdbe_untr_2_port
+      - dependency
+      dependency_vdbe_vdbe_untr_1_port_vlan1:
+      - vdbe_vdbe_untr_1_port_vlan1
+      - dependency
+      dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+      - vdbe_vdbe_untr_1_port_vlan1
+      - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      link_vdbe_vdbe_untr_1_port:
+      - vdbe_vdbe_untr_1_port
+      - link
+      link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+      - vdbe_vdbe_untr_1_port_vlan1
+      - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      dependency_vdbe:
+      - vdbe
+      - dependency
\ No newline at end of file