diff options
Diffstat (limited to 'tests/system-kmod-macros.at')
| -rw-r--r-- | tests/system-kmod-macros.at | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 2e2bf4ee8..5fab7b7f0 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -13,9 +13,15 @@ m4_define([_ADD_BR], [[add-br $1]]) # output (e.g. because it includes "create" commands) then 'vsctl-output' # specifies the expected output after filtering through uuidfilt.pl. # +# Best-effort loading of all available vport modules is performed. +# m4_define([OVS_TRAFFIC_VSWITCHD_START], - [ AT_CHECK([modprobe openvswitch]) - ON_EXIT([modprobe -r openvswitch]) + [AT_CHECK([modprobe openvswitch]) + ON_EXIT([modprobe -r openvswitch]) + m4_foreach([mod], [[vport_geneve], [vport_gre], [vport_lisp], [vport_stt], [vport_vxlan]], + [modprobe -q mod || echo "Module mod not loaded." + ON_EXIT([modprobe -q -r mod])]) + ON_EXIT([ovs-dpctl del-dp ovs-system]) _OVS_VSWITCHD_START([]) dnl Add bridges, ports, etc. AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- set bridge br0 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) |