diff options
| author | William Tu <u9012063@gmail.com> | 2019-06-25 14:52:38 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-06-26 14:02:34 -0700 |
| commit | 03ccfe482ffdc6c1132aeb62467e0fbe6768f25d (patch) | |
| tree | 67df7f2f28e578e01a8defeb7ae77eadefb9ef83 /tests | |
| parent | 35736cff1901eab5b33892ff053f02d5d87cb8c1 (diff) | |
| download | openvswitch-03ccfe482ffdc6c1132aeb62467e0fbe6768f25d.tar.gz | |
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 <u9012063@gmail.com>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Co-authored-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ofproto-macros.at | 2 | ||||
| -rw-r--r-- | 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 807ae025d..db0cd5108 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -195,7 +195,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 92ffbf6d5..9d5f3bf41 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]) ]) |