diff options
author | 2018-02-05 18:39:44 +0530 | |
---|---|---|
committer | 2018-02-08 08:41:37 +0000 | |
commit | 20074c4e75e926977b25d57bebf841f44ada12a0 (patch) | |
tree | 7dcf74806e951e4c84b35b94e2fc92a15b92a5a2 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/vTSBC_AIC/inputfiles/vlan_subinterface_dual.yaml | |
parent | 98d6b70321da75fb5322c146aa7be4442fc2b633 (diff) |
VLAN tagging - Enable first stage translation
1. Added toggle for vlan tagging feature
2. Enabled existing translation of feature with toggle
3. Enabled unit tests for the same
4. Deleted unused test data
5. Updated license text
6. Updated code based on review comments
Change-Id: I755df4889f18a32061e9d4d1ebec09162b2d8b83
Issue-ID: SDC-998
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/vTSBC_AIC/inputfiles/vlan_subinterface_dual.yaml')
1 files changed, 0 insertions, 98 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/vTSBC_AIC/inputfiles/vlan_subinterface_dual.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/vTSBC_AIC/inputfiles/vlan_subinterface_dual.yaml deleted file mode 100644 index 5d0a72920c..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/vTSBC_AIC/inputfiles/vlan_subinterface_dual.yaml +++ /dev/null @@ -1,98 +0,0 @@ -heat_template_version: 2014-10-16 - -description: > - HOT template to instantiate a single Contrail VLAN sub-interface with associated instance IP addresses and allowed address pairs - -parameters: - subinterface_instance_index: - type: number - description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. - subinterface_name_prefix: - type: string - description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource - parent_interface: - type: string - description: Parent Contrail interface - mac_address: - type: string - description: MAC address to use for subinterface - ip_address: - type: string - description: IPv4 address associated with subinterfaces - ipv6_address: - type: string - description: IPv6 address associated with subinterfaces - virtual_ip_address: - type: string - description: virtual IPv4 address associated with subinterfaces - virtual_ipv6_address: - type: string - description: virtual IPv6 address associated with subinterfaces - vlan_ids: - type: comma_delimited_list - description: List of VLAN IDs to use for subinterfaces - vlan_networks: - type: comma_delimited_list - description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list - -resources: - contrail_vmi_subinterface: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: { get_param: subinterface_name_prefix } - $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - } - virtual_machine_interface_mac_addresses: - { - virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], - } - virtual_machine_interface_allowed_address_pairs: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 - } - }, - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 - } - } - ] - } - virtual_network_refs: [{ get_param: [ vlan_networks, { get_param: subinterface_instance_index } ] }] - virtual_machine_interface_refs: [{ get_param: parent_interface }] - - contrail_vmi_ip: - type: OS::ContrailV2::InstanceIp - depends_on: [ contrail_vmi_subinterface ] - properties: - virtual_machine_interface_refs: [{ get_resource: contrail_vmi_subinterface }] - virtual_network_refs: [{ get_param: [ vlan_networks, { get_param: subinterface_instance_index } ] }] - instance_ip_address: { get_param: ip_address } - instance_ip_family: v4 - - contrail_vmi_ipv6: - type: OS::ContrailV2::InstanceIp - depends_on: [ contrail_vmi_subinterface ] - properties: - virtual_machine_interface_refs: [{ get_resource: contrail_vmi_subinterface }] - virtual_network_refs: [{ get_param: [ vlan_networks, { get_param: subinterface_instance_index } ] }] - instance_ip_address: { get_param: ipv6_address } - instance_ip_family: v6 |