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

vrf: T6603: conntrack ct_iface_map must only contain one entry for iifname/oifname #3883

Merged
merged 2 commits into from
Jul 30, 2024

Conversation

c-po
Copy link
Member

@c-po c-po commented Jul 26, 2024

Change Summary

When any of the following features NAT, NAT66 or Firewall is enabled, for every VRF on the CLI we install one rule into nftables for conntrack:

chain vrf_zones_ct_in {
        type filter hook prerouting priority raw; policy accept;
        counter packets 3113 bytes 32227 ct original zone set iifname map @ct_iface_map
        counter packets 8550 bytes 80739 ct original zone set iifname map @ct_iface_map
        counter packets 5644 bytes 67697 ct original zone set iifname map @ct_iface_map
}

This is superfluous.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

VRF, nftables

Smoketest result

[email protected]:~$ /usr/libexec/vyos/tests/smoke/cli/test_vrf.py
test_vrf_assign_interface (__main__.VRFTest.test_vrf_assign_interface) ... ok
test_vrf_bind_all (__main__.VRFTest.test_vrf_bind_all) ... ok
test_vrf_conntrack (__main__.VRFTest.test_vrf_conntrack) ... ok <- EXTENDED SMOKETEST
test_vrf_disable_forwarding (__main__.VRFTest.test_vrf_disable_forwarding) ... ok
test_vrf_ip_ipv6_nht (__main__.VRFTest.test_vrf_ip_ipv6_nht) ... ok
test_vrf_ip_ipv6_protocol_non_existing_route_map (__main__.VRFTest.test_vrf_ip_ipv6_protocol_non_existing_route_map) ... ok
test_vrf_ip_protocol_route_map (__main__.VRFTest.test_vrf_ip_protocol_route_map) ... ok
test_vrf_ipv6_protocol_route_map (__main__.VRFTest.test_vrf_ipv6_protocol_route_map) ... ok
test_vrf_link_local_ip_addresses (__main__.VRFTest.test_vrf_link_local_ip_addresses) ... ok
test_vrf_loopbacks_ips (__main__.VRFTest.test_vrf_loopbacks_ips) ... ok
test_vrf_static_route (__main__.VRFTest.test_vrf_static_route) ... ok
test_vrf_table_id_is_unalterable (__main__.VRFTest.test_vrf_table_id_is_unalterable) ... ok
test_vrf_vni_add_change_remove (__main__.VRFTest.test_vrf_vni_add_change_remove) ... ok
test_vrf_vni_and_table_id (__main__.VRFTest.test_vrf_vni_and_table_id) ... ok
test_vrf_vni_duplicates (__main__.VRFTest.test_vrf_vni_duplicates) ... ok

----------------------------------------------------------------------
Ran 15 tests in 141.490s

OK

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@c-po c-po requested a review from a team as a code owner July 26, 2024 11:49
@c-po
Copy link
Member Author

c-po commented Jul 26, 2024

@Mergifyio backport circinus sagitta

Copy link

github-actions bot commented Jul 26, 2024

👍
No issues in PR Title / Commit Title

Copy link
Contributor

mergify bot commented Jul 26, 2024

backport circinus sagitta

✅ Backports have been created

Copy link

github-actions bot commented Jul 26, 2024


warning: Unused import os in smoketest/scripts/cli/test_interfaces_l2tpv3.py:17.

c-po added 2 commits July 26, 2024 13:52
…fname/oifname

When any of the following features NAT, NAT66 or Firewall is enabled, for every
VRF on the CLI we install one rule into nftables for conntrack:

    chain vrf_zones_ct_in {
            type filter hook prerouting priority raw; policy accept;
            counter packets 3113 bytes 32227 ct original zone set iifname map @ct_iface_map
            counter packets 8550 bytes 80739 ct original zone set iifname map @ct_iface_map
            counter packets 5644 bytes 67697 ct original zone set iifname map @ct_iface_map
    }

This is superfluous.
Copy link

CI integration 👍 passed!

Details

CI logs

  • CLI Smoketests 👍 passed
  • Config tests 👍 passed
  • RAID1 tests 👍 passed

@c-po c-po merged commit eed26f6 into vyos:current Jul 30, 2024
13 of 14 checks passed
@c-po c-po deleted the vrf-conntrack branch July 30, 2024 07:50
c-po added a commit that referenced this pull request Jul 30, 2024
vrf: T6603: conntrack ct_iface_map must only contain one entry for iifname/oifname (backport #3883)
c-po added a commit that referenced this pull request Aug 2, 2024
vrf: T6603: conntrack ct_iface_map must only contain one entry for iifname/oifname (backport #3883)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants