Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: iptables stats tests for iptables >= 1.8.9 #113

Merged
merged 1 commit into from
Nov 2, 2023

Conversation

costasd
Copy link
Contributor

@costasd costasd commented Oct 16, 2023

IPTables fixed a couple long-standing discrepancies in ipv4/ipv6's -L output.
Unfortunately these fixes break out tests and potentially, stat parsing.

In detail, the following were fixed in 1.8.9 and later:

  • ip6tables' opt column outputting spaces instead of dashes
  • ip6tables' prot column not resolving "all" to "0", even with numeric mode activated.
  • iptables' prot column not resolving "all" to "0", even with numeric mode activated.

Handle them, so that tests keep working post 1.8.9.

Copy link
Collaborator

@squeed squeed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@costasd Thanks for your change! It looks like the tests are failing - can you please take a look?

IPTables fixed a couple long-standing discrepancies in ipv4/ipv6's -L output.
Unfortunately these fixes break out tests and potentially, stat parsing.

In detail, the following were fixed in 1.8.9 and later:
* ip6tables' opt column outputting spaces instead of dashes
* ip6tables' prot column not resolving "all" to "0", even with numeric mode activated.
* iptables' prot column not resolving "all" to "0", even with numeric mode activated.

Handle them, so that tests keep working post 1.8.9.
@costasd
Copy link
Contributor Author

costasd commented Oct 23, 2023

@costasd Thanks for your change! It looks like the tests are failing - can you please take a look?

Ouch, sorry about that, missed the conditional for IPv4. Added, should work now. Thanks!

@squeed squeed enabled auto-merge November 2, 2023 14:17
@squeed squeed merged commit 9e9711e into coreos:main Nov 2, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants