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

interface: T6592: remove interface from conntrack ct_iface_map on deletion (backport #3857) #3871

Merged
merged 2 commits into from
Jul 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 24, 2024

Change Summary

We always have had stale interface entries in the ct_iface_map of nftables/ conntrack for any interface that once belonged to a VRF.

This commit will always clean the nftables interface map when the interface is deleted from the system.

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

vyos.interfaces

Proposed changes

How to test

Smoketest result

[email protected]:~$ /usr/libexec/vyos/tests/smoke/cli/test_interfaces_l2tpv3.py
test_add_multiple_ip_addresses (__main__.L2TPv3InterfaceTest.test_add_multiple_ip_addresses) ... ok
test_add_single_ip_address (__main__.L2TPv3InterfaceTest.test_add_single_ip_address) ... ok
test_add_to_invalid_vrf (__main__.L2TPv3InterfaceTest.test_add_to_invalid_vrf) ... ok
test_dhcp_client_options (__main__.L2TPv3InterfaceTest.test_dhcp_client_options) ... skipped 'not supported'
test_dhcp_disable_interface (__main__.L2TPv3InterfaceTest.test_dhcp_disable_interface) ... skipped 'not supported'
test_dhcp_vrf (__main__.L2TPv3InterfaceTest.test_dhcp_vrf) ... skipped 'not supported'
test_dhcpv6_client_options (__main__.L2TPv3InterfaceTest.test_dhcpv6_client_options) ... skipped 'not supported'
test_dhcpv6_vrf (__main__.L2TPv3InterfaceTest.test_dhcpv6_vrf) ... skipped 'not supported'
test_dhcpv6pd_auto_sla_id (__main__.L2TPv3InterfaceTest.test_dhcpv6pd_auto_sla_id) ... skipped 'not supported'
test_dhcpv6pd_manual_sla_id (__main__.L2TPv3InterfaceTest.test_dhcpv6pd_manual_sla_id) ... skipped 'not supported'
test_interface_description (__main__.L2TPv3InterfaceTest.test_interface_description) ... ok
test_interface_disable (__main__.L2TPv3InterfaceTest.test_interface_disable) ... ok
test_interface_ip_options (__main__.L2TPv3InterfaceTest.test_interface_ip_options) ... ok
test_interface_ipv6_options (__main__.L2TPv3InterfaceTest.test_interface_ipv6_options) ... ok
test_interface_mtu (__main__.L2TPv3InterfaceTest.test_interface_mtu) ... ok
test_ipv6_link_local_address (__main__.L2TPv3InterfaceTest.test_ipv6_link_local_address) ... ok
test_move_interface_between_vrf_instances (__main__.L2TPv3InterfaceTest.test_move_interface_between_vrf_instances) ... ok
test_mtu_1200_no_ipv6_interface (__main__.L2TPv3InterfaceTest.test_mtu_1200_no_ipv6_interface) ... ok
test_span_mirror (__main__.L2TPv3InterfaceTest.test_span_mirror) ... skipped 'not supported'
test_vif_8021q_interfaces (__main__.L2TPv3InterfaceTest.test_vif_8021q_interfaces) ... skipped 'not supported'
test_vif_8021q_lower_up_down (__main__.L2TPv3InterfaceTest.test_vif_8021q_lower_up_down) ... skipped 'not supported'
test_vif_8021q_mtu_limits (__main__.L2TPv3InterfaceTest.test_vif_8021q_mtu_limits) ... skipped 'not supported'
test_vif_8021q_qos_change (__main__.L2TPv3InterfaceTest.test_vif_8021q_qos_change) ... skipped 'not supported'
test_vif_s_8021ad_vlan_interfaces (__main__.L2TPv3InterfaceTest.test_vif_s_8021ad_vlan_interfaces) ... skipped 'not supported'
test_vif_s_protocol_change (__main__.L2TPv3InterfaceTest.test_vif_s_protocol_change) ... skipped 'not supported'

----------------------------------------------------------------------
Ran 25 tests in 42.808s

OK (skipped=14)

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

This is an automatic backport of pull request #3857 done by [Mergify](https://mergify.com).

c-po added 2 commits July 24, 2024 23:52
…etion

We always have had stale interface entries in the ct_iface_map of nftables/
conntrack for any interface that once belonged to a VRF.

This commit will always clean the nftables interface map when the interface
is deleted from the system.

(cherry picked from commit 17c12bd)
…p on deletion

Now that interfaces are deleted from ct_iface_map during deletion it's time to
also add a smoketest ensuring there is no entry in the ct_iface_map once an
interface was deleted from the CLI.

(cherry picked from commit 1c42ee9)
@mergify mergify bot requested a review from a team as a code owner July 24, 2024 23:52
@mergify mergify bot requested review from dmbaturin, sarthurdev, zdc, jestabro, sever-sever and nicolas-fort and removed request for a team July 24, 2024 23:52
Copy link

👍
No issues in PR Title / Commit Title

Copy link

👍
No issues in unused-imports

@c-po c-po merged commit 8e4d0d2 into circinus Jul 25, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/circinus/pr-3857 branch July 25, 2024 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants