From d6982006c27288936d8b0d9eee18068854036f45 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Tue, 3 Apr 2018 20:24:59 +0530 Subject: 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 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 13 +- .../out/MainServiceTemplate.yaml | 1221 ++++++++++---------- .../out/Nested_vdbeServiceTemplate.yaml | 17 +- .../out/nestedServiceTemplate.yaml | 362 +++--- 4 files changed, 816 insertions(+), 797 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out') 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 -- cgit 1.2.3-korg