From fe014f97664f26b2ed75939a7efe9728e037f121 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 21 Jun 2018 09:53:08 +0200 Subject: HC2VPP-331: Fix Honeycomb fails to assign VRF to interface - add configuration for FIB table management to test suite - fix routing test suite HC2VPP-331 bugs - fix intip4-intip6 test suite HC2VPP-331 bugs Change-Id: I0b1e9ed787d9fb68e76a6d61c1eea2519a36a6c4 Signed-off-by: Michal Cmarada --- .../mgmt-cfg-intip4-intip6-apihc-apivat-func.robot | 15 ++++--- .../func/mgmt-cfg-routing-apihc-apivat-func.robot | 49 +++++++++++----------- 2 files changed, 33 insertions(+), 31 deletions(-) (limited to 'tests/honeycomb') diff --git a/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot index c8f072b8cd..b532b5089e 100644 --- a/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot @@ -20,6 +20,7 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/honeycomb.robot +| Resource | resources/libraries/robot/honeycomb/fib.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip6.robot | Variables | resources/test_data/honeycomb/interface_ip.py @@ -151,12 +152,9 @@ | | [Documentation] | Check if Honeycomb API can configure interface\ | | ... | vrf ID. | | ... -# HC2VPP-331: Honeycomb fails to assign VRF to interface -| | [Tags] | EXPECTED_FAILING -| | ... -| | [Teardown] | Honeycomb sets interface VRF ID -| | ... | ${node} | ${interface} | ${0} | ipv4 +| | [Teardown] | Honeycomb interface VRF Test Teardown | ${node} | ${interface} | | ... +| | Honeycomb configures FIB table | ${node} | ipv4 | ${1} | | When Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${1} | ipv4 | | Then Interface VRF ID from Honeycomb should be @@ -313,4 +311,9 @@ | | Honeycomb removes interface IPv4 addresses | ${node} | ${interface} | | Honeycomb removes interface IPv6 addresses | ${node} | ${interface} | | Honeycomb clears all interface IPv4 neighbors | ${node} | ${interface} -| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${interface} \ No newline at end of file +| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${interface} + +| Honeycomb interface VRF Test Teardown +| | [Arguments] | ${node} | ${interface} +| | Honeycomb sets interface VRF ID | ${node} | ${interface} | ${0} | ipv4 +| | Honeycomb removes FIB configuration | ${node} | ipv4 | ${1} diff --git a/tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot index 24688b908c..b690c04e9e 100644 --- a/tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot @@ -14,6 +14,7 @@ *** Settings *** | Library | resources.libraries.python.honeycomb.Routing.RoutingKeywords | Library | resources.libraries.python.Trace +| Library | resources.libraries.python.InterfaceUtil | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip4.robot @@ -21,6 +22,7 @@ | Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/routing.robot +| Resource | resources/libraries/robot/honeycomb/fib.robot | ... | Test Setup | Clear Packet Trace on All DUTs | ${nodes} | ... @@ -44,9 +46,6 @@ | | ... | [Ver] Send ICMP packet from first TG interface to configured route | | ... | destination. Receive packet on the second TG interface. | | ... -# HC2VPP-331: Honeycomb fails to assign VRF to interface -| | [Tags] | EXPECTED_FAILING -| | ... | | ${table}= | Set Variable | table1 | | Given Setup interfaces and neighbors for IPv4 routing test | | When Honeycomb configures routing table @@ -69,9 +68,6 @@ | | ... | verify that each destination MAC was used by exactly 50 packets. | | ... | Receive packet on the second TG interface. | | ... -# HC2VPP-331: Honeycomb fails to assign VRF to interface -| | [Tags] | EXPECTED_FAILING -| | ... | | ${table}= | Set Variable | table2 | | Given Setup interfaces and neighbors for IPv4 routing test | | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} @@ -79,9 +75,6 @@ | | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop2} | ${next_hop_mac2} | | ... -# HC2VPP-331: Honeycomb fails to assign VRF to interface -| | [Tags] | EXPECTED_FAILING -| | ... | | When Honeycomb configures routing table | | ... | ${node} | table2 | ipv4 | ${table2} | ${1} | | Then Routing data from Honeycomb should contain @@ -102,9 +95,6 @@ | | ... | destination. Make sure no packet is received on the second TG\ | | ... | interface. | | ... -# HC2VPP-331: Honeycomb fails to assign VRF to interface -| | [Tags] | EXPECTED_FAILING -| | ... | | ${table}= | Set Variable | table3 | | Given Setup interfaces and neighbors for IPv4 routing test | | When Honeycomb configures routing table @@ -126,9 +116,6 @@ | | ... | [Ver] Send ICMP packet from first TG interface to configured route | | ... | destination. Receive packet on the second TG interface. | | ... -# HC2VPP-331: Honeycomb fails to assign VRF to interface -| | [Tags] | EXPECTED_FAILING -| | ... | | ${table}= | Set Variable | table4 | | Given Setup interfaces and neighbors for IPv6 routing test | | When Honeycomb configures routing table @@ -151,9 +138,6 @@ | | ... | verify that each destination MAC was used by exactly 50 packets. | | ... | Receive packet on the second TG interface. | | ... -# HC2VPP-331: Honeycomb fails to assign VRF to interface -| | [Tags] | EXPECTED_FAILING -| | ... | | ${table}= | Set Variable | table5 | | Given Setup interfaces and neighbors for IPv6 routing test | | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} @@ -180,8 +164,6 @@ | | ... | destination. Make sure no packet is received on the second TG\ | | ... | interface. | | ... -# HC2VPP-254 Operational data for Blackhole IPv6 route is incorrect -| | [Tags] | EXPECTED_FAILING | | ${table}= | Set Variable | table6 | | Given Setup interfaces and neighbors for IPv6 routing test | | When Honeycomb configures routing table @@ -200,10 +182,12 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv4 | ${dut_to_tg_if2} +| | Setup vrf FIBs | ${dut_node} | ${1} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if1} | ${1} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if2} | ${1} | | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up | | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Vpp Node Interfaces Ready Wait | ${dut_node} | | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} | | Honeycomb sets interface IPv4 address with prefix | ${dut_node} @@ -218,12 +202,12 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv6 | ${dut_to_tg_if2} -| | Honeycomb sets interface VRF ID -| | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} | ipv6 -| | Honeycomb sets interface VRF ID -| | ... | ${dut_node} | ${dut_to_tg_if2} | ${1} | ipv6 +| | Setup vrf FIBs | ${dut_node} | ${1} +| | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if1} | ${1} +| | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if2} | ${1} | | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up | | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Vpp Node Interfaces Ready Wait | ${dut_node} | | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} | | Honeycomb sets interface IPv6 address | ${dut_node} @@ -241,6 +225,7 @@ | | Show Packet Trace on All DUTs | ${nodes} | | Log routing configuration from VAT | ${node} | | Honeycomb removes routing configuration | ${node} | ${routing_table} +| | Remove vrf FIBs | ${node} | ${1} | Setup vrf IDs | | ... @@ -249,4 +234,18 @@ | | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${vrf} | ipv4 | | Honeycomb sets interface VRF ID -| | ... | ${node} | ${interface} | ${vrf} | ipv6 \ No newline at end of file +| | ... | ${node} | ${interface} | ${vrf} | ipv6 + +| Setup vrf FIBs +| | ... +| | [Arguments] | ${node} | ${vrf} +| | ... +| | Honeycomb configures FIB table | ${node} | ipv4 | ${vrf} +| | Honeycomb configures FIB table | ${node} | ipv6 | ${vrf} + +| Remove vrf FIBs +| | ... +| | [Arguments] | ${node} | ${vrf} +| | ... +| | Honeycomb removes FIB configuration | ${node} | ipv4 | ${vrf} +| | Honeycomb removes FIB configuration | ${node} | ipv6 | ${vrf} -- cgit 1.2.3-korg