T7515: Fix VPP NAT44 timeouts

2 files changed, 9 insertions, 19 deletions

diff --git a/python/vyos/vpp/control_vpp.py b/python/vyos/vpp/control_vpp.py
index 5db0ea560..5959b68b5 100644
--- a/python/vyos/vpp/control_vpp.py
+++ b/python/vyos/vpp/control_vpp.py
@@ -449,25 +449,6 @@ class VPPControl:
         self.__vpp_api_client.api.nat44_forwarding_enable_disable(enable=enable)
 
     @_Decorators.api_call
-    def set_nat_timeouts(
-        self, icmp: int, udp: int, tcp_established: int, tcp_transitory: int
-    ) -> None:
-        """Set NAT timeouts
-
-        Args:
-            tcp_established (int): TCP established timeout
-            tcp_transitory (int): TCP transitory timeout
-            udp (int): UDP timeout
-            icmp (int): ICMP timeout
-        """
-        self.__vpp_api_client.api.nat_set_timeouts(
-            icmp=icmp,
-            udp=udp,
-            tcp_established=tcp_established,
-            tcp_transitory=tcp_transitory,
-        )
-
-    @_Decorators.api_call
     def set_nat44_session_limit(self, session_limit: int) -> None:
         """Set NAT44 session limit
 
diff --git a/python/vyos/vpp/nat/nat44.py b/python/vyos/vpp/nat/nat44.py
index e01e05153..6b02688aa 100644
--- a/python/vyos/vpp/nat/nat44.py
+++ b/python/vyos/vpp/nat/nat44.py
@@ -215,6 +215,15 @@ class Nat44:
             is_add=False,
         )
 
+    def set_nat_timeouts(self, icmp, udp, tcp_established, tcp_transitory):
+        """Set NAT timeouts"""
+        self.vpp.api.nat_set_timeouts(
+            icmp=icmp,
+            udp=udp,
+            tcp_established=tcp_established,
+            tcp_transitory=tcp_transitory,
+        )
+
     def enable_ipfix(self):
         """Enable NAT44 IPFIX logging"""
         self.vpp.api.nat44_ei_ipfix_enable_disable(enable=True)