diff options
| author |   Filip Varga <fivarga@cisco.com> | 2021-10-21 13:00:27 +0200 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2021-11-10 10:48:19 +0000 |
| commit | 9c25eb1f4876a399919782c97e116732ea2ee628 (patch) | |
| tree | 82ec5f326d2ebb326983abe6b4d2595729af46d1 /test | |
| parent | 603231f447f197e7bc45bdb75bf5d77420e682b9 (diff) | |
nat: api autoendian fix
Fixed bad use of macros for autoendian API calls
and updated tests for the new API. Removed sw_if_index
check macro because of ntol conversion. Changed
REPLY_MACRO to REPLY_MACRO_END to fix ntohl conversions.
Type: fix
Change-Id: I878a07b3f80fe03179feab60f0abc662f408a2c8
Signed-off-by: Filip Varga <fivarga@cisco.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_nat44_ed.py | 8 | ||||
| -rw-r--r-- | test/test_nat44_ei.py | 20 |
2 files changed, 12 insertions, 16 deletions
diff --git a/test/test_nat44_ed.py b/test/test_nat44_ed.py index 4c112d3573e..de1e1b343ae 100644 --- a/test/test_nat44_ed.py +++ b/test/test_nat44_ed.py @@ -2742,7 +2742,7 @@ class TestNAT44EDMW(TestNAT44ED): self.nat_add_inside_interface(self.pg0) self.nat_add_outside_interface(self.pg0) - self.vapi.nat44_interface_add_del_output_feature( + self.vapi.nat44_ed_add_del_output_interface( sw_if_index=self.pg1.sw_if_index, is_add=1) # from client to service @@ -2820,7 +2820,7 @@ class TestNAT44EDMW(TestNAT44ED): self.nat_add_inside_interface(self.pg0) self.nat_add_outside_interface(self.pg0) - self.vapi.nat44_interface_add_del_output_feature( + self.vapi.nat44_ed_add_del_output_interface( sw_if_index=self.pg1.sw_if_index, is_add=1) p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) / @@ -3055,7 +3055,7 @@ class TestNAT44EDMW(TestNAT44ED): """ NAT44ED output feature works with stateful ACL """ self.nat_add_address(self.nat_addr) - self.vapi.nat44_interface_add_del_output_feature( + self.vapi.nat44_ed_add_del_output_interface( sw_if_index=self.pg1.sw_if_index, is_add=1) # First ensure that the NAT is working sans ACL @@ -3133,7 +3133,7 @@ class TestNAT44EDMW(TestNAT44ED): self.vapi.nat44_interface_add_del_feature( sw_if_index=self.pg0.sw_if_index, flags=flags, is_add=1) - self.vapi.nat44_interface_add_del_output_feature( + self.vapi.nat44_ed_add_del_output_interface( is_add=1, sw_if_index=self.pg1.sw_if_index) diff --git a/test/test_nat44_ei.py b/test/test_nat44_ei.py index 6dcda8c6ae4..fd011230b2b 100644 --- a/test/test_nat44_ei.py +++ b/test/test_nat44_ei.py @@ -2831,9 +2831,8 @@ class TestNAT44EI(MethodHolder): def test_output_feature(self): """ NAT44EI output feature (in2out postrouting) """ self.nat44_add_address(self.nat_addr) - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, - sw_if_index=self.pg3.sw_if_index) + self.vapi.nat44_ei_add_del_output_interface( + sw_if_index=self.pg3.sw_if_index, is_add=1) # in2out pkts = self.create_stream_in(self.pg0, self.pg3) @@ -2877,9 +2876,8 @@ class TestNAT44EI(MethodHolder): self.nat44_add_address(nat_ip_vrf10, vrf_id=10) self.nat44_add_address(nat_ip_vrf20, vrf_id=20) - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, - sw_if_index=self.pg3.sw_if_index) + self.vapi.nat44_ei_add_del_output_interface( + sw_if_index=self.pg3.sw_if_index, is_add=1) # in2out VRF 10 pkts = self.create_stream_in(self.pg4, self.pg3) @@ -2923,12 +2921,10 @@ class TestNAT44EI(MethodHolder): server_out_port = 8765 self.nat44_add_address(self.nat_addr) - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, - sw_if_index=self.pg0.sw_if_index) - self.vapi.nat44_ei_interface_add_del_output_feature( - is_add=1, - sw_if_index=self.pg1.sw_if_index) + self.vapi.nat44_ei_add_del_output_interface( + sw_if_index=self.pg0.sw_if_index, is_add=1) + self.vapi.nat44_ei_add_del_output_interface( + sw_if_index=self.pg1.sw_if_index, is_add=1) # add static mapping for server self.nat44_add_static_mapping(server.ip4, self.nat_addr, |