T7515: Fix VPP NAT44 timeouts

5 files changed, 29 insertions, 33 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)
diff --git a/smoketest/scripts/cli/test_vpp.py b/smoketest/scripts/cli/test_vpp.py
index 7a150f7e8..d8f7f3473 100755
--- a/smoketest/scripts/cli/test_vpp.py
+++ b/smoketest/scripts/cli/test_vpp.py
@@ -1373,13 +1373,11 @@ class TestVPP(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'{exclude_local_addr}:{exclude_local_port} vrf 0', out)
 
         # Check timeouts
-        # skipped due to https://vyos.dev/T7515
-        #
-        # _, out = rc_cmd('sudo vppctl show nat44 ei timeouts')
-        # self.assertIn(f'udp timeout: {timeout_udp}sec', out)
-        # self.assertIn(f'tcp established timeout: {timeout_tcp_est}sec', out)
-        # self.assertIn(f'tcp transitory timeout: {timeout_tcp_trans}sec', out)
-        # self.assertIn(f'icmp timeout: {timeout_icmp}sec', out)
+        _, out = rc_cmd('sudo vppctl show nat timeouts')
+        self.assertIn(f'udp timeout: {timeout_udp}sec', out)
+        self.assertIn(f'tcp-established timeout: {timeout_tcp_est}sec', out)
+        self.assertIn(f'tcp-transitory timeout: {timeout_tcp_trans}sec', out)
+        self.assertIn(f'icmp timeout: {timeout_icmp}sec', out)
 
         # Summary
         _, out = rc_cmd('sudo vppctl show nat44 summary')
diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py
index ed0e80c2c..029adbdec 100755
--- a/src/conf_mode/vpp.py
+++ b/src/conf_mode/vpp.py
@@ -745,13 +745,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')))
 
         if nat44_settings.get('workers'):
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__':