[ovs-dev] [PATCH] tests: Check ip command whether support udp6zerocsum.

[Joe Stringer]

On 21 July 2017 at 06:35, Eric Garver <e at erig.me> wrote:
> On Fri, Jul 21, 2017 at 04:34:07AM -0700, Tonghao Zhang wrote:
>> The version of ip-route may not support udp6zerocsum for
>> vxlan6 or geneve6. If we run the kernel check, there may
>> be always error message. Before running the test units,
>> we check the ip command.
>>
>> Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
>> ---
>>  tests/system-common-macros.at | 10 ++++++++++
>>  tests/system-traffic.at       |  5 ++---
>>  2 files changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
>> index b734dcc..73ae482 100644
>> --- a/tests/system-common-macros.at
>> +++ b/tests/system-common-macros.at
>> @@ -281,6 +281,11 @@ m4_define([OVS_CHECK_VXLAN],
>>      [AT_SKIP_IF([! ip link add foo type vxlan help 2>&1 | grep dstport >/dev/null])
>>       OVS_CHECK_FIREWALL()])
>>
>> +# OVS_CHECK_VXLAN_UDP6ZEROCSUM()
>> +m4_define([OVS_CHECK_VXLAN_UDP6ZEROCSUM],
>> +    [AT_SKIP_IF([! ip link add foo type vxlan help 2>&1 | grep udp6zerocsum >/dev/null])
>> +     OVS_CHECK_FIREWALL()])
>> +
>>  # OVS_CHECK_VXLAN_GPE()
>>  m4_define([OVS_CHECK_VXLAN_GPE],
>>      [OVS_CHECK_VXLAN()
>> @@ -301,6 +306,11 @@ m4_define([OVS_CHECK_GENEVE],
>>      [AT_SKIP_IF([! ip link add foo type geneve help 2>&1 | grep geneve >/dev/null])
>>       OVS_CHECK_FIREWALL()])
>>
>> +# OVS_CHECK_GENEVE_UDP6ZEROCSUM()
>> +m4_define([OVS_CHECK_GENEVE_UDP6ZEROCSUM],
>> +    [AT_SKIP_IF([! ip link add foo type geneve help 2>&1 | grep udp6zerocsum >/dev/null])
>> +     OVS_CHECK_FIREWALL()])
>> +
>>  # OVS_CHECK_8021AD()
>>  m4_define([OVS_CHECK_8021AD],
>>      [AT_SKIP_IF([! grep -q "VLAN header stack length probed as" ovs-vswitchd.log])
>> diff --git a/tests/system-traffic.at b/tests/system-traffic.at
>> index b2393f5..d456c5c 100644
>> --- a/tests/system-traffic.at
>> +++ b/tests/system-traffic.at
>> @@ -257,7 +257,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
>>  AT_CLEANUP
>>
>>  AT_SETUP([datapath - ping over vxlan6 tunnel])
>> -OVS_CHECK_VXLAN()
>> +OVS_CHECK_VXLAN_UDP6ZEROCSUM()
>>
>>  OVS_TRAFFIC_VSWITCHD_START()
>>  ADD_BR([br-underlay])
>> @@ -381,8 +381,7 @@ OVS_TRAFFIC_VSWITCHD_STOP
>>  AT_CLEANUP
>>
>>  AT_SETUP([datapath - ping over geneve6 tunnel])
>> -OVS_CHECK_GENEVE()
>> -AT_SKIP_IF([! ip link add foo type geneve help 2>&1 | grep zerocsum >/dev/null])
>> +OVS_CHECK_GENEVE_UDP6ZEROCSUM()
>>
>>  OVS_TRAFFIC_VSWITCHD_START()
>>  ADD_BR([br-underlay])
>> --
>> 1.8.3.1
>>
>
> Thanks for fixing up the tests!
>
> Acked-by: Eric Garver <e at erig.me>

Thanks all, applied to master.