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

T6497: CGNAT refactoring delete conntrack entries #3699

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

sever-sever
Copy link
Member

Change Summary

Refactoring of the deleting conntrack entries.
Use native ipaddress.summary function
Delete only required entries by internal network

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

cgnat

Proposed changes

How to test

Smoketest result

vyos@r4:~$ /usr/libexec/vyos/tests/smoke/cli/test_cgnat.py
test_cgnat (__main__.TestCGNAT.test_cgnat) ... 
Rule must be defined!


Rule must be defined!


External pool "fake-pool" does not exist!

ok
test_cgnat_sequence (__main__.TestCGNAT.test_cgnat_sequence) ... ok

----------------------------------------------------------------------
Ran 2 tests in 24.286s

OK
vyos@r4:~$ 

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

src/conf_mode/nat_cgnat.py Show resolved Hide resolved
src/conf_mode/nat_cgnat.py Outdated Show resolved Hide resolved
src/conf_mode/nat_cgnat.py Outdated Show resolved Hide resolved
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

data/configd-include.json Outdated Show resolved Hide resolved
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@sever-sever
Copy link
Member Author

@Mergifyio backport circinus

Copy link

mergify bot commented Jun 27, 2024

backport circinus

✅ Backports have been created

Copy link

👍 VyOS CLI smoketests finished successfully!

@sever-sever sever-sever merged commit 804efa2 into vyos:current Jun 27, 2024
12 checks passed
mergify bot pushed a commit that referenced this pull request Jun 27, 2024
(cherry picked from commit 804efa2)

# Conflicts:
#	src/conf_mode/nat_cgnat.py
sever-sever added a commit that referenced this pull request Jun 28, 2024
sever-sever added a commit that referenced this pull request Jul 2, 2024
(cherry picked from commit 804efa2)

Co-authored-by: Viacheslav Hletenko <v.gletenko@vyos.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants