From 4d32bcddda72c1df944470f06b75908b2dc31667 Mon Sep 17 00:00:00 2001
From: "Nataliia S." <81954790+natali-rs1985@users.noreply.github.com>
Date: Tue, 8 Apr 2025 17:15:42 +0300
Subject: T7315: Change CLI fot VPP NAT (#25)

New CLI
```
set vpp nat44 static rule 10 outside-interface 'eth0'
set vpp nat44 static rule 10 inside-interface 'eth1'
set vpp nat44 static rule 10 external address 192.168.122.10
set vpp nat44 static rule 10 external port 6545                 # optional
set vpp nat44 static rule 10 protocol tcp|udp|icmp|all          # optional, defaults to "all"
set vpp nat44 static rule 10 local address 100.64.0.10
set vpp nat44 static rule 10 local port 64010                   # optional
```
---
 python/vyos/vpp/nat/nat44.py | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

(limited to 'python')

diff --git a/python/vyos/vpp/nat/nat44.py b/python/vyos/vpp/nat/nat44.py
index 985e5a583..97c4518e6 100644
--- a/python/vyos/vpp/nat/nat44.py
+++ b/python/vyos/vpp/nat/nat44.py
@@ -151,31 +151,24 @@ class Nat44Static(Nat44):
     def __init__(self):
         self.vpp = VPPControl()
 
-    def add_inbound_interface(self, interface_in):
+    def add_inside_interface(self, interface_in):
         self.interface_in = interface_in
         self.add_nat44_interface_inside()
 
-    def delete_inbound_interface(self, interface_in):
+    def delete_inside_interface(self, interface_in):
         self.interface_in = interface_in
         self.delete_nat44_interface_inside()
 
-    def add_outbound_interface(self, interface_out):
+    def add_outside_interface(self, interface_out):
         self.interface_out = interface_out
         self.add_nat44_interface_outside()
 
-    def delete_outbound_interface(self, interface_out):
+    def delete_outside_interface(self, interface_out):
         self.interface_out = interface_out
         self.delete_nat44_interface_outside()
 
     def add_nat44_static_mapping(
-        self,
-        iface_out,
-        local_ip,
-        external_ip,
-        local_port,
-        external_port,
-        protocol,
-        use_iface,
+        self, local_ip, external_ip, local_port, external_port, protocol
     ):
         """Add NAT44 static mapping"""
         self.vpp.api.nat44_add_del_static_mapping_v2(
@@ -185,21 +178,11 @@ class Nat44Static(Nat44):
             local_port=local_port,
             external_port=external_port,
             flags=0x08 if not (protocol or local_port) else 0x00,
-            external_sw_if_index=(
-                self.vpp.get_sw_if_index(iface_out) if use_iface else 0xFFFFFFFF
-            ),
             is_add=True,
         )
 
     def delete_nat44_static_mapping(
-        self,
-        iface_out,
-        local_ip,
-        external_ip,
-        local_port,
-        external_port,
-        protocol,
-        use_iface,
+        self, local_ip, external_ip, local_port, external_port, protocol
     ):
         """Delete NAT44 static mapping"""
         self.vpp.api.nat44_add_del_static_mapping_v2(
@@ -209,8 +192,5 @@ class Nat44Static(Nat44):
             local_port=local_port,
             external_port=external_port,
             flags=0x08 if not (protocol or local_port) else 0x00,
-            external_sw_if_index=(
-                self.vpp.get_sw_if_index(iface_out) if use_iface else 0xFFFFFFFF
-            ),
             is_add=False,
         )
-- 
cgit v1.2.3