diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out')
4 files changed, 199 insertions, 181 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 36c1a97f94..bd94f25284 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -186,6 +186,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true @@ -313,7 +319,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -360,7 +366,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -532,6 +538,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 @@ -787,7 +794,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml index 6f735b3c54..0516898e7e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml @@ -471,6 +471,8 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: @@ -535,4 +537,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/pattern1a/multipleVlanSameType/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/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml index 86ece84fdf..721af0f45b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml @@ -157,6 +157,11 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true @@ -367,6 +372,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 @@ -645,24 +654,24 @@ topology_template: - vdbe - disk.read.bytes requirements: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: + - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency dependency_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports - dependency - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - - link_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: + - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - dependency_vdbe_untr_x_subport local_storage_vdbe: - vdbe - local_storage - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports - - link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/nestedServiceTemplate.yaml index d70a184404..58980ac9d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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_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_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ 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_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_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link |