Hi Dumitru Thanks for the cleanup!
Acked-by: Xavier Simonart <[email protected]> Thanks Xavier On Thu, Oct 9, 2025 at 3:27 PM Dumitru Ceara <[email protected]> wrote: > Most of them were inherited from OVS (before OVN split out of OVS) and > are not needed anymore. > > Reported-at: > https://mail.openvswitch.org/pipermail/ovs-dev/2025-October/426909.html > Reported-by: Xavier Simonart <[email protected]> > Signed-off-by: Dumitru Ceara <[email protected]> > --- > tests/system-common-macros.at | 201 ---------------------------------- > 1 file changed, 201 deletions(-) > > diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at > index 1f2b2b4ebe..a26e5f1dac 100644 > --- a/tests/system-common-macros.at > +++ b/tests/system-common-macros.at > @@ -84,151 +84,12 @@ m4_define([ADD_VETH], > ] > ) > > -# ADD_VETH_BOND([ports], [namespace], [ovs-br], [bond], [mode], [ip_addr]) > -# > -# Add a set of veth port pairs. Ports named in the list 'ports' will be > added > -# to 'namespace', and the corresponding port names, prefixed by 'ovs-' > will > -# be included in an OVS bond 'bond' which is added to bridge 'ovs-br'. > -# > -# The 'bond' in 'namespace' will be brought up with static IP address > -# with 'ip_addr' in CIDR notation. > -# > -m4_define([ADD_VETH_BOND], > - [ > - BONDPORTS="" > - for port in $1; do > - AT_CHECK([ip link add $port type veth peer name ovs-$port]) > - CONFIGURE_VETH_OFFLOADS([$port]) > - AT_CHECK([ip link set $port netns $2]) > - AT_CHECK([ip link set dev ovs-$port up]) > - BONDPORTS="$BONDPORTS ovs-$port" > - on_exit 'ip link del ovs-$port' > - done > - NS_CHECK_EXEC([$2], [ip link add name $4 type bond]) > - case "$(echo $5 | sed 's/.*lacp=//' | sed 's/ .*//')" in > - active|passive) > - NS_CHECK_EXEC([$2], [sh -c "echo 802.3ad > > /sys/class/net/$4/bonding/mode"]) > - NS_CHECK_EXEC([$2], [sh -c "echo 100 > > /sys/class/net/$4/bonding/miimon"]) > - ;; > - esac > - for port in $1; do > - NS_CHECK_EXEC([$2], [ip link set dev $port master $4]) > - done > - NS_CHECK_EXEC([$2], [ip addr add $6 dev $4]) > - NS_CHECK_EXEC([$2], [ip link set dev $4 up]) > - AT_CHECK([ovs-vsctl add-bond $3 ovs-$4 $BONDPORTS $5]) > - on_exit 'ip link del ovs-$4' > - ] > -) > - > -# ADD_VLAN([port], [namespace], [vlan-id], [ip-addr]) > -# > -# Add a VLAN device named 'port' within 'namespace'. It will be configured > -# with the ID 'vlan-id' and the address 'ip-addr'. > -m4_define([ADD_VLAN], > - [ NS_CHECK_EXEC([$2], [ip link add link $1 name $1.$3 type vlan proto > 802.1q id $3]) > - NS_CHECK_EXEC([$2], [ip link set dev $1.$3 up]) > - NS_CHECK_EXEC([$2], [ip addr add dev $1.$3 $4]) > - ] > -) > - > -# ADD_SVLAN([port], [namespace], [vlan-id], [ip-addr]) > -# > -# Add a SVLAN device named 'port' within 'namespace'. It will be > configured > -# with the ID 'vlan-id' and the address 'ip-addr'. > -m4_define([ADD_SVLAN], > - [ NS_CHECK_EXEC([$2], [ip link add link $1 name $1.$3 type vlan proto > 802.1ad id $3]) > - NS_CHECK_EXEC([$2], [ip link set dev $1.$3 up]) > - NS_CHECK_EXEC([$2], [ip addr add dev $1.$3 $4]) > - NS_CHECK_EXEC([$2], [ip link set $1.$3 mtu 1496]) > - ] > -) > - > -# ADD_CVLAN([port], [namespace], [vlan-id], [ip-addr]) > -# > -# Similar to ADD_VLAN(), but sets MTU. Lower MTU here instead of increase > MTU > -# on bridge/SVLAN because older kernels didn't work. > -# > -m4_define([ADD_CVLAN], > - [ ADD_VLAN([$1], [$2], [$3], [$4]) > - NS_CHECK_EXEC([$2], [ip link set $1.$3 mtu 1492]) > - ] > -) > - > -# ADD_OVS_TUNNEL([type], [bridge], [port], [remote-addr], [overlay-addr], > -# [tunnel-args]) > -# > -# Add an ovs-based tunnel device in the root namespace, with name 'port' > and > -# type 'type'. The tunnel device will be configured as point-to-point > with the > -# 'remote-addr' as the underlay address of the remote tunnel endpoint. > -# > -# 'port will be configured with the address 'overlay-addr'. > -# > -m4_define([ADD_OVS_TUNNEL], > - [AT_CHECK([ovs-vsctl add-port $2 $3 -- \ > - set int $3 type=$1 options:remote_ip=$4 $6]) > - AT_CHECK([ip addr add dev $2 $5]) > - AT_CHECK([ip link set dev $2 up]) > - AT_CHECK([ip link set dev $2 mtu 1450]) > - on_exit 'ip addr del dev $2 $5' > - ] > -) > - > -# ADD_OVS_TUNNEL6([type], [bridge], [port], [remote-addr], [overlay-addr], > -# [tunnel-args]) > -# > -# Same as ADD_OVS_TUNNEL, but drops MTU enough for the IPv6 underlay. > -# > -m4_define([ADD_OVS_TUNNEL6], > - [ADD_OVS_TUNNEL([$1], [$2], [$3], [$4], [$5], [$6]) > - AT_CHECK([ip link set dev $2 mtu 1430]) > - ] > -) > - > -# ADD_NATIVE_TUNNEL([type], [port], [namespace], [remote-addr], > [overlay-addr], > -# [type-args], [link-args]) > -# > -# Add a native tunnel device within 'namespace', with name 'port' and type > -# 'type'. The tunnel device will be configured as point-to-point with the > -# 'remote-addr' as the underlay address of the remote tunnel endpoint (as > -# viewed from the perspective of that namespace). > -# > -# 'port' will be configured with the address 'overlay-addr'. 'type-args' > is > -# made available so that additional arguments can be passed to "ip link > add" > -# for configuring specific link type's arguments, for instance to > configure > -# the vxlan destination port. 'link-args' is made for arguments passed to > -# "ip link set", for instance to configure MAC address. > -# > -m4_define([ADD_NATIVE_TUNNEL], > - [NS_CHECK_EXEC([$3], [ip link add dev $2 type $1 remote $4 $6]) > - NS_CHECK_EXEC([$3], [ip addr add dev $2 $5]) > - NS_CHECK_EXEC([$3], [ip link set dev $2 mtu 1450 $7 up]) > - ] > -) > - > -# ADD_NATIVE_TUNNEL6([type], [port], [namespace], [remote-addr], > [overlay-addr], > -# [type-args], [link-args]) > -# > -# Same as ADD_NATIVE_TUNNEL, but drops MTU enough for the IPv6 underlay. > -# > -m4_define([ADD_NATIVE_TUNNEL6], > - [ADD_NATIVE_TUNNEL([$1], [$2], [$3], [$4], [$5], [$6], [$7]) > - NS_CHECK_EXEC([$3], [ip link set dev $2 mtu 1430]) > - ] > -) > - > # FORMAT_PING([]) > # > # Strip variant pieces from ping output so the output can be reliably > compared. > # > m4_define([FORMAT_PING], [grep "transmitted" | sed 's/time.*ms$/time > 0ms/']) > > -# STRIP_MONITOR_CSUM([]) > -# > -# Strip the csum value from ovs-ofctl monitor. > -# > -m4_define([STRIP_MONITOR_CSUM], [grep "csum:" | sed 's/csum:.*/csum: > <skip>/']) > - > # FORMAT_CT([ip-addr]) > # > # Strip content from the piped input which would differ from test to test > @@ -270,13 +131,6 @@ m4_define([NETNS_DAEMONIZE], > ] > ) > > -# OVS_CHECK_FIREWALL() > -# > -# Check if firewalld is active, skip the test if it is on. > -# The following command currently only supports RHEL and CentOS. > -m4_define([OVS_CHECK_FIREWALL], > - [AT_SKIP_IF([systemctl status firewalld 2>&1 | grep running > > /dev/null])]) > - > # OVS_START_L7([namespace], [protocol]) > # > # Start a server serving 'protocol' within 'namespace'. The server will > exit > @@ -324,61 +178,6 @@ m4_define([NETNS_START_DHCPD], > ] > ) > > -# 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]) > - 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() > - AT_SKIP_IF([! ip link add foo type vxlan help 2>&1 | grep gpe > >/dev/null])]) > - > -# OVS_CHECK_GRE() > -m4_define([OVS_CHECK_GRE], > - [AT_SKIP_IF([! ip link add foo type gretap help 2>&1 | grep gretap > >/dev/null]) > - OVS_CHECK_FIREWALL()]) > - > -# OVS_CHECK_ERSPAN() > -m4_define([OVS_CHECK_ERSPAN], > - [AT_SKIP_IF([! ip link add foo type erspan help 2>&1 | grep erspan > >/dev/null]) > - OVS_CHECK_FIREWALL()]) > - > -# OVS_CHECK_GRE_L3() > -m4_define([OVS_CHECK_GRE_L3], > - [AT_SKIP_IF([! ip link add foo type gre help 2>&1 | grep "gre " > >/dev/null]) > - OVS_CHECK_FIREWALL()]) > - > -# OVS_CHECK_GENEVE() > -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]) > - AT_SKIP_IF([[test `sed -n 's/.*VLAN header stack length probed as > \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2]])]) > - > -# OVS_CHECK_IPROUTE_ENCAP() > -m4_define([OVS_CHECK_IPROUTE_ENCAP], > - [AT_SKIP_IF([! ip route help 2>&1 |grep encap >/dev/null])]) > - > -# OVS_CHECK_CT_CLEAR() > -m4_define([OVS_CHECK_CT_CLEAR], > - [AT_SKIP_IF([! grep -q "Datapath supports ct_clear action" > ovs-vswitchd.log])]) > - > # OVS_CHECK_CT_ZERO_SNAT() > m4_define([OVS_CHECK_CT_ZERO_SNAT], > [AT_SKIP_IF([! grep -q "Datapath supports ct_zero_snat" > ovs-vswitchd.log])]) > -- > 2.51.0 > > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
