Upstream OVS commit:
commit 03ccfe482ffdc6c1132aeb62467e0fbe6768f25d
Author: William Tu <[email protected]>
Date: Tue Jun 25 14:52:38 2019 -0700
vswitchd: Separate disable system and route.
Previously, '--disable-system' disables both system dp and the system
routing table. The patch makes '--disable-system' only disable system
dp and adds '--disable-system-route' for disabling the route table.
This fixes failures when 'make check-system-userspace' for tunnel cases.
As a consequence, hitting errors due to OVS userspace parses the IGMP packet
but its datapaths do not, so odp_flow_key_to_flow() return
ODP_FIT_TOO_LITTLE.
commit c645550bb249 ("odp-util: Always report ODP_FIT_TOO_LITTLE for IGMP.")
Fix it by filtering out the IGMP-related error message.
Signed-off-by: William Tu <[email protected]>
Signed-off-by: Yi-Hung Wei <[email protected]>
Co-authored-by: Yi-Hung Wei <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
This OVS change was performed in the OVS repo after the OVS-OVN split
and after the OVN tests/system-userspace-*.at files were created by
commit c17862ff04c3b315e5793c9c7fb04a79a892e6f3 and needs to be ported
to OVN too.
CC: Numan Siddique <[email protected]>
Signed-off-by: Dumitru Ceara <[email protected]>
---
tests/ofproto-macros.at | 2 +-
tests/system-userspace-macros.at | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 1fd546a..6c4ff60 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -196,7 +196,7 @@ m4_define([_OVS_VSWITCHD_START],
# 'vswitchd-aux-args' provides a way to pass extra command line arguments
# to ovs-vswitchd
m4_define([OVS_VSWITCHD_START],
- [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system $4])
+ [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system
--disable-system-route $4])
AT_CHECK([add_of_br 0 $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2])
])
diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at
index d8cc686..86ed226 100644
--- a/tests/system-userspace-macros.at
+++ b/tests/system-userspace-macros.at
@@ -36,7 +36,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START],
m4_define([OVS_TRAFFIC_VSWITCHD_STOP],
[OVS_VSWITCHD_STOP([dnl
$1";/netdev_linux.*obtaining netdev stats via vport failed/d
-/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open
vSwitch kernel module is probably not loaded./d"])
+/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open
vSwitch kernel module is probably not loaded./d
+/dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
+/dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d"])
AT_CHECK([:; $2])
])
--
1.8.3.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
