summaryrefslogtreecommitdiffstats
path: root/test/test_ip4.py
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-03-11 19:23:25 +0100
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2019-03-11 21:57:19 +0000
commita5b2eec0535f9025319a752891d77ff9948ae0df (patch)
tree08c801cb85ab9639e00e5f565e613b817b3924e4 /test/test_ip4.py
parent2d9b427a5b20dcec3d2212a3a8a47c29b4acdd46 (diff)
vpp_papi_provider: Remove more wrapper functions.
Split this work up into pieces. Please don't add new wrappers to vpp_papi_provider.py. Change-Id: I0f8f2afc4cd2bba07ea70ddecea2d7319f7b2e10 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test/test_ip4.py')
-rw-r--r--test/test_ip4.py20
1 files changed, 12 insertions, 8 deletions
diff --git a/test/test_ip4.py b/test/test_ip4.py
index ab733ac1bb6..6f764373075 100644
--- a/test/test_ip4.py
+++ b/test/test_ip4.py
@@ -96,8 +96,9 @@ class TestIPv4(VppTestCase):
for i in self.interfaces:
next_hop_address = i.local_ip4n
for j in range(count / n_int):
- self.vapi.ip_add_del_route(
- dest_addr, dest_addr_len, next_hop_address)
+ self.vapi.ip_add_del_route(dst_address=dest_addr,
+ dst_address_length=dest_addr_len,
+ next_hop_address=next_hop_address)
counter += 1
if counter / count * 100 > percent:
self.logger.info("Configure %d FIB entries .. %d%% done" %
@@ -312,8 +313,9 @@ class TestIPv4FibCrud(VppTestCase):
n_next_hop_addr = socket.inet_pton(socket.AF_INET, next_hop_addr)
for _ in range(count):
n_dest_addr = binascii.unhexlify('{:08x}'.format(dest_addr))
- self.vapi.ip_add_del_route(n_dest_addr, dest_addr_len,
- n_next_hop_addr)
+ self.vapi.ip_add_del_route(dst_address=n_dest_addr,
+ dst_address_length=dest_addr_len,
+ next_hop_address=n_next_hop_addr)
added_ips.append(socket.inet_ntoa(n_dest_addr))
dest_addr += 1
return added_ips
@@ -327,8 +329,10 @@ class TestIPv4FibCrud(VppTestCase):
n_next_hop_addr = socket.inet_pton(socket.AF_INET, next_hop_addr)
for _ in range(count):
n_dest_addr = binascii.unhexlify('{:08x}'.format(dest_addr))
- self.vapi.ip_add_del_route(n_dest_addr, dest_addr_len,
- n_next_hop_addr, is_add=0)
+ self.vapi.ip_add_del_route(dst_address=n_dest_addr,
+ dst_address_length=dest_addr_len,
+ next_hop_address=n_next_hop_addr,
+ is_add=0)
removed_ips.append(socket.inet_ntoa(n_dest_addr))
dest_addr += 1
return removed_ips
@@ -976,7 +980,7 @@ class TestIPLoadBalance(VppTestCase):
# - now only the stream with differing source address will
# load-balance
#
- self.vapi.set_ip_flow_hash(0, src=1, dst=1, sport=0, dport=0)
+ self.vapi.set_ip_flow_hash(vrf_id=0, src=1, dst=1, sport=0, dport=0)
self.send_and_expect_load_balancing(self.pg0, src_ip_pkts,
[self.pg1, self.pg2])
@@ -988,7 +992,7 @@ class TestIPLoadBalance(VppTestCase):
#
# change the flow hash config back to defaults
#
- self.vapi.set_ip_flow_hash(0, src=1, dst=1, sport=1, dport=1)
+ self.vapi.set_ip_flow_hash(vrf_id=0, src=1, dst=1, sport=1, dport=1)
#
# Recursive prefixes