vnet tests: verify that we can load if_epair and if_bridge

We're going to start running many of the vnet tests in nested jails (so they
can run in parallel). That means the tests won't be able to load kernel modules,
which we commonly do for if_epair and if_bridge.

Just assume that all vnet tests need this, because so many of them do that we
don't want to manually annotate all of them.
This is essentially a no-op on non-nested tests.

Do the same for the python test framework.

While here also have pflog_init actually call pft_init. While having pflog
loaded implies we have pf too pft_init also checks for vimage support, and now
for if_epair.

Reviewed by:	markj
MFC after:	1 month
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D46039
This commit is contained in:
Kristof Provost 2024-07-18 22:36:55 +02:00
parent 07d17ca189
commit ae8d588140
3 changed files with 29 additions and 0 deletions

View File

@ -334,6 +334,10 @@ class VnetTestTemplate(BaseTest):
NEED_ROOT: bool = True
TOPOLOGY = {}
def _require_default_modules(self):
libc.kldload("if_epair.ko")
self.require_module("if_epair")
def _get_vnet_handler(self, vnet_alias: str):
handler_name = "{}_handler".format(vnet_alias)
return getattr(self, handler_name, None)
@ -451,6 +455,8 @@ class VnetTestTemplate(BaseTest):
def setup_method(self, _method):
"""Sets up all the required topology and handlers for the given test"""
super().setup_method(_method)
self._require_default_modules()
# TestIP6Output.test_output6_pktinfo[ipandif]
topology_id = get_topology_id(self.test_id)
topology = self.TOPOLOGY

View File

@ -11,11 +11,32 @@ unlist_interface()
sed -i "" /^$1\$/d created_interfaces.lst
}
_vnet_check_req()
{
type=$1
if kldstat -q -n if_${type}.ko; then
return
fi
if ! kldload -n -q if_${type}; then
atf_skip "if_${type}.ko is required to run this test."
return
fi
}
vnet_init()
{
if [ "`sysctl -i -n kern.features.vimage`" != 1 ]; then
atf_skip "This test requires VIMAGE"
fi
# Check if we can create if_epair or if_bridge interfaces.
# We may be running in a jail already, unable to load modules.
# If so, skip this test because it very likely (but not certainly)
# wants at least one of those
_vnet_check_req epair
_vnet_check_req bridge
}
vnet_mkepair()

View File

@ -83,6 +83,8 @@ pfsynct_init()
pflog_init()
{
pft_init
if ! kldstat -q -m pflog; then
atf_skip "This test requires pflog"
fi