Commit 985551d "northd: Don't recognize UDP packets as health check responses." [0] fixed an issue that caused UDP packets to be delivered to the controller in response to the health check probe. It also introduced a standalone test for this use case. However, the same behavior can be tested by existing "Load balancer health checks with LRP IP" tests. These tests generated "unsupported protocol" warning in logs before the introduction of the fix [0], but the message was explicitly ignored. Now that the fix [0], is applied, the warning message can be removed from "ignored warnings" list, essentially accomplishing the same thing as the standalone test.
[0] https://github.com/ovn-org/ovn/commit/985551d482694e39d51ed290a4607f71e5b65be8 Signed-off-by: Martin Kalcok <[email protected]> --- tests/system-ovn.at | 93 +-------------------------------------------- 1 file changed, 2 insertions(+), 91 deletions(-) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 582ed194b..203f2d315 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -4616,8 +4616,7 @@ OVN_CLEANUP_NORTHD as OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d /connection dropped.*/d -/Service monitor not found.*/d -/handle service check: Unsupported protocol*/d"]) +/Service monitor not found.*/d"]) AT_CLEANUP ]) @@ -4816,8 +4815,7 @@ OVN_CLEANUP_NORTHD as OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d /connection dropped.*/d -/Service monitor not found.*/d -/handle service check: Unsupported protocol*/d"]) +/Service monitor not found.*/d"]) AT_CLEANUP ]) @@ -21497,93 +21495,6 @@ OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d AT_CLEANUP ]) -OVN_FOR_EACH_NORTHD([ -AT_SETUP([Unsupported protocol message]) -AT_SKIP_IF([test $HAVE_NC = no]) - -ovn_start -OVS_TRAFFIC_VSWITCHD_START() -ADD_BR([br-int]) - -# Set external-ids in br-int needed for ovn-controller. -check ovs-vsctl \ - -- set Open_vSwitch . external-ids:system-id=hv1 \ - -- set Open_vSwitch . external-ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb.sock \ - -- set Open_vSwitch . external-ids:ovn-encap-type=geneve \ - -- set Open_vSwitch . external-ids:ovn-encap-ip=169.0.0.1 \ - -- set bridge br-int fail-mode=secure other-config:disable-in-band=true - -# Start ovn-controller. -start_daemon ovn-controller - -check ovn-nbctl ls-add ls1 -check ovn-nbctl lsp-add ls1 ls1p1 -check ovn-nbctl lsp-set-addresses ls1p1 "00:00:00:01:01:01 192.168.1.1" -check ovn-nbctl lsp-add ls1 ls1p2 -check ovn-nbctl lsp-set-addresses ls1p2 "00:00:00:01:01:02 192.168.1.2" - -check ovn-nbctl lr-add lr1 -check ovn-nbctl lrp-add lr1 lr1-ls1 00:00:00:00:00:01 192.168.1.254/24 -check ovn-nbctl lsp-add ls1 ls1-lr1 -check ovn-nbctl lsp-set-addresses ls1-lr1 "00:00:00:00:00:01 192.168.1.254" -check ovn-nbctl lsp-set-type ls1-lr1 router -check ovn-nbctl lsp-set-options ls1-lr1 router-port=lr1-ls1 - -check ovn-nbctl lrp-add lr1 lr1-ls2 00:00:00:00:00:02 192.168.2.254/24 - -check ovn-nbctl ls-add ls2 -check ovn-nbctl lsp-add ls2 ls2-lr1 -check ovn-nbctl lsp-set-addresses ls2-lr1 "00:00:00:00:00:02 192.168.2.254" -check ovn-nbctl lsp-set-type ls2-lr1 router -check ovn-nbctl lsp-set-options ls2-lr1 router-port=lr1-ls2 - -check ovn-nbctl lsp-add ls2 ls2p1 -check ovn-nbctl lsp-set-addresses ls2p1 "00:00:00:01:02:01 192.168.2.1" - -ADD_NAMESPACES(ls1p1) -ADD_VETH(ls1p1, ls1p1, br-int, "192.168.1.1/24", "00:00:00:01:01:01", - "192.168.1.254") - -ADD_NAMESPACES(ls2p1) -ADD_VETH(ls2p1, ls2p1, br-int, "192.168.2.1/24", "00:00:00:01:02:01", - "192.168.2.254") - -ADD_NAMESPACES(ls1p2) -ADD_VETH(ls1p2, ls1p2, br-int, "192.168.1.2/24", "00:00:00:01:01:02", - "192.168.1.254") - -check ovn-nbctl lb-add lb0 192.168.5.1:12345 192.168.1.1:12345,192.168.1.2:12345 -check ovn-nbctl ls-lb-add ls1 lb0 -check ovn-nbctl lr-lb-add lr1 lb0 -lb_uuid=$(fetch_column nb:Load_Balancer _uuid name=lb0) -check ovn-nbctl set Load_Balancer $lb_uuid protocol=udp -check ovn-nbctl --wait=hv set Logical_Router lr1 options:chassis="hv1" - -wait_for_ports_up ls1p1 ls1p2 ls2p1 - -NETNS_DAEMONIZE([ls1p1], [nc -l 12345 --udp -k --sh-exec ls], [nc1.pid]) -NETNS_DAEMONIZE([ls1p2], [nc -l 12345 --udp -k --sh-exec ls], [nc2.pid]) - -hc_uuid=$(ovn-nbctl --id=@hc create Load_Balancer_Health_Check vip="192.168.5.1\:12345" -- \ - add Load_Balancer $lb_uuid health_check @hc) -check ovn-nbctl set Load_Balancer_Health_Check $hc_uuid options:timeout=20 options:success_count=3 options:failure_count=3 -check ovn-nbctl --wait=sb set load_balancer $lb_uuid ip_port_mappings:192.168.1.1=ls1p1:192.168.1.254 - -NS_EXEC([ls2p1], [nc --udp 192.168.5.1 12345 <<< h]) - -# It may not seem like we're actually testing anything in this test. -# If there is a warning or error in the ovn-controller log about -# an unsupported health check protocol, it will cause a test failure -# when we stop ovn-controller. -OVN_CLEANUP_CONTROLLER([hv1]) -OVN_CLEANUP_NORTHD - -as -OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d -/connection dropped.*/d"]) -AT_CLEANUP -]) - OVN_FOR_EACH_NORTHD([ AT_SETUP([Load balancer health checks - service monitor source MAC matching]) AT_SKIP_IF([test $HAVE_NC = no]) -- 2.51.2 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
