# _ADD_BR([name])
#
# Expands into the proper ovs-vsctl commands to create a bridge with the
-# appropriate type
-m4_define([_ADD_BR], [[add-br $1]])
+# appropriate type and properties
+m4_define([_ADD_BR], [[add-br $1 -- set Bridge $1 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure ]])
# OVS_TRAFFIC_VSWITCHD_START([vsctl-args], [vsctl-output], [=override])
#
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])
+ AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2])
])
# OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds])
# kernel conntrack tables when the test is finished.
#
m4_define([CHECK_CONNTRACK],
- [AT_SKIP_IF([test $HAVE_CONNTRACK = no])
- AT_SKIP_IF([test $HAVE_PYTHON = no])
- m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6]],
+ [AT_SKIP_IF([test $HAVE_PYTHON = no])
+ m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp]],
[modprobe mod || echo "Module mod not loaded."
on_exit 'modprobe -r mod'
])
- on_exit 'conntrack -F'
+ on_exit 'ovstest test-netlink-conntrack flush'
]
)