diff options
author | 2018-11-29 20:46:49 +0530 | |
---|---|---|
committer | 2018-12-02 09:47:45 +0000 | |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation')
4 files changed, 901 insertions, 901 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/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml index 47280fa625..5f49fce709 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml @@ -1,473 +1,473 @@ -heat_template_version: 2013-05-23
-
-description: >
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
-
-parameters:
- aap_address_mode:
- description: "Address mode for the vDBE cluster IP"
- type: string
- control_int_net_forwarding_mode:
- description: "forwarding mode of the control virtual network"
- type: string
- control_int_net_rpf:
- description: "Reverse Path Filtering enable or disable for the control virtual network"
- type: string
- control_int_net_shared:
- description: "control virtual network shared"
- type: boolean
- control_int_net_flood_unknown_unicast:
- description: "forwarding mode of the control virtual network"
- type: boolean
- fabric_int_net_flood_unknown_unicast:
- description: "forwarding mode of the fabric virtual network"
- type: boolean
- fabric_int_net_forwarding_mode:
- description: "forwarding mode of the fabric virtual network"
- type: string
- fabric_int_net_rpf:
- description: "Reverse Path Filtering enable or disable for the fabric virtual network"
- type: string
- fabric_int_net_shared:
- description: "fabric virtual network shared"
- oam_net_name:
- description: "Name of NSDNet network from which the management IP addresses will be allocated"
- type: string
- untrusted_net_name:
- description: "Name of public untrusted network into which this vDBE HA cluster is deployed"
- type: string
- untrusted_num_vn:
- constraints:
- -
- range:
- max: 77
- min: 1
- description: "Number of vDBE subinterface virtual Networks"
- type: number
- untrusted_vlan_tags:
- description: "List of subinterface vlan tags"
- type: comma_delimited_list
- untrusted_vn_networks:
- description: "List of subinterface virtual networks"
- type: comma_delimited_list
- vdbe_aap_sec_untrusted_ip_prefix:
- description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network"
- type: string
- vdbe_aap_sec_untrusted_ip_prefix_len:
- description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_ip_prefix:
- description: "ip prefix for primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_ip_prefix_len:
- description: "ip prefix length for the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_v6_ip_prefix:
- description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_v6_ip_prefix_len:
- description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_device_name:
- description: "VDBE device Name for this vdbe VNF"
- type: string
- vdbe_hw_untr_mac_1:
- description: "Secondary MAC address of the secondary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_name_1:
- description: "VM Name for this vdbe node 1"
- type: string
- vdbe_untrusted_ip_1:
- description: "IPV4 address of the secondary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_untrusted_v6_ip_1:
- description: "IPV6 address of the secondary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_untrusted_vmac_address:
- description: "Virtual MAC of the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_flavor_name:
- description: "Flavor to use for vDBE"
- type: string
- vdbe_image_name:
- description: "Image to use for vDBE"
- type: string
- vnf_id:
- description: "Unique ID for this VF inst"
- type: string
- vnf_name:
- description: "Unique name for this VF instance"
- type: string
- vf_module_id:
- description: "Unique ID for this VF module inst"
- type: string
- availability_zone_1:
- description: "The availability zone of secondary node1 vDBE vm in the local HA pair."
- type: string
- counter:
- description: "Counter."
- type: number
-resources:
- vdbe_untr_1_subports:
- type: OS::Heat::ResourceGroup
- properties:
- count:
- get_param: untrusted_num_vn
- resource_def:
- type: vlan1.yml
- properties:
- aap_address_mode:
- get_param: aap_address_mode
- aap_sec_untrusted_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- aap_untrusted_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- aap_untrusted_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- aap_untrusted_v6_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- aap_untrusted_v6_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- counter:
- get_param: counter
- ip_address:
- get_param: vdbe_untrusted_ip_1
- ip_v6_address:
- get_param: vdbe_untrusted_v6_ip_1
- mac_address:
- get_param: vdbe_hw_untr_mac_1
- parent_interface:
- get_resource: vdbe_untr_1_port_1
- subinterfaces_name_prefix:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: VM_NAMEDBE001p1n004
- vlan_tag_list:
- get_param: untrusted_vlan_tags
- vmac_address:
- get_param: vdbe_untrusted_vmac_address
- vn_network_list:
- get_param: untrusted_vn_networks
- optional_property_1: OPTIONAL_VALUE_SUBPORT_1
- vdbe_node_1:
- type: OS::Nova::Server
- properties:
- availability_zone:
- get_param: availability_zone_1
- flavor:
- get_param: vdbe_flavor_name
- image:
- get_param: vdbe_image_name
- metadata:
- vf_module_id:
- get_param: vf_module_id
- vnf_id:
- get_param: vnf_id
- vnf_name:
- get_param: vnf_name
- name:
- get_param: vdbe_name_1
- networks:
- - port: {get_resource: vdbe_untr_1_port_1}
- - port: {get_resource: vdbe_untr_2_port_1}
- vdbe_node_2:
- type: OS::Nova::Server
- properties:
- availability_zone:
- get_param: availability_zone_1
- flavor:
- get_param: vdbe_flavor_name
- image:
- get_param: vdbe_image_name
- metadata:
- vf_module_id:
- get_param: vf_module_id
- vnf_id:
- get_param: vnf_id
- vnf_name:
- get_param: vnf_name
- name:
- get_param: vdbe_name_1
- networks:
- - port: {get_resource: vdbe_untr_1_port_2}
- - port: {get_resource: vdbe_untr_2_port_2}
- vdbe_untr_1_port_1:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: VM_NAMEDBE001p1n004
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: control_int_net
- vdbe_untr_2_port_1:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name: Port_2
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: fabric_int_net
-
-
-
- vdbe_untr_1_port_2:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: Port 3
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: control_int_net
- vdbe_untr_2_port_2:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name: Port_4
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: fabric_int_net
-
- vdbe_untr_2_subports:
- type: OS::Heat::ResourceGroup
- properties:
- count:
- get_param: untrusted_num_vn
- resource_def:
- type: vlan1.yml
- properties:
- aap_address_mode:
- get_param: aap_address_mode
- aap_sec_untrusted_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- aap_untrusted_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- aap_untrusted_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- aap_untrusted_v6_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- aap_untrusted_v6_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- counter:
- get_param: counter
- ip_address:
- get_param: vdbe_untrusted_ip_1
- ip_v6_address:
- get_param: vdbe_untrusted_v6_ip_1
- mac_address:
- get_param: vdbe_hw_untr_mac_1
- parent_interface:
- get_resource: vdbe_untr_1_port_2
- subinterfaces_name_prefix:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: VM_NAMEDBE001p1n004
- vlan_tag_list:
- get_param: untrusted_vlan_tags
- vmac_address:
- get_param: vdbe_untrusted_vmac_address
- vn_network_list:
- get_param: untrusted_vn_networks
- optional_property_2: OPTIONAL_VALUE_SUBPORT_2
-
- control_int_net:
- type: OS::ContrailV2::VirtualNetwork
- properties:
- flood_unknown_unicast:
- get_param: control_int_net_flood_unknown_unicast
- is_shared:
- get_param: control_int_net_shared
- name:
- str_replace:
- params:
- VNF_NAME:
- get_param: vnf_name
- template: VNF_NAME_control_net
- virtual_network_properties:
- virtual_network_properties_forwarding_mode:
- get_param: control_int_net_forwarding_mode
- virtual_network_properties_rpf:
- get_param: control_int_net_rpf
- fabric_int_net:
- type: OS::ContrailV2::VirtualNetwork
- properties:
- flood_unknown_unicast:
- get_param: fabric_int_net_flood_unknown_unicast
- is_shared:
- get_param: fabric_int_net_shared
- name:
- str_replace:
- params:
- VNF_NAME:
- get_param: vnf_name
- template: template-fabric-int
- virtual_network_properties:
- virtual_network_properties_forwarding_mode:
- get_param: fabric_int_net_forwarding_mode
- virtual_network_properties_rpf:
- get_param: fabric_int_net_rpf
\ No newline at end of file +heat_template_version: 2013-05-23 + +description: > + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + +parameters: + aap_address_mode: + description: "Address mode for the vDBE cluster IP" + type: string + control_int_net_forwarding_mode: + description: "forwarding mode of the control virtual network" + type: string + control_int_net_rpf: + description: "Reverse Path Filtering enable or disable for the control virtual network" + type: string + control_int_net_shared: + description: "control virtual network shared" + type: boolean + control_int_net_flood_unknown_unicast: + description: "forwarding mode of the control virtual network" + type: boolean + fabric_int_net_flood_unknown_unicast: + description: "forwarding mode of the fabric virtual network" + type: boolean + fabric_int_net_forwarding_mode: + description: "forwarding mode of the fabric virtual network" + type: string + fabric_int_net_rpf: + description: "Reverse Path Filtering enable or disable for the fabric virtual network" + type: string + fabric_int_net_shared: + description: "fabric virtual network shared" + oam_net_name: + description: "Name of NSDNet network from which the management IP addresses will be allocated" + type: string + untrusted_net_name: + description: "Name of public untrusted network into which this vDBE HA cluster is deployed" + type: string + untrusted_num_vn: + constraints: + - + range: + max: 77 + min: 1 + description: "Number of vDBE subinterface virtual Networks" + type: number + untrusted_vlan_tags: + description: "List of subinterface vlan tags" + type: comma_delimited_list + untrusted_vn_networks: + description: "List of subinterface virtual networks" + type: comma_delimited_list + vdbe_aap_sec_untrusted_ip_prefix: + description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_sec_untrusted_ip_prefix_len: + description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix: + description: "ip prefix for primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix_len: + description: "ip prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix: + description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix_len: + description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_device_name: + description: "VDBE device Name for this vdbe VNF" + type: string + vdbe_hw_untr_mac_1: + description: "Secondary MAC address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_name_1: + description: "VM Name for this vdbe node 1" + type: string + vdbe_untrusted_ip_1: + description: "IPV4 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_v6_ip_1: + description: "IPV6 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_vmac_address: + description: "Virtual MAC of the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_flavor_name: + description: "Flavor to use for vDBE" + type: string + vdbe_image_name: + description: "Image to use for vDBE" + type: string + vnf_id: + description: "Unique ID for this VF inst" + type: string + vnf_name: + description: "Unique name for this VF instance" + type: string + vf_module_id: + description: "Unique ID for this VF module inst" + type: string + availability_zone_1: + description: "The availability zone of secondary node1 vDBE vm in the local HA pair." + type: string + counter: + description: "Counter." + type: number +resources: + vdbe_untr_1_subports: + type: OS::Heat::ResourceGroup + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: vlan1.yml + properties: + aap_address_mode: + get_param: aap_address_mode + aap_sec_untrusted_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + aap_untrusted_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + aap_untrusted_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + aap_untrusted_v6_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + aap_untrusted_v6_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + counter: + get_param: counter + ip_address: + get_param: vdbe_untrusted_ip_1 + ip_v6_address: + get_param: vdbe_untrusted_v6_ip_1 + mac_address: + get_param: vdbe_hw_untr_mac_1 + parent_interface: + get_resource: vdbe_untr_1_port_1 + subinterfaces_name_prefix: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + vlan_tag_list: + get_param: untrusted_vlan_tags + vmac_address: + get_param: vdbe_untrusted_vmac_address + vn_network_list: + get_param: untrusted_vn_networks + optional_property_1: OPTIONAL_VALUE_SUBPORT_1 + vdbe_node_1: + type: OS::Nova::Server + properties: + availability_zone: + get_param: availability_zone_1 + flavor: + get_param: vdbe_flavor_name + image: + get_param: vdbe_image_name + metadata: + vf_module_id: + get_param: vf_module_id + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + name: + get_param: vdbe_name_1 + networks: + - port: {get_resource: vdbe_untr_1_port_1} + - port: {get_resource: vdbe_untr_2_port_1} + vdbe_node_2: + type: OS::Nova::Server + properties: + availability_zone: + get_param: availability_zone_1 + flavor: + get_param: vdbe_flavor_name + image: + get_param: vdbe_image_name + metadata: + vf_module_id: + get_param: vf_module_id + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + name: + get_param: vdbe_name_1 + networks: + - port: {get_resource: vdbe_1_untr_1_port_1} + - port: {get_resource: vdbe_1_untr_2_port_1} + vdbe_untr_1_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: control_int_net + vdbe_untr_2_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: Port_2 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: fabric_int_net + + + + vdbe_1_untr_1_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: Port 3 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: control_int_net + vdbe_1_untr_2_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: Port_4 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: fabric_int_net + + vdbe_untr_2_subports: + type: OS::Heat::ResourceGroup + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: vlan1.yml + properties: + aap_address_mode: + get_param: aap_address_mode + aap_sec_untrusted_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + aap_untrusted_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + aap_untrusted_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + aap_untrusted_v6_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + aap_untrusted_v6_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + counter: + get_param: counter + ip_address: + get_param: vdbe_untrusted_ip_1 + ip_v6_address: + get_param: vdbe_untrusted_v6_ip_1 + mac_address: + get_param: vdbe_hw_untr_mac_1 + parent_interface: + get_resource: vdbe_1_untr_1_port_1 + subinterfaces_name_prefix: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + vlan_tag_list: + get_param: untrusted_vlan_tags + vmac_address: + get_param: vdbe_untrusted_vmac_address + vn_network_list: + get_param: untrusted_vn_networks + optional_property_2: OPTIONAL_VALUE_SUBPORT_2 + + control_int_net: + type: OS::ContrailV2::VirtualNetwork + properties: + flood_unknown_unicast: + get_param: control_int_net_flood_unknown_unicast + is_shared: + get_param: control_int_net_shared + name: + str_replace: + params: + VNF_NAME: + get_param: vnf_name + template: VNF_NAME_control_net + virtual_network_properties: + virtual_network_properties_forwarding_mode: + get_param: control_int_net_forwarding_mode + virtual_network_properties_rpf: + get_param: control_int_net_rpf + fabric_int_net: + type: OS::ContrailV2::VirtualNetwork + properties: + flood_unknown_unicast: + get_param: fabric_int_net_flood_unknown_unicast + is_shared: + get_param: fabric_int_net_shared + name: + str_replace: + params: + VNF_NAME: + get_param: vnf_name + template: template-fabric-int + virtual_network_properties: + virtual_network_properties_forwarding_mode: + get_param: fabric_int_net_forwarding_mode + virtual_network_properties_rpf: + get_param: fabric_int_net_rpf 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 8f31c10481..5f71804e20 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 @@ -8,37 +8,49 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_vmac_address: + type: json + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_availability_zone: + subinterface_vlan1_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + type: string + port_vdbe_untr_1_port_1_network_role: type: string required: true status: SUPPORTED @@ -46,71 +58,67 @@ node_types: type: string required: true status: SUPPORTED - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: 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: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: 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 + type: float + vm_image_name: + type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: 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 + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED @@ -126,6 +134,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vlan1_ip_address: type: list required: true @@ -138,76 +150,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string 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 + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -226,6 +230,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -234,45 +242,37 @@ node_types: 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: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: 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: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: 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: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED @@ -299,47 +299,47 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_2_port: + - dependency_vdbe_vdbe_untr_1_port_1_vlan1: 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: + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_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: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_1_port: + - dependency_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -368,13 +368,15 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_2_port: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + 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_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + 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 @@ -396,47 +398,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: 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: + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: 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: + 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 - feature_vdbe_vdbe_untr_1_port: - type: tosca.capabilities.Node + 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 - disk.write.bytes.rate_vdbe: + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: 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: + 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.packets.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -465,79 +463,83 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: + binding_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + 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 - network.outgoing.bytes_vdbe_vdbe_untr_1_port: + 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 - disk.device.allocation_vdbe: + 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 - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: 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: + 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.outpoing.packets_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: 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: + network.incoming.packets_vdbe_vdbe_untr_2_port_1: 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: 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. + forwarder_vdbe_vdbe_untr_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu.delta_vdbe: + 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 - network.outgoing.packets.rate_vdbe_vdbe_untr_2_port: + 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 - binding_vdbe_vdbe_untr_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + forwarder_vdbe_vdbe_untr_2_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.read.bytes.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer @@ -557,17 +559,17 @@ node_types: 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 + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node + 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. @@ -580,11 +582,6 @@ node_types: 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. @@ -597,13 +594,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_2_port_1: + type: tosca.capabilities.Node + 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: + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + 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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -628,15 +636,8 @@ node_types: 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. + feature_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -646,11 +647,13 @@ node_types: 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. + binding_vdbe_vdbe_untr_2_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem @@ -663,7 +666,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -675,44 +678,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: 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 - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + feature_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_1_port_1: 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 + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + 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_vdbe: + 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 - 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. + binding_vdbe: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + 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: 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 d7306a1a23..02412befd7 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 @@ -471,6 +471,9 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix @@ -480,11 +483,26 @@ topology_template: 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 + port_vdbe_untr_1_port_1_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 + port_vdbe_untr_2_port_1_name: + - Port_2 + - Port_4 subinterface_vlan1_counter: - get_input: counter - get_input: counter @@ -506,6 +524,9 @@ topology_template: 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 + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_mac_address: - get_input: vdbe_hw_untr_mac_1 - get_input: vdbe_hw_untr_mac_1 @@ -518,15 +539,15 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net 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 @@ -542,12 +563,6 @@ topology_template: 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 @@ -556,37 +571,22 @@ topology_template: - get_input: untrusted_num_vn subinterface_vlan1_parent_interface: - vdbe_untr_1_port_1 - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 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 + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net subinterface_vlan1_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -599,11 +599,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_vdbe_untr_2_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -617,4 +617,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe + - 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 4fac95aa24..0f096464ae 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 @@ -11,11 +11,25 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -31,69 +45,62 @@ topology_template: 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: + port_vdbe_untr_1_port_1_network_role: type: string required: true vm_flavor_name: type: string required: true - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: 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: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: 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 + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true subinterface_vlan1_mac_address: @@ -106,6 +113,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vlan1_ip_address: type: list required: true @@ -116,63 +126,56 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string 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 + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -188,6 +191,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -195,38 +201,32 @@ topology_template: 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: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: 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: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true entry_schema: @@ -256,50 +256,7 @@ topology_template: 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 - subinterface_indicator: false - related_networks: - get_input: port_vdbe_untr_2_port_related_networks - 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: + vdbe_vdbe_untr_1_port_1_vlan1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 directives: - substitutable @@ -386,45 +343,88 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_port + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port: + vdbe_vdbe_untr_1_port_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements + get_input: port_vdbe_untr_1_port_1_mac_requirements order: - get_input: port_vdbe_untr_1_port_order + get_input: port_vdbe_untr_1_port_1_order exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming + get_input: port_vdbe_untr_1_port_1_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements + get_input: port_vdbe_untr_1_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_1_port_related_networks + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_2_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_2_port_1_mac_requirements + order: + get_input: port_vdbe_untr_2_port_1_order + exCP_naming: + get_input: port_vdbe_untr_2_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_2_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_vdbe_untr_2_port_1_related_networks virtual_network_refs: get_input: - - port_vdbe_untr_1_port_virtual_network_refs + - port_vdbe_untr_2_port_1_virtual_network_refs - index_value ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements + get_input: port_vdbe_untr_2_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag + get_input: port_vdbe_untr_2_port_1_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses + - port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses - index_value network_role: - get_input: port_vdbe_untr_1_port_network_role + get_input: port_vdbe_untr_2_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid + get_input: port_vdbe_untr_2_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_1_port_name + - port_vdbe_untr_2_port_1_name - index_value requirements: - binding: @@ -446,12 +446,12 @@ topology_template: 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 + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -461,30 +461,27 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate 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 + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes 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 + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes.rate scalable_vdbe: - vdbe - scalable @@ -497,12 +494,9 @@ topology_template: 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 + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -512,27 +506,33 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outpoing.packets + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + network.incoming.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder 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 + forwarder_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - forwarder disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -542,33 +542,36 @@ topology_template: 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 + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport 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 + feature_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - feature disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -578,36 +581,39 @@ topology_template: 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 + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature 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 + binding_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - binding 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 + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets.rate + feature_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - network.incoming.bytes.rate - binding_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - binding memory_vdbe: - vdbe - memory @@ -617,12 +623,6 @@ topology_template: 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 @@ -630,30 +630,30 @@ topology_template: - vdbe - disk.read.bytes requirements: - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - dependency + dependency_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - dependency + dependency_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - 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 + link_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - link + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe - - dependency - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file + - dependency
\ No newline at end of file |