From 56e56b8860cf6e7ad70dc65134e8fd87eaf01123 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Tue, 6 Mar 2018 12:01:54 +0530 Subject: VLAN tagging - VFC Instance Group 1. Create VFC instance group per sub-interface network role 2. Refactored PortTemplateConsolidationData and its references based on review comments 3. Updated test data after rebase 4. Updated to flatMap based on review comments Change-Id: I423593c5156ecae5eff3a4f2ce8591c85db727cc Issue-ID: SDC-1073 Signed-off-by: ojasdubey --- .../expectedoutputfiles/nestedServiceTemplate.yaml | 340 ++++++++++----------- 1 file changed, 170 insertions(+), 170 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml index cb088cf958..01fd719787 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/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 - vdbe_subport_network: - 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 - 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 - 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_0_subint_untr_vmi_0: - 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: vdbe_subport_network - 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_0_subint_untr_vmi_0 - substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested - capabilities: - feature_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - feature - requirements: - dependency_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - dependency - 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 +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 + vdbe_subport_network: + 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 + 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 + 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_0_subint_untr_vmi_0: + 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: vdbe_subport_network + 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_0_subint_untr_vmi_0 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - feature + requirements: + dependency_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - dependency + 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 -- cgit 1.2.3-korg