Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-1508: Python3 tests. Explicitly specify string formatting.
[vpp.git]
/
test
/
test_ip4.py
diff --git
a/test/test_ip4.py
b/test/test_ip4.py
index
e28a896
..
b6553db
100644
(file)
--- a/
test/test_ip4.py
+++ b/
test/test_ip4.py
@@
-395,7
+395,7
@@
class TestIPv4FibCrud(VppTestCase):
for ip in ips:
self.assertTrue(_ip_in_route_dump(ip, fib_dump),
for ip in ips:
self.assertTrue(_ip_in_route_dump(ip, fib_dump),
- 'IP {} is not in fib dump.'.format(ip))
+ 'IP {
!s
} is not in fib dump.'.format(ip))
def verify_not_in_route_dump(self, fib_dump, ips):
def verify_not_in_route_dump(self, fib_dump, ips):
@@
-406,7
+406,7
@@
class TestIPv4FibCrud(VppTestCase):
for ip in ips:
self.assertFalse(_ip_in_route_dump(ip, fib_dump),
for ip in ips:
self.assertFalse(_ip_in_route_dump(ip, fib_dump),
- 'IP {} is in fib dump.'.format(ip))
+ 'IP {
!s
} is in fib dump.'.format(ip))
@classmethod
def setUpClass(cls):
@classmethod
def setUpClass(cls):
@@
-804,9
+804,9
@@
class TestIPSubNets(VppTestCase):
#
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.10.10.10")
#
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.10.10.10")
- self.vapi.sw_interface_add_del_address(
self.pg0.sw_if_index,
-
ip_addr_n,
-
16)
+ self.vapi.sw_interface_add_del_address(
+
sw_if_index=self.pg0.sw_if_index, address=
ip_addr_n,
+
address_length=
16)
pn = (Ether(src=self.pg1.remote_mac,
dst=self.pg1.local_mac) /
pn = (Ether(src=self.pg1.remote_mac,
dst=self.pg1.local_mac) /
@@
-823,10
+823,9
@@
class TestIPSubNets(VppTestCase):
self.send_and_assert_no_replies(self.pg1, pb, "IP Broadcast address")
# remove the sub-net and we are forwarding via the cover again
self.send_and_assert_no_replies(self.pg1, pb, "IP Broadcast address")
# remove the sub-net and we are forwarding via the cover again
- self.vapi.sw_interface_add_del_address(self.pg0.sw_if_index,
- ip_addr_n,
- 16,
- is_add=0)
+ self.vapi.sw_interface_add_del_address(
+ sw_if_index=self.pg0.sw_if_index, address=ip_addr_n,
+ address_length=16, is_add=0)
self.pg1.add_stream(pn)
self.pg_enable_capture(self.pg_interfaces)
self.pg_start()
self.pg1.add_stream(pn)
self.pg_enable_capture(self.pg_interfaces)
self.pg_start()
@@
-842,9
+841,9
@@
class TestIPSubNets(VppTestCase):
#
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.10.10.10")
#
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.10.10.10")
- self.vapi.sw_interface_add_del_address(
self.pg0.sw_if_index,
-
ip_addr_n,
-
31)
+ self.vapi.sw_interface_add_del_address(
+
sw_if_index=self.pg0.sw_if_index, address=
ip_addr_n,
+
address_length=
31)
pn = (Ether(src=self.pg1.remote_mac,
dst=self.pg1.local_mac) /
pn = (Ether(src=self.pg1.remote_mac,
dst=self.pg1.local_mac) /
@@
-859,10
+858,9
@@
class TestIPSubNets(VppTestCase):
rx[ARP]
# remove the sub-net and we are forwarding via the cover again
rx[ARP]
# remove the sub-net and we are forwarding via the cover again
- self.vapi.sw_interface_add_del_address(self.pg0.sw_if_index,
- ip_addr_n,
- 31,
- is_add=0)
+ self.vapi.sw_interface_add_del_address(
+ sw_if_index=self.pg0.sw_if_index, address=ip_addr_n,
+ address_length=31, is_add=0)
self.pg1.add_stream(pn)
self.pg_enable_capture(self.pg_interfaces)
self.pg_start()
self.pg1.add_stream(pn)
self.pg_enable_capture(self.pg_interfaces)
self.pg_start()