diff options
| -rw-r--r-- | src/plugins/unittest/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/unittest/interface_test.c | 75 | ||||
| -rw-r--r-- | test/test_ip4.py | 83 | ||||
| -rw-r--r-- | test/vpp_interface.py | 8 |
4 files changed, 166 insertions, 1 deletions
diff --git a/src/plugins/unittest/CMakeLists.txt b/src/plugins/unittest/CMakeLists.txt index 3e98d2a71e5..1716077e129 100644 --- a/src/plugins/unittest/CMakeLists.txt +++ b/src/plugins/unittest/CMakeLists.txt @@ -16,6 +16,7 @@ add_vpp_plugin(unittest bier_test.c bihash_test.c fib_test.c + interface_test.c mfib_test.c session_test.c string_test.c diff --git a/src/plugins/unittest/interface_test.c b/src/plugins/unittest/interface_test.c new file mode 100644 index 00000000000..4cf5ae43b3c --- /dev/null +++ b/src/plugins/unittest/interface_test.c @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <vnet/vnet.h> + +static clib_error_t * +test_interface_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + vnet_hw_interface_flags_t flags; + vnet_main_t *vnm; + u32 sw_if_index; + + flags = VNET_HW_INTERFACE_FLAG_NONE; + sw_if_index = ~0; + vnm = vnet_get_main (); + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index)) + ; + else if (unformat (input, "up")) + flags = VNET_HW_INTERFACE_FLAG_LINK_UP; + else if (unformat (input, "down")) + ; + else + break; + } + + if (~0 != sw_if_index) + { + vnet_sw_interface_t *sw; + + sw = vnet_get_sw_interface (vnm, sw_if_index); + + vnet_hw_interface_set_flags (vnm, sw->hw_if_index, flags); + } + else + { + return clib_error_return (0, "unknown interface `%U'", + format_unformat_error, input); + } + + return (NULL); +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (test_interface_command, static) = +{ + .path = "test interface link-state", + .short_help = "test interface link-state <interface> [up] [down]", + .function = test_interface_command_fn, +}; +/* *INDENT-ON* */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/test/test_ip4.py b/test/test_ip4.py index 6f764373075..c8c0a71d171 100644 --- a/test/test_ip4.py +++ b/test/test_ip4.py @@ -899,9 +899,13 @@ class TestIPLoadBalance(VppTestCase): input.add_stream(pkts) self.pg_enable_capture(self.pg_interfaces) self.pg_start() + rxs = [] for oo in outputs: rx = oo._get_capture(1) self.assertNotEqual(0, len(rx)) + for r in rx: + rxs.append(r) + return rxs def send_and_expect_one_itf(self, input, pkts, itf): input.add_stream(pkts) @@ -1038,6 +1042,53 @@ class TestIPLoadBalance(VppTestCase): self.pg3, self.pg4]) # + # bring down pg1 expect LB to adjust to use only those that are pu + # + self.pg1.link_down() + + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg2, self.pg3, + self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + + # + # bring down pg2 expect LB to adjust to use only those that are pu + # + self.pg2.link_down() + + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + + # + # bring the links back up - expect LB over all again + # + self.pg1.link_up() + self.pg2.link_up() + + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg1, self.pg2, + self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + + # + # The same link-up/down but this time admin state + # + self.pg1.admin_down() + self.pg2.admin_down() + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + self.pg1.admin_up() + self.pg2.admin_up() + self.pg1.resolve_arp() + self.pg2.resolve_arp() + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg1, self.pg2, + self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + + # # Recursive prefixes # - testing that 2 stages of load-balancing, no choices # @@ -1060,11 +1111,41 @@ class TestIPLoadBalance(VppTestCase): route_1_1_1_2.add_vpp_config() # - # inject the packet on pg0 - expect load-balancing across all 4 paths + # inject the packet on pg0 - rx only on via routes output interface # self.vapi.cli("clear trace") self.send_and_expect_one_itf(self.pg0, port_pkts, self.pg3) + # + # Add a LB route in the presence of a down link - expect no + # packets over the down link + # + self.pg3.link_down() + + route_10_0_0_3 = VppIpRoute(self, "10.0.0.3", 32, + [VppRoutePath(self.pg3.remote_ip4, + self.pg3.sw_if_index), + VppRoutePath(self.pg4.remote_ip4, + self.pg4.sw_if_index)]) + route_10_0_0_3.add_vpp_config() + + port_pkts = [] + for ii in range(257): + port_pkts.append(Ether(src=self.pg0.remote_mac, + dst=self.pg0.local_mac) / + IP(dst="10.0.0.3", src="20.0.0.2") / + UDP(sport=1234, dport=1234 + ii) / + Raw('\xa5' * 100)) + + self.send_and_expect_one_itf(self.pg0, port_pkts, self.pg4) + + # bring the link back up + self.pg3.link_up() + + rx = self.send_and_expect_load_balancing(self.pg0, port_pkts, + [self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + class TestIPVlan0(VppTestCase): """ IPv4 VLAN-0 """ diff --git a/test/vpp_interface.py b/test/vpp_interface.py index 84f694d7107..d586c849b02 100644 --- a/test/vpp_interface.py +++ b/test/vpp_interface.py @@ -365,6 +365,14 @@ class VppInterface(object): self.test.vapi.sw_interface_set_flags(self.sw_if_index, admin_up_down=0) + def link_up(self): + """Put interface link-state-UP.""" + self.test.vapi.cli("test interface link-state %s up" % self.name) + + def link_down(self): + """Put interface link-state-down.""" + self.test.vapi.cli("test interface link-state %s down" % self.name) + def ip6_enable(self): """IPv6 Enable interface""" self.test.vapi.sw_interface_ip6_enable_disable(self.sw_if_index, |