From 1953da661069c967f1159162dc65c9a1210fcdbd Mon Sep 17 00:00:00 2001 From: Filip Varga Date: Thu, 30 Sep 2021 13:35:59 +0200 Subject: nat: nat44-ei configuration improvements nat44-ed core configuration improvements & fixes [0-5] adjusted for nat44-ei plugin. Improvements: * repeating code converted to functions * simplified functions used for pool address, static mapping and interface configuration. Clean up: * remove obsolete code and logic persisted after plugin separation from old SNAT plugin. Fixes: * [0] return correct API behavior changed in [5] Type: improvement [0] https://gerrit.fd.io/r/c/vpp/+/33622 [1] https://gerrit.fd.io/r/c/vpp/+/33431 [2] https://gerrit.fd.io/r/c/vpp/+/33337 [3] https://gerrit.fd.io/r/c/vpp/+/33249 [4] https://gerrit.fd.io/r/c/vpp/+/32796 [5] https://gerrit.fd.io/r/c/vpp/+/32951 Signed-off-by: Filip Varga Change-Id: Ie197faa576cb49acb3d218f14e00cb7d13ad9342 --- test/test_nat44_ei.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'test/test_nat44_ei.py') diff --git a/test/test_nat44_ei.py b/test/test_nat44_ei.py index 5fdcf3fa3c7..6dcda8c6ae4 100644 --- a/test/test_nat44_ei.py +++ b/test/test_nat44_ei.py @@ -2831,13 +2831,6 @@ class TestNAT44EI(MethodHolder): def test_output_feature(self): """ NAT44EI output feature (in2out postrouting) """ self.nat44_add_address(self.nat_addr) - flags = self.config_flags.NAT44_EI_IF_INSIDE - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, flags=flags, - sw_if_index=self.pg0.sw_if_index) - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, flags=flags, - sw_if_index=self.pg1.sw_if_index) self.vapi.nat44_ei_interface_add_del_output_feature( is_add=1, sw_if_index=self.pg3.sw_if_index) @@ -2884,13 +2877,6 @@ class TestNAT44EI(MethodHolder): self.nat44_add_address(nat_ip_vrf10, vrf_id=10) self.nat44_add_address(nat_ip_vrf20, vrf_id=20) - flags = self.config_flags.NAT44_EI_IF_INSIDE - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, flags=flags, - sw_if_index=self.pg4.sw_if_index) - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, flags=flags, - sw_if_index=self.pg6.sw_if_index) self.vapi.nat44_ei_interface_add_del_output_feature( is_add=1, sw_if_index=self.pg3.sw_if_index) @@ -2937,9 +2923,8 @@ class TestNAT44EI(MethodHolder): server_out_port = 8765 self.nat44_add_address(self.nat_addr) - flags = self.config_flags.NAT44_EI_IF_INSIDE self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, flags=flags, + is_add=1, sw_if_index=self.pg0.sw_if_index) self.vapi.nat44_ei_interface_add_del_output_feature( is_add=1, -- cgit 1.2.3-korg