diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/vpp/config_verify.py | 20 | ||||
| -rw-r--r-- | python/vyos/vpp/control_vpp.py | 19 | ||||
| -rw-r--r-- | python/vyos/vpp/nat/nat44.py | 10 |
3 files changed, 10 insertions, 39 deletions
diff --git a/python/vyos/vpp/config_verify.py b/python/vyos/vpp/config_verify.py index 823443be5..bcc10257f 100644 --- a/python/vyos/vpp/config_verify.py +++ b/python/vyos/vpp/config_verify.py @@ -417,26 +417,6 @@ def verify_vpp_settings_cpu_corelist_workers(cpu_settings: dict): ) -def verify_vpp_nat44_workers(workers: int, nat44_workers: list): - if workers < 1: - raise ConfigError( - '"nat44 workers" requires cpu workers or corelist-workers to be set!' - ) - try: - nat_workers = cpu_checks.worker_cores_list( - iface='nat44', worker_ranges=nat44_workers - ) - except ValueError as e: - raise ConfigError(str(e)) - - invalid_workers = [str(el) for el in nat_workers if el not in range(workers)] - if invalid_workers: - raise ConfigError( - f'Cannot set VPP "nat44 workers": worker(s) #{",".join(invalid_workers)} not available. ' - f'Available worker ids: {",".join(map(str, range(workers)))}' - ) - - def verify_vpp_statseg_size(settings: dict): statseg_size = mem_checks.statseg_size(settings) diff --git a/python/vyos/vpp/control_vpp.py b/python/vyos/vpp/control_vpp.py index 91b682360..3fab4039a 100644 --- a/python/vyos/vpp/control_vpp.py +++ b/python/vyos/vpp/control_vpp.py @@ -439,25 +439,6 @@ class VPPControl: return iface.interface_dev_type return None - @_Decorators.api_call - def set_nat44_session_limit(self, session_limit: int) -> None: - """Set NAT44 session limit - - Args: - session_limit (int): Maximum number of sessions per thread - """ - self.__vpp_api_client.api.nat44_set_session_limit( - session_limit=session_limit, - ) - - @_Decorators.api_call - def set_nat_workers(self, workers: int) -> None: - """Set NAT44 session limit - - Args: - workers (int): Bitmask of workers list - """ - self.__vpp_api_client.api.nat_set_workers(worker_mask=workers) @property def connected(self) -> bool: diff --git a/python/vyos/vpp/nat/nat44.py b/python/vyos/vpp/nat/nat44.py index d90193088..179e86c0c 100644 --- a/python/vyos/vpp/nat/nat44.py +++ b/python/vyos/vpp/nat/nat44.py @@ -228,6 +228,16 @@ class Nat44: """Enable/disable NAT44 forwarding""" self.vpp.api.nat44_forwarding_enable_disable(enable=enable) + def set_nat44_session_limit(self, session_limit: int) -> None: + """Set NAT44 session limit + + Args: + session_limit (int): Maximum number of sessions per thread + """ + self.vpp.api.nat44_set_session_limit( + session_limit=session_limit, + ) + def enable_ipfix(self): """Enable NAT44 IPFIX logging""" self.vpp.api.nat44_ei_ipfix_enable_disable(enable=True) |