diff options
| author |   siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
|---|---|---|
| committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
| commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
| tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1 | |
| parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) | |
Added new nodes type
Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.
Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1')
21 files changed, 1720 insertions, 1568 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/allConnectivities/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/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index de6dfcddfa..4840c96647 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,12 +14,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -32,12 +26,6 @@ node_types: 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_machine_interface_mac_addresses: type: list required: true @@ -52,38 +40,22 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: type: float - subinterface_vlan1_subinterfaces_name_prefix: + port_vdbe_untr_2_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string + type: boolean vm_image_name: type: string required: true status: SUPPORTED - 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_2_port_network_role: type: string required: true @@ -100,12 +72,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json port_vdbe_untr_1_port_ip_requirements: type: list required: true @@ -122,130 +88,176 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_vlan1_vn_network_list: + port_vdbe_untr_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string + 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_2_port_order: + port_vdbe_untr_1_port_order: type: integer required: true status: SUPPORTED - subinterface_vlan1_service_template_filter_count: + 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: float - port_vdbe_untr_2_port_ip_requirements: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix_len: 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: string + subinterface_vlan1_ip_address: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + compute_vdbe_name: + type: list required: true status: SUPPORTED - subinterface_vlan1_parent_interface: + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_address_mode: + type: boolean + subinterface_vlan1_ip_v6_address: 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 + subinterface_vlan1_aap_untrusted_ip_prefix: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: string + port_vdbe_untr_2_port_virtual_network_refs: + type: list required: true status: SUPPORTED - subinterface_vlan1_optional_property_1: + entry_schema: + type: json + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + 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_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_1_port_virtual_network_refs: + type: list required: true status: SUPPORTED - subinterface_vlan1_optional_property_2: + entry_schema: + type: json + subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + port_vdbe_untr_2_port_subnetpoolid: + type: string required: true status: SUPPORTED - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + 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_mac_address: + subinterface_vlan1_aap_address_mode: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: + 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 - subinterface_vlan1_ip_address: + port_vdbe_untr_1_port_name: 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 + subinterface_vlan1_optional_property_2: + type: list required: true status: SUPPORTED - compute_vdbe_name: + 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_1_port_network_role_tag: - 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: @@ -312,7 +324,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_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_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -521,6 +533,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -670,6 +683,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -817,7 +831,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -835,4 +849,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/allConnectivities/out/MainServiceTemplate.yaml index 24ed331aca..30ee294d8f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/allConnectivities/out/MainServiceTemplate.yaml @@ -476,49 +476,25 @@ 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 - subinterface_vlan1_ip_v6_address: - - get_input: vdbe_untrusted_v6_ip_1 - - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_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_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_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_counter: - get_input: counter - get_input: counter - 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_subinterface_indicator: + - true + - true vm_image_name: get_input: vdbe_image_name - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 compute_vdbe_metadata: - vf_module_id: get_input: vf_module_id @@ -535,6 +511,48 @@ 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 + 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 + port_vdbe_untr_1_port_subinterface_indicator: + - true + - true + 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 @@ -574,18 +592,6 @@ topology_template: 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 - 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 port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 @@ -609,7 +615,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_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_vlan1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -634,4 +640,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ No newline at end of file + - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/allConnectivities/out/Nested_vdbeServiceTemplate.yaml index d751754ae5..eb21b34ada 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/allConnectivities/out/Nested_vdbeServiceTemplate.yaml @@ -16,11 +16,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -31,11 +26,6 @@ topology_template: 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_machine_interface_mac_addresses: type: list required: true @@ -47,32 +37,19 @@ topology_template: vm_flavor_name: type: string required: true - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json subinterface_vlan1_counter: type: list required: true entry_schema: type: float - subinterface_vlan1_subinterfaces_name_prefix: + port_vdbe_untr_2_port_subinterface_indicator: type: list required: true entry_schema: - type: string + type: boolean vm_image_name: type: string required: true - 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_2_port_network_role: type: string required: true @@ -86,11 +63,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json port_vdbe_untr_1_port_ip_requirements: type: list required: true @@ -104,107 +76,145 @@ topology_template: port_vdbe_untr_2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_vlan1_vn_network_list: + port_vdbe_untr_2_port_ip_requirements: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_vdbe_untr_2_port_order: + port_vdbe_untr_1_port_order: type: integer required: true - subinterface_vlan1_service_template_filter_count: + 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: float - port_vdbe_untr_2_port_ip_requirements: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix_len: 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 + type: string + subinterface_vlan1_ip_address: + type: list required: true - subinterface_vlan1_parent_interface: + entry_schema: + type: string + compute_vdbe_name: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_address_mode: + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + subinterface_vlan1_ip_v6_address: 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 + subinterface_vlan1_aap_untrusted_ip_prefix: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: string + port_vdbe_untr_2_port_virtual_network_refs: + type: list required: true - subinterface_vlan1_optional_property_1: + entry_schema: + type: json + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_name: + 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_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_1_port_virtual_network_refs: + type: list required: true - subinterface_vlan1_optional_property_2: + entry_schema: + type: json + subinterface_vlan1_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + port_vdbe_untr_2_port_subnetpoolid: + type: string required: true - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + 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_mac_address: + subinterface_vlan1_aap_address_mode: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: + 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 - subinterface_vlan1_ip_address: + port_vdbe_untr_1_port_name: 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 + subinterface_vlan1_optional_property_2: + type: list required: true - compute_vdbe_name: + entry_schema: + type: string + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - 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 @@ -256,6 +266,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_2_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -385,6 +399,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -637,9 +655,9 @@ topology_template: 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 + - 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml index 559263b791..548592d05c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: vlan1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- 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
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- vlan1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vlan1.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + 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 + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_vlan1-Network-Role_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + vlan1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan1.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5f32192a6f..a2a3bc67dd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -210,6 +210,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -330,6 +336,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_oam_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_vdbe_untr_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -391,7 +403,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -437,7 +449,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -619,6 +631,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -692,6 +705,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -929,7 +943,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1041,7 +1055,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_1_subint_oam_vmi_1: + - subinterface_link_vdbe_1_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1059,4 +1073,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index c973648470..1e7c8c88c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -581,6 +581,9 @@ topology_template: subinterface_vlan2_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address + port_vdbe_untr_vmi_subinterface_indicator: + - true + - true subinterface_vlan1_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -650,6 +653,9 @@ topology_template: subinterface_vlan2_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_oam_vmi_subinterface_indicator: + - true + - true subinterface_vlan2_service_template_filter_count: - 5 - 5 @@ -676,7 +682,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -712,4 +718,4 @@ topology_template: get_input: oam_vfc_instance_group_function subinterface_role: oam members: - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index e256c4fd7c..2bb75a89ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -176,6 +176,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -275,6 +280,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_oam_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_vdbe_untr_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -417,6 +427,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_vmi_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_vmi_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_vmi_virtual_network_refs @@ -457,6 +471,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_oam_vmi_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_oam_vmi_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_oam_vmi_virtual_network_refs @@ -768,12 +786,18 @@ topology_template: - vdbe - disk.read.bytes requirements: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: + - vdbe_vdbe_untr_vmi_vlan1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 link_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - link dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - vdbe_vdbe_untr_vmi_vlan1 - dependency_vdbe_0_subint_untr_vmi_0 + subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - vdbe_vdbe_oam_vmi_vlan2 + - subinterface_link_vdbe_1_subint_oam_vmi_1 dependency_vdbe_vdbe_oam_vmi: - vdbe_vdbe_oam_vmi - dependency @@ -786,9 +810,6 @@ topology_template: local_storage_vdbe: - vdbe - local_storage - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - dependency @@ -801,6 +822,3 @@ topology_template: dependency_vdbe: - vdbe - dependency - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - link_vdbe_1_subint_oam_vmi_1
\ 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/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml index ef5f4913e8..a8b78bf267 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link
\ 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/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml index 2fcab81b61..4cc2faab29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_1_subint_oam_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_1_subint_oam_vmi_1 - feature requirements: - link_vdbe_1_subint_oam_vmi_1: - - vdbe_1_subint_oam_vmi_1 - - link dependency_vdbe_1_subint_oam_vmi_1: - vdbe_1_subint_oam_vmi_1 - dependency + subinterface_link_vdbe_1_subint_oam_vmi_1: + - vdbe_1_subint_oam_vmi_1 + - subinterface_link binding_vdbe_1_subint_oam_vmi_1: - vdbe_1_subint_oam_vmi_1 - - binding
\ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0cd031a3f6..bebd463f09 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -138,6 +138,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -244,7 +250,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -405,6 +411,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -661,7 +668,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_int_vmi_subport: + - subinterface_link_vdbe_untr_x_int_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -679,4 +686,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/MainServiceTemplate.yaml index e8d9805915..1d4530863a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/MainServiceTemplate.yaml @@ -545,6 +545,9 @@ topology_template: subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true + - true subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address @@ -606,4 +609,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml index e3c02e0545..2f44c0c8a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml @@ -117,6 +117,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -205,6 +210,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_port_virtual_network_refs @@ -489,12 +498,12 @@ topology_template: local_storage_vdbe: - vdbe - local_storage - link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - link_vdbe_untr_x_int_vmi_subport + - subinterface_link_vdbe_untr_x_int_vmi_subport dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml index b5d5fad9f2..6a0c7f642e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- 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
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_int_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_int_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - feature
- requirements:
- binding_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - binding
- dependency_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - dependency
- link_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - link
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + 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 + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_int_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_int_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - subinterface_link + binding_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - binding + dependency_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - dependency 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 b4f43f271c..36046c5423 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 @@ -52,6 +52,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -142,6 +148,12 @@ node_types: type: string required: true status: SUPPORTED + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -314,7 +326,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_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_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -523,6 +535,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -672,6 +685,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -819,7 +833,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -837,4 +851,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED 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 649026024e..ef8138edae 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 @@ -488,6 +488,9 @@ topology_template: subinterface_vlan1_counter: - get_input: counter - get_input: counter + port_vdbe_untr_2_port_subinterface_indicator: + - true + - true vm_image_name: get_input: vdbe_image_name compute_vdbe_metadata: @@ -518,6 +521,9 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_1_port_subinterface_indicator: + - true + - true subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -617,4 +623,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe 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 407cd60118..e2bf61738b 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 @@ -47,6 +47,11 @@ topology_template: required: true entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -119,6 +124,11 @@ topology_template: port_vdbe_untr_1_port_network_role_tag: type: string required: true + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -261,6 +271,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_2_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -390,6 +404,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -635,9 +653,9 @@ topology_template: 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 + - 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 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/vlan1ServiceTemplate.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/vlan1ServiceTemplate.yaml index 559263b791..548592d05c 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/vlan1ServiceTemplate.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/vlan1ServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: vlan1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- 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
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- vlan1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vlan1.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + 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 + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_vlan1-Network-Role_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + vlan1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan1.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6d9770bd53..25b57c6b4e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -138,6 +138,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -256,7 +262,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -417,6 +423,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -683,7 +690,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -701,4 +708,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml index 6fd7b7bc24..bb61d9e082 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -1,609 +1,612 @@ -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:
- 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_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name_1
- type: string
- description: Unique name for this VF instance
- vnf_name_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name_2
- type: string
- description: Unique name for this VF instance
- 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
- vnf_id_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id_1
- type: string
- description: Unique ID for this VF inst
- vnf_id_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id_2
- type: string
- description: Unique ID for this VF inst
- 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
- 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.
- availability_zone_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_2
- type: string
- description: The availability zone of secondary node2 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_name_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_2
- type: string
- description: VM Name for this vdbe node 2
- 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
- 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.
- vf_module_id_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id_2
- type: string
- description: Unique ID for this VF module inst
- vf_module_id_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id_1
- type: string
- description: Unique ID for this VF module inst
- 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:
- 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_nested_parent_interface:
- - vdbe_untr_port_1
- - vdbe_untr_port_2
- subinterface_nested_aap_address_mode:
- - get_input: aap_address_mode
- - get_input: aap_address_mode
- subinterface_nested_vlan_tag_list:
- - get_input: untrusted_vlan_tags
- - get_input: untrusted_vlan_tags
- compute_vdbe_availability_zone:
- - get_input: availability_zone_1
- - get_input: availability_zone_2
- subinterface_nested_aap_untrusted_v6_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- vm_flavor_name:
- get_input: vdbe_flavor_name
- subinterface_nested_aap_untrusted_ip_prefix:
- - get_input: vdbe_aap_untrusted_ip_prefix
- - get_input: vdbe_aap_untrusted_ip_prefix
- vm_image_name:
- get_input: vdbe_image_name
- subinterface_nested_aap_sec_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- subinterface_nested_aap_sec_untrusted_ip_prefix:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix
- - get_input: vdbe_aap_sec_untrusted_ip_prefix
- subinterface_nested_aap_untrusted_v6_ip_prefix:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix
- - get_input: vdbe_aap_untrusted_v6_ip_prefix
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id_1
- vnf_id:
- get_input: vnf_id_1
- vnf_name:
- get_input: vnf_name_1
- - vf_module_id:
- get_input: vf_module_id_2
- vnf_id:
- get_input: vnf_id_2
- vnf_name:
- get_input: vnf_name_2
- subinterface_nested_mac_address:
- - get_input: vdbe_hw_untr_mac_1
- - get_input: vdbe_hw_untr_mac_1
- subinterface_nested_ip_address:
- - get_input: vdbe_untrusted_ip_1
- - get_input: vdbe_untrusted_ip_1
- port_vdbe_untr_port_virtual_network_refs:
- - - control_int_net
- - - control_int_net
- subinterface_nested_ip_v6_address:
- - get_input: vdbe_untrusted_v6_ip_1
- - get_input: vdbe_untrusted_v6_ip_1
- subinterface_nested_vmac_address:
- - get_input: vdbe_untrusted_vmac_address
- - get_input: vdbe_untrusted_vmac_address
- subinterface_nested_vn_network_list:
- - get_input: untrusted_vn_networks
- - get_input: untrusted_vn_networks
- port_vdbe_untr_port_name:
- - Untr_Port_1
- - Untr_Port_2
- port_vdbe_untr_port_virtual_machine_interface_mac_addresses:
- - - get_input: vdbe_hw_untr_mac_1
- - - get_input: vdbe_hw_untr_mac_1
- subinterface_nested_aap_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- subinterface_nested_counter:
- - 5
- - get_input: counter
- subinterface_nested_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
- compute_vdbe_name:
- - get_input: vdbe_name_1
- - get_input: vdbe_name_2
- subinterface_nested_optional_property_1:
- - OPTIONAL_VALUE_SUBPORT_1
- - null
- subinterface_nested_optional_property_2:
- - null
- - OPTIONAL_VALUE_SUBPORT_2
- 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_port:
- capability: tosca.capabilities.network.Linkable
- node: control_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:
- - 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: + 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_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name_1 + type: string + description: Unique name for this VF instance + vnf_name_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name_2 + type: string + description: Unique name for this VF instance + 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 + vnf_id_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id_1 + type: string + description: Unique ID for this VF inst + vnf_id_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id_2 + type: string + description: Unique ID for this VF inst + 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 + 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. + availability_zone_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_2 + type: string + description: The availability zone of secondary node2 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_name_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_2 + type: string + description: VM Name for this vdbe node 2 + 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 + 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. + vf_module_id_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id_2 + type: string + description: Unique ID for this VF module inst + vf_module_id_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id_1 + type: string + description: Unique ID for this VF module inst + 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: + 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_nested_parent_interface: + - vdbe_untr_port_1 + - vdbe_untr_port_2 + subinterface_nested_aap_address_mode: + - get_input: aap_address_mode + - get_input: aap_address_mode + subinterface_nested_vlan_tag_list: + - get_input: untrusted_vlan_tags + - get_input: untrusted_vlan_tags + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + - get_input: availability_zone_2 + subinterface_nested_aap_untrusted_v6_ip_prefix_len: + - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + vm_flavor_name: + get_input: vdbe_flavor_name + subinterface_nested_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + - get_input: vdbe_aap_untrusted_ip_prefix + vm_image_name: + get_input: vdbe_image_name + subinterface_nested_aap_sec_untrusted_ip_prefix_len: + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + subinterface_nested_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_aap_sec_untrusted_ip_prefix + - get_input: vdbe_aap_sec_untrusted_ip_prefix + subinterface_nested_aap_untrusted_v6_ip_prefix: + - get_input: vdbe_aap_untrusted_v6_ip_prefix + - get_input: vdbe_aap_untrusted_v6_ip_prefix + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id_1 + vnf_id: + get_input: vnf_id_1 + vnf_name: + get_input: vnf_name_1 + - vf_module_id: + get_input: vf_module_id_2 + vnf_id: + get_input: vnf_id_2 + vnf_name: + get_input: vnf_name_2 + subinterface_nested_mac_address: + - get_input: vdbe_hw_untr_mac_1 + - get_input: vdbe_hw_untr_mac_1 + subinterface_nested_ip_address: + - get_input: vdbe_untrusted_ip_1 + - get_input: vdbe_untrusted_ip_1 + port_vdbe_untr_port_virtual_network_refs: + - - control_int_net + - - control_int_net + subinterface_nested_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true + - true + subinterface_nested_vmac_address: + - get_input: vdbe_untrusted_vmac_address + - get_input: vdbe_untrusted_vmac_address + subinterface_nested_vn_network_list: + - get_input: untrusted_vn_networks + - get_input: untrusted_vn_networks + port_vdbe_untr_port_name: + - Untr_Port_1 + - Untr_Port_2 + port_vdbe_untr_port_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 + subinterface_nested_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_nested_counter: + - 5 + - get_input: counter + subinterface_nested_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 + compute_vdbe_name: + - get_input: vdbe_name_1 + - get_input: vdbe_name_2 + subinterface_nested_optional_property_1: + - OPTIONAL_VALUE_SUBPORT_1 + - null + subinterface_nested_optional_property_2: + - null + - OPTIONAL_VALUE_SUBPORT_2 + 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_port: + capability: tosca.capabilities.network.Linkable + node: control_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: + - control_int_net + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index fccec4c2d6..aa3c3edb2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -117,6 +117,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -215,6 +220,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_port_virtual_network_refs @@ -497,15 +506,15 @@ topology_template: dependency_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - dependency - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport link_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - link local_storage_vdbe: - vdbe - local_storage + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - vdbe_vdbe_untr_port_nested + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency @@ -514,4 +523,4 @@ topology_template: - dependency dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml index 893a3affe9..b3ed933cb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- 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
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + 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 + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_vlan1-Network-Role_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency |