Page MenuHomeFreeBSD
Differential D40488

ipfw(8): add ioctl/instruction generation tests
ClosedPublic
Actions

Authored by melifaro on Jun 11 2023, 4:01 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 27, 3:38 PM
Unknown Object (File)
Sun, Apr 26, 3:36 AM
Unknown Object (File)
Sun, Apr 12, 7:11 PM
Unknown Object (File)
Wed, Apr 8, 2:26 PM
Unknown Object (File)
Mar 26 2026, 3:07 AM
Unknown Object (File)
Mar 22 2026, 8:21 AM
Unknown Object (File)
Mar 20 2026, 5:21 AM
Unknown Object (File)
Mar 20 2026, 5:21 AM
View All Files
Subscribers
ae
donner
glebius
imp

Details

Reviewers
ae
Group Reviewers
network
tests
Commits
rG9f44a47fd079: ipfw(8): add ioctl/instruction generation tests
Summary

Add ABI-related tests for ipfw(8).

The tests are handy to ensure smooth upcoming libipfw(3) introduction.

This diff adds the python framework for parsing and generating ipfw ioctls (rules only ATM).
ipfw(8) is extended with -x key which triggers dumping ioctls (wrapped in the debug header) to the stdout, where they can be read by the tests.
Most likely, this interface is temporary for the duration of ipfw(8) conversion to use libipfw. After the conversion, the different, yet-to-be-created interface will be used.

The current form is handy as it allows "cheap" testing without any side-effects.

Test Plan
17:51 [0] m@devel0 s kyua test -k /usr/tests/sbin/ipfw/Kyuafile
test_add_rule.py:TestAddRule::test_add_ports[test_range-dst]  ->  passed  [0.228s]
test_add_rule.py:TestAddRule::test_add_ports[test_range-src]  ->  passed  [0.257s]
test_add_rule.py:TestAddRule::test_add_ports[test_ranges-dst]  ->  passed  [0.228s]
test_add_rule.py:TestAddRule::test_add_ports[test_ranges-src]  ->  passed  [0.227s]
test_add_rule.py:TestAddRule::test_add_ports[test_single-dst]  ->  passed  [0.227s]
test_add_rule.py:TestAddRule::test_add_ports[test_single-src]  ->  passed  [0.227s]
test_add_rule.py:TestAddRule::test_add_rule[test_keep_state]  ->  passed  [0.257s]
test_add_rule.py:TestAddRule::test_add_rule[test_or]  ->  passed  [0.229s]
test_add_rule.py:TestAddRule::test_add_rule[test_rulenum]  ->  passed  [0.233s]
test_add_rule.py:TestAddRule::test_add_rule[test_tables]  ->  passed  [0.284s]
test_add_rule.py:TestAddRule::test_add_single_instruction[test_ports]  ->  passed  [0.252s]
test_add_rule.py:TestAddRule::test_add_single_instruction[test_prob]  ->  passed  [0.238s]
test_add_rule.py:TestAddRule::test_add_single_instruction[test_proto]  ->  passed  [0.246s]

Results file id is usr_tests_sbin_ipfw.20230611-175151-288150
Results saved to /home/melifaro/.kyua/store/results.usr_tests_sbin_ipfw.20230611-175151-288150.db

13/13 passed (0 failed)

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Errors
SeverityLocationCodeMessage
Errorsbin/ipfw/tests/test_add_rule.py:69E501PEP8 E501
Errorsbin/ipfw/tests/test_add_rule.py:131E501PEP8 E501
Errorsbin/ipfw/tests/test_add_rule.py:144E501PEP8 E501
Errorsbin/ipfw/tests/test_add_rule.py:145E501PEP8 E501
Errorsbin/ipfw/tests/test_add_rule.py:162E501PEP8 E501
Errorsbin/ipfw/tests/test_add_rule.py:200E501PEP8 E501
Errorsbin/ipfw/tests/test_add_rule.py:264E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/insns.py:92E262PEP8 E262
Errortests/atf_python/sys/netpfil/ipfw/insns.py:222E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/insns.py:261E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/insns.py:273E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/insns.py:334E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/insns.py:395E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/insns.py:396E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/insns.py:443E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/insns.py:462E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/insns.py:493E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:174E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:209E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:209E501PEP8 E501
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:212E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:233E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:320E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:381E203PEP8 E203
Errortests/atf_python/sys/netpfil/ipfw/ioctl.py:381E501PEP8 E501
Unit
No Test Coverage
Build Status
Buildable 51996
Build 48887: arc lint + arc unit

Event Timeline

melifaro created this revision.Jun 11 2023, 4:01 PM
Herald added subscribers: glebius, donner, ae, imp. · View Herald TranscriptJun 11 2023, 4:01 PM
melifaro requested review of this revision.Jun 11 2023, 4:01 PM
melifaro edited the summary of this revision. (Show Details)Jun 11 2023, 4:23 PM
melifaro added reviewers: network, ae.
melifaro added a reviewer: tests.Jun 11 2023, 5:42 PM
melifaro updated this revision to Diff 123073.Jun 11 2023, 5:51 PM
melifaro edited the summary of this revision. (Show Details)

Fix keep_state test.

melifaro edited the test plan for this revision. (Show Details)Jun 11 2023, 5:52 PM
Harbormaster completed remote builds in B51996: Diff 123071.Jun 11 2023, 10:17 PM
Harbormaster completed remote builds in B51997: Diff 123073.
This revision was not accepted when it landed; it landed in state Needs Review.Jun 13 2023, 11:56 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG9f44a47fd079: ipfw(8): add ioctl/instruction generation tests (authored by melifaro). · Explain Why
This revision was automatically updated to reflect the committed changes.
melifaro added a commit: rG9f44a47fd079: ipfw(8): add ioctl/instruction generation tests.

Revision Contents
Changeset List

PathSize
etc/
mtree/
2 lines
sbin/
ipfw/
1 line
47 lines
6 lines
tests/
5 lines
282 lines
tests/
atf_python/
sys/
2 lines
netpfil/
4 lines
netpfil/
ipfw/
11 lines
551 lines
570 lines
118 lines
59 lines

Diff 123071

View Options

etc/mtree/BSD.tests.dist

Loading...
View Options

sbin/ipfw/ipfw2.h

Loading...
View Options

sbin/ipfw/ipfw2.c

Loading...
View Options

sbin/ipfw/main.c

Loading...
View Options

sbin/ipfw/tests/Makefile

Loading...
View Options

sbin/ipfw/tests/test_add_rule.py

Loading...
View Options

tests/atf_python/sys/Makefile

Loading...
View Options

tests/atf_python/sys/netpfil/Makefile

Loading...
View Options

tests/atf_python/sys/netpfil/__init__.py

Loading...
View Options

tests/atf_python/sys/netpfil/ipfw/Makefile

Loading...
View Options

tests/atf_python/sys/netpfil/ipfw/__init__.py

Loading...
View Options

tests/atf_python/sys/netpfil/ipfw/insns.py

Loading...
View Options

tests/atf_python/sys/netpfil/ipfw/ioctl.py

Loading...
View Options

tests/atf_python/sys/netpfil/ipfw/ipfw.py

Loading...
View Options

tests/atf_python/sys/netpfil/ipfw/utils.py

Loading...