diff options
Diffstat (limited to 'test/test_nat.py')
| -rw-r--r-- | test/test_nat.py | 74 |
1 files changed, 44 insertions, 30 deletions
diff --git a/test/test_nat.py b/test/test_nat.py index f51a950678c..0d74cb60f87 100644 --- a/test/test_nat.py +++ b/test/test_nat.py @@ -23,6 +23,7 @@ from syslog_rfc5424_parser import SyslogMessage, ParseError from syslog_rfc5424_parser.constants import SyslogFacility, SyslogSeverity from vpp_papi_provider import SYSLOG_SEVERITY from io import BytesIO +from vpp_papi import VppEnum class MethodHolder(VppTestCase): @@ -48,12 +49,13 @@ class MethodHolder(VppTestCase): is_add=0) for intf in [self.pg7, self.pg8]: - neighbors = self.vapi.ip_neighbor_dump(intf.sw_if_index) - for n in neighbors: - self.vapi.ip_neighbor_add_del(intf.sw_if_index, - n.mac_address, - n.ip_address, - is_add=0) + self.vapi.ip_neighbor_add_del( + intf.sw_if_index, + intf.remote_mac, + intf.remote_ip4, + flags=(VppEnum.vl_api_ip_neighbor_flags_t. + IP_API_NEIGHBOR_FLAG_STATIC), + is_add=0) if self.pg7.has_ip4_config: self.pg7.unconfig_ip4() @@ -2964,14 +2966,18 @@ class TestNAT44(MethodHolder): def test_dynamic_ipless_interfaces(self): """ NAT44 interfaces without configured IP address """ - self.vapi.ip_neighbor_add_del(self.pg7.sw_if_index, - mac_pton(self.pg7.remote_mac), - self.pg7.remote_ip4n, - is_static=1) - self.vapi.ip_neighbor_add_del(self.pg8.sw_if_index, - mac_pton(self.pg8.remote_mac), - self.pg8.remote_ip4n, - is_static=1) + self.vapi.ip_neighbor_add_del( + self.pg7.sw_if_index, + self.pg7.remote_mac, + self.pg7.remote_ip4, + flags=(VppEnum.vl_api_ip_neighbor_flags_t. + IP_API_NEIGHBOR_FLAG_STATIC)) + self.vapi.ip_neighbor_add_del( + self.pg8.sw_if_index, + self.pg8.remote_mac, + self.pg8.remote_ip4, + flags=(VppEnum.vl_api_ip_neighbor_flags_t. + IP_API_NEIGHBOR_FLAG_STATIC)) self.vapi.ip_add_del_route(dst_address=self.pg7.remote_ip4n, dst_address_length=32, @@ -3006,14 +3012,18 @@ class TestNAT44(MethodHolder): def test_static_ipless_interfaces(self): """ NAT44 interfaces without configured IP address - 1:1 NAT """ - self.vapi.ip_neighbor_add_del(self.pg7.sw_if_index, - mac_pton(self.pg7.remote_mac), - self.pg7.remote_ip4n, - is_static=1) - self.vapi.ip_neighbor_add_del(self.pg8.sw_if_index, - mac_pton(self.pg8.remote_mac), - self.pg8.remote_ip4n, - is_static=1) + self.vapi.ip_neighbor_add_del( + self.pg7.sw_if_index, + self.pg7.remote_mac, + self.pg7.remote_ip4, + flags=(VppEnum.vl_api_ip_neighbor_flags_t. + IP_API_NEIGHBOR_FLAG_STATIC)) + self.vapi.ip_neighbor_add_del( + self.pg8.sw_if_index, + self.pg8.remote_mac, + self.pg8.remote_ip4, + flags=(VppEnum.vl_api_ip_neighbor_flags_t. + IP_API_NEIGHBOR_FLAG_STATIC)) self.vapi.ip_add_del_route(dst_address=self.pg7.remote_ip4n, dst_address_length=32, @@ -3052,14 +3062,18 @@ class TestNAT44(MethodHolder): self.udp_port_out = 30607 self.icmp_id_out = 30608 - self.vapi.ip_neighbor_add_del(self.pg7.sw_if_index, - mac_pton(self.pg7.remote_mac), - self.pg7.remote_ip4n, - is_static=1) - self.vapi.ip_neighbor_add_del(self.pg8.sw_if_index, - mac_pton(self.pg8.remote_mac), - self.pg8.remote_ip4n, - is_static=1) + self.vapi.ip_neighbor_add_del( + self.pg7.sw_if_index, + self.pg7.remote_mac, + self.pg7.remote_ip4, + flags=(VppEnum.vl_api_ip_neighbor_flags_t. + IP_API_NEIGHBOR_FLAG_STATIC)) + self.vapi.ip_neighbor_add_del( + self.pg8.sw_if_index, + self.pg8.remote_mac, + self.pg8.remote_ip4, + flags=(VppEnum.vl_api_ip_neighbor_flags_t. + IP_API_NEIGHBOR_FLAG_STATIC)) self.vapi.ip_add_del_route(dst_address=self.pg7.remote_ip4n, dst_address_length=32, |