Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tests: Refactor tearDown show command logging, add lifecycle markers.
[vpp.git]
/
test
/
test_ip6_vrf_multi_instance.py
diff --git
a/test/test_ip6_vrf_multi_instance.py
b/test/test_ip6_vrf_multi_instance.py
index
4547b38
..
c4b057b
100644
(file)
--- a/
test/test_ip6_vrf_multi_instance.py
+++ b/
test/test_ip6_vrf_multi_instance.py
@@
-160,6
+160,10
@@
class TestIP6VrfMultiInst(VppTestCase):
super(TestIP6VrfMultiInst, cls).tearDownClass()
raise
super(TestIP6VrfMultiInst, cls).tearDownClass()
raise
+ @classmethod
+ def tearDownClass(cls):
+ super(TestIP6VrfMultiInst, cls).tearDownClass()
+
def setUp(self):
"""
Clear trace and packet infos before running each test.
def setUp(self):
"""
Clear trace and packet infos before running each test.
@@
-172,9
+176,10
@@
class TestIP6VrfMultiInst(VppTestCase):
Show various debug prints after each test.
"""
super(TestIP6VrfMultiInst, self).tearDown()
Show various debug prints after each test.
"""
super(TestIP6VrfMultiInst, self).tearDown()
- if not self.vpp_dead:
- self.logger.info(self.vapi.ppcli("show ip6 fib"))
- self.logger.info(self.vapi.ppcli("show ip6 neighbors"))
+
+ def show_commands_at_teardown(self):
+ self.logger.info(self.vapi.ppcli("show ip6 fib"))
+ self.logger.info(self.vapi.ppcli("show ip6 neighbors"))
def create_vrf_and_assign_interfaces(self, count, start=1):
"""
def create_vrf_and_assign_interfaces(self, count, start=1):
"""
@@
-190,10
+195,7
@@
class TestIP6VrfMultiInst(VppTestCase):
pg_if = self.pg_if_by_vrf_id[vrf_id][0]
dest_addr = pg_if.local_ip6n
dest_addr_len = 64
pg_if = self.pg_if_by_vrf_id[vrf_id][0]
dest_addr = pg_if.local_ip6n
dest_addr_len = 64
- self.vapi.ip_table_add_del(vrf_id, is_add=1, is_ipv6=1)
- self.vapi.ip_add_del_route(
- dest_addr, dest_addr_len, pg_if.local_ip6n, is_ipv6=1,
- table_id=vrf_id, is_multipath=1)
+ self.vapi.ip_table_add_del(is_ipv6=1, is_add=1, table_id=vrf_id)
self.logger.info("IPv6 VRF ID %d created" % vrf_id)
if vrf_id not in self.vrf_list:
self.vrf_list.append(vrf_id)
self.logger.info("IPv6 VRF ID %d created" % vrf_id)
if vrf_id not in self.vrf_list:
self.vrf_list.append(vrf_id)
@@
-236,7
+238,7
@@
class TestIP6VrfMultiInst(VppTestCase):
self.logger.info("IPv6 VRF ID %d reset finished" % vrf_id)
self.logger.debug(self.vapi.ppcli("show ip6 fib"))
self.logger.debug(self.vapi.ppcli("show ip6 neighbors"))
self.logger.info("IPv6 VRF ID %d reset finished" % vrf_id)
self.logger.debug(self.vapi.ppcli("show ip6 fib"))
self.logger.debug(self.vapi.ppcli("show ip6 neighbors"))
- self.vapi.ip_table_add_del(
vrf_id, is_add=0, is_ipv6=1
)
+ self.vapi.ip_table_add_del(
is_ipv6=1, is_add=0, table_id=vrf_id
)
def create_stream(self, src_if, packet_sizes):
"""
def create_stream(self, src_if, packet_sizes):
"""
@@
-312,7
+314,7
@@
class TestIP6VrfMultiInst(VppTestCase):
try:
ip = packet[IPv6]
udp = packet[UDP]
try:
ip = packet[IPv6]
udp = packet[UDP]
- payload_info = self.payload_to_info(
str(packet[Raw])
)
+ payload_info = self.payload_to_info(
packet[Raw]
)
packet_index = payload_info.index
self.assertEqual(payload_info.dst, dst_sw_if_index)
self.logger.debug("Got packet on port %s: src=%u (id=%u)" %
packet_index = payload_info.index
self.assertEqual(payload_info.dst, dst_sw_if_index)
self.logger.debug("Got packet on port %s: src=%u (id=%u)" %