Merge pull request #4795 from natali-rs1985/T7930

T7930: VPP: Changing NAT44 settings resets `forwarding_enabled` to False

2 files changed, 4 insertions, 9 deletions

diff --git a/python/vyos/vpp/control_vpp.py b/python/vyos/vpp/control_vpp.py
index 41b4573a5..cb8da50a6 100644
--- a/python/vyos/vpp/control_vpp.py
+++ b/python/vyos/vpp/control_vpp.py
@@ -440,15 +440,6 @@ class VPPControl:
         return None
 
     @_Decorators.api_call
-    def enable_disable_nat44_forwarding(self, enable: bool) -> None:
-        """Enable/disable NAT44 forwarding
-
-        Args:
-            enable (bool): True if enable, False if disable
-        """
-        self.__vpp_api_client.api.nat44_forwarding_enable_disable(enable=enable)
-
-    @_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 b7e2d7744..d90193088 100644
--- a/python/vyos/vpp/nat/nat44.py
+++ b/python/vyos/vpp/nat/nat44.py
@@ -224,6 +224,10 @@ class Nat44:
             tcp_transitory=tcp_transitory,
         )
 
+    def enable_disable_nat44_forwarding(self, enable):
+        """Enable/disable NAT44 forwarding"""
+        self.vpp.api.nat44_forwarding_enable_disable(enable=enable)
+
     def enable_ipfix(self):
         """Enable NAT44 IPFIX logging"""
         self.vpp.api.nat44_ei_ipfix_enable_disable(enable=True)