Skip to content

Commit

Permalink
system-traffic: Skip all vxlan tests if unsupported.
Browse files Browse the repository at this point in the history
The vxlan tests require a new enough 'ip' tool to configure native VXLAN
tunnels on the host kernel (as well as a new enough kernel). If this
isn't available, simply skip the test. This commit makes the cases where
this is checked consistent.

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Acked-by: Russell Bryant <russell@ovn.org>
  • Loading branch information
joestringer committed Dec 23, 2015
1 parent 0bbbe1c commit 2f2b958
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions tests/system-common-macros.at
Expand Up @@ -149,3 +149,9 @@ m4_define([NETNS_DAEMONIZE],
echo "kill \`cat $3\`" >> cleanup
]
)

# OVS_CHECK_VXLAN()
#
# Do basic check for vxlan functionality, skip the test if it's not there.
m4_define([OVS_CHECK_VXLAN],
[AT_SKIP_IF([! ip link add foo type vxlan help 2>&1 | grep dstport >/dev/null])])
4 changes: 2 additions & 2 deletions tests/system-traffic.at
Expand Up @@ -107,7 +107,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP

AT_SETUP([datapath - ping over vxlan tunnel])
AT_SKIP_IF([! ip link add foo type vxlan help 2>&1 | grep dstport >/dev/null])
OVS_CHECK_VXLAN()

OVS_TRAFFIC_VSWITCHD_START()
ADD_BR([br-underlay])
Expand Down Expand Up @@ -1307,7 +1307,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP

AT_SETUP([conntrack - Fragmentation over vxlan])
AT_SKIP_IF([! ip link help 2>&1 | grep vxlan >/dev/null])
OVS_CHECK_VXLAN()
CHECK_CONNTRACK()

OVS_TRAFFIC_VSWITCHD_START()
Expand Down

0 comments on commit 2f2b958

Please sign in to comment.