Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
crypto: fix coverity warnings
[vpp.git]
/
test
/
test_ip_ecmp.py
diff --git
a/test/test_ip_ecmp.py
b/test/test_ip_ecmp.py
index
17b0a6c
..
e3ceb59
100644
(file)
--- a/
test/test_ip_ecmp.py
+++ b/
test/test_ip_ecmp.py
@@
-5,7
+5,6
@@
import random
import socket
from ipaddress import IPv4Address, IPv6Address, AddressValueError
import socket
from ipaddress import IPv4Address, IPv6Address, AddressValueError
-
from framework import VppTestCase, VppTestRunner
from util import ppp
from framework import VppTestCase, VppTestRunner
from util import ppp
@@
-73,9
+72,10
@@
class TestECMP(VppTestCase):
Show various debug prints after each test.
"""
super(TestECMP, self).tearDown()
Show various debug prints after each test.
"""
super(TestECMP, self).tearDown()
- if not self.vpp_dead:
- self.logger.info(self.vapi.ppcli("show ip arp"))
- self.logger.info(self.vapi.ppcli("show ip6 neighbors"))
+
+ def show_commands_at_teardown(self):
+ self.logger.info(self.vapi.ppcli("show ip arp"))
+ self.logger.info(self.vapi.ppcli("show ip6 neighbors"))
def get_ip_address(self, ip_addr_start, ip_prefix_len):
"""
def get_ip_address(self, ip_addr_start, ip_prefix_len):
"""
@@
-138,7
+138,7
@@
class TestECMP(VppTestCase):
for packet in capture:
try:
ip_received = packet[ip_l]
for packet in capture:
try:
ip_received = packet[ip_l]
- payload_info = self.payload_to_info(
str(packet[Raw])
)
+ payload_info = self.payload_to_info(
packet[Raw]
)
packet_index = payload_info.index
ip_sent = self._packet_infos[packet_index].data[ip_l]
self.logger.debug("Got packet on port %s: src=%u (id=%u)" %
packet_index = payload_info.index
ip_sent = self._packet_infos[packet_index].data[ip_l]
self.logger.debug("Got packet on port %s: src=%u (id=%u)" %
@@
-187,7
+187,9
@@
class TestECMP(VppTestCase):
next_hop_address = socket.inet_pton(af, nh_host_ip)
next_hop_sw_if_index = pg_if.sw_if_index
self.vapi.ip_add_del_route(
next_hop_address = socket.inet_pton(af, nh_host_ip)
next_hop_sw_if_index = pg_if.sw_if_index
self.vapi.ip_add_del_route(
- dst_ip, dst_prefix_len, next_hop_address,
+ dst_address=dst_ip,
+ dst_address_length=dst_prefix_len,
+ next_hop_address=next_hop_address,
next_hop_sw_if_index=next_hop_sw_if_index,
is_ipv6=is_ipv6, is_multipath=1)
self.logger.info("Route via %s on %s created" %
next_hop_sw_if_index=next_hop_sw_if_index,
is_ipv6=is_ipv6, is_multipath=1)
self.logger.info("Route via %s on %s created" %