diff options
| author | Nataliia S. <81954790+natali-rs1985@users.noreply.github.com> | 2025-06-09 20:42:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-09 20:42:49 +0300 |
| commit | ad65c6439bc82a3542e55e9afc8e4a9106870bbe (patch) | |
| tree | 09d4a4bbdc4faf645983a71495de72db07462956 /src | |
| parent | c919f22bb97287bfa16095b21a25bf7fa498c341 (diff) | |
| parent | beed1b690f89c7085b2ba2ece48168735f771a5f (diff) | |
| download | vyos-1x-ad65c6439bc82a3542e55e9afc8e4a9106870bbe.tar.gz vyos-1x-ad65c6439bc82a3542e55e9afc8e4a9106870bbe.zip | |
Merge branch 'current' into T7169
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/vpp.py | 9 | ||||
| -rw-r--r-- | src/conf_mode/vpp_nat.py | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py index 6174b8925..76aa7c5af 100755 --- a/src/conf_mode/vpp.py +++ b/src/conf_mode/vpp.py @@ -735,15 +735,6 @@ def apply(config): enable_forwarding = False vpp_control.enable_disable_nat44_forwarding(enable_forwarding) - vpp_control.set_nat_timeouts( - icmp=int(nat44_settings.get('timeout').get('icmp')), - udp=int(nat44_settings.get('timeout').get('udp')), - tcp_established=int( - nat44_settings.get('timeout').get('tcp_established') - ), - tcp_transitory=int(nat44_settings.get('timeout').get('tcp_transitory')), - ) - vpp_control.set_nat44_session_limit( int(nat44_settings.get('session_limit')) ) diff --git a/src/conf_mode/vpp_nat.py b/src/conf_mode/vpp_nat.py index a6bc70032..77b9400e3 100644 --- a/src/conf_mode/vpp_nat.py +++ b/src/conf_mode/vpp_nat.py @@ -104,6 +104,14 @@ def get_config(config=None) -> dict: } ) + if conf.exists(['vpp', 'settings', 'nat44', 'timeout']): + timeouts = conf.get_config_dict( + ['vpp', 'settings', 'nat44', 'timeout'], + key_mangling=('-', '_'), + with_defaults=True, + ) + config.update(timeouts) + if effective_config: config.update({'effective': effective_config}) @@ -453,6 +461,13 @@ def apply(config): port=int(rule_config.get('local_port', 0)), interface=rule_config.get('external_interface'), ) + if 'timeout' in config: + n.set_nat_timeouts( + icmp=int(config.get('timeout').get('icmp')), + udp=int(config.get('timeout').get('udp')), + tcp_established=int(config.get('timeout').get('tcp_established')), + tcp_transitory=int(config.get('timeout').get('tcp_transitory')), + ) if __name__ == '__main__': |