From f32168ef95c3b68567ccd57e098d74ad9a536edd Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 2 May 2016 18:19:04 +0200 Subject: [PATCH] Interface VxLAN test JIRA: CSIT-45 - add test: Honeycomb modifies interface configuration - VxLAN - add keywords used in these tests to set and verify configuration - add method and vat template for dumping an interface's configured VxLAN - fixed requirements.txt Change-Id: I6d6c360a4d478a0e40eecf7c0235969e7c06f7a9 Signed-off-by: Tibor Frank Signed-off-by: C.J. Collier --- resources/libraries/python/InterfaceUtil.py | 26 +++++++++ .../libraries/robot/honeycomb/interfaces.robot | 65 ++++++++++++++++++++++ resources/templates/vat/vxlan_dump.vat | 1 + tests/suites/honeycomb/interface_management.robot | 13 +++++ 4 files changed, 105 insertions(+) create mode 100644 resources/templates/vat/vxlan_dump.vat diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index ec2ef69dfc..35194f2487 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -493,6 +493,32 @@ class InterfaceUtil(object): raise RuntimeError('Unable to create VXLAN interface on node {}' .format(node)) + @staticmethod + def vxlan_dump(node, interface): + """Get VxLAN data for the given interface. + + :param node: VPP node to get interface data from. + :param interface: Numeric index or name string of a specific interface. + :type node: dict + :type interface: int or str + :return: Dictionary containing data for the given VxLAN. + :rtype dict + """ + + if isinstance(interface, basestring): + sw_if_index = Topology.get_interface_sw_index(node, interface) + else: + sw_if_index = interface + + with VatTerminal(node) as vat: + response = vat.vat_terminal_exec_cmd_from_template( + "vxlan_dump.vat", sw_if_index=sw_if_index) + + for vxlan in response[0]: + if vxlan["sw_if_index"] == sw_if_index: + return vxlan + return {} + @staticmethod def create_subinterface(node, interface, sub_id, outer_vlan_id, inner_vlan_id, type_subif): diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot index 0768fd3021..f98cca0901 100644 --- a/resources/libraries/robot/honeycomb/interfaces.robot +++ b/resources/libraries/robot/honeycomb/interfaces.robot @@ -318,3 +318,68 @@ | | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface} | | Should be equal | ${vat_data['mtu']} | ${mtu} | | Should be equal | ${vat_data['sub_inner_vlan_id']} | ${vrf-id} + +| Honeycomb sets interface VxLAN configuration +| | [Documentation] | Uses Honeycomb API to change VxLAN configuration \ +| | ... | of the specified interface. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... | - interface - name of an interface on the specified node. Type: string +| | ... | - vxlan_settings - Configuration data for VxLAN. Type: dictionary +| | ... +| | ... | *Example:* +| | ... | \| Honeycomb sets interface VxLAN configuration \ +| | ... | \|${node} \| ${interface} \| &{vxlan_settings} \| +| | ... +| | [Arguments] | ${node} | ${interface} | &{vxlan_settings} +| | :FOR | ${items} | IN | @{vxlan_settings.items()} +| | | interfaceAPI.Configure interface vxlan | ${node} | ${interface} | @{items} + +| VxLAN configuration from Honeycomb should be +| | [Documentation] | Retrieves interface VxLAN configuration through Honeycomb\ +| | ... | and compares with state supplied in argument. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... | - interface - name of an interface on the specified node. Type: string +| | ... | - vxlan_settings - Configuration data for VxLAN. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| VxLAN configuration from Honeycomb should be \ +| | ... | \| ${node} \| ${interface} \| &{vxlan_settings} \| +| | ... +| | [Arguments] | ${node} | ${interface} | &{vxlan_settings} +| | ${api_data}= | interfaceAPI.Get interface cfg data | ${node} | ${interface} +| | :FOR | ${items} | IN | @{vxlan_settings.items()} +| | | Should be equal as strings +| | ... | ${api_data['v3po:vxlan']['@{items}[0]']} | ${items[1]} +| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface} +| | :FOR | ${items} | IN | @{vxlan_settings.items()} +| | | Should be equal as strings +| | ... | ${api_data['v3po:vxlan']['@{items}[0]']} | ${items[1]} + +| VxLAN configuration from VAT should be +| | [Documentation] | Retrieves interface VxLAN configuration through VAT and\ +| | ... | compares with state supplied in argument. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... | - interface - name of an interface on the specified node. Type: string +| | ... | - vxlan_settings - Configuration data for VxLAN. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| VxLAN configuration from Honeycomb should be \ +| | ... | \| ${node} \| ${interface} \| &{vxlan_settings} \| +| | ... +| | [Arguments] | ${node} | ${interface} | &{vxlan_settings} +| | ${vat_data}= | VxLAN Dump | ${node} | ${interface} +| | Should be equal as strings +| | ... | ${vat_data['dst_address']} | ${vxlan_settings['dst']} +| | Should be equal as strings +| | ... | ${vat_data['src_address']} | ${vxlan_settings['src']} +| | Should be equal as strings | ${vat_data['vni']} | ${vxlan_settings['vni']} +| | Should be equal as strings +| | ... | ${vat_data['encap-vrf-id']} | ${vxlan_settings['encap_vrf_id']} diff --git a/resources/templates/vat/vxlan_dump.vat b/resources/templates/vat/vxlan_dump.vat new file mode 100644 index 0000000000..0be6d9ff69 --- /dev/null +++ b/resources/templates/vat/vxlan_dump.vat @@ -0,0 +1 @@ +vxlan_tunnel_dump sw_if_index {sw_if_index} \ No newline at end of file diff --git a/tests/suites/honeycomb/interface_management.robot b/tests/suites/honeycomb/interface_management.robot index f741f9543b..3408b5283b 100644 --- a/tests/suites/honeycomb/interface_management.robot +++ b/tests/suites/honeycomb/interface_management.robot @@ -25,6 +25,8 @@ | ... | dup-addr-detect-transmits=5 | &{ethernet}= | mtu=9000 | &{routing}= | vrf-id=27 +| &{vxlan_settings}= | src=10.0.1.20 | dst=10.0.3.20 | vni=1000 +| ... | encap-vrf-id=1000 *** Settings *** | Resource | resources/libraries/robot/default.robot @@ -86,3 +88,14 @@ | | ... | ${node} | ${interface} | ${ethernet} | ${routing} | | And Interface ethernet and routing configuration from VAT should be | | ... | ${node} | ${interface} | ${ethernet['mtu']} | ${routing['vrf-id']} + +| Honeycomb modifies interface configuration - VxLAN +| | [Documentation] | Check if Honeycomb API can configure interface VxLAN \ +| | ... | settings. +| | [Tags] | honeycomb_sanity +| | When Honeycomb sets interface VxLAN configuration +| | ... | ${node} | ${interface} | &{vxlan_settings} +| | Then VxLAN configuration from Honeycomb should be +| | ... | ${node} | ${interface} | &{vxlan_settings} +| | And VxLAN configuration from VAT should be +| | ... | ${node} | ${interface} | &{vxlan_settings} -- 2.16.6