From: Joe Stringer Date: Wed, 23 Dec 2015 00:47:26 +0000 (-0800) Subject: system-traffic: Skip all vxlan tests if unsupported. X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=dfb21e966fb73a8017869c0f7134028a5213ff90 system-traffic: Skip all vxlan tests if unsupported. 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 Acked-by: Ben Pfaff Acked-by: Russell Bryant --- diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at index 4d88b7405..fcd77923d 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -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])]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 550164200..74ca0a091 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -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]) @@ -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()