Tests: Refactor tearDown show command logging, add lifecycle markers.

[vpp.git] / test / test_lb.py

diff --git a/test/test_lb.py b/test/test_lb.py
index fa17950..93b389a 100644 (file)
--- a/test/test_lb.py
+++ b/test/test_lb.py
@@ -52,18 +52,26 @@ class TestLB(VppTestCase):
                 i.resolve_ndp()
             dst4 = socket.inet_pton(socket.AF_INET, "10.0.0.0")
             dst6 = socket.inet_pton(socket.AF_INET6, "2002::")
-            cls.vapi.ip_add_del_route(dst4, 24, cls.pg1.remote_ip4n)
-            cls.vapi.ip_add_del_route(dst6, 16, cls.pg1.remote_ip6n, is_ipv6=1)
-            cls.vapi.cli("lb conf ip4-src-address 39.40.41.42")
-            cls.vapi.cli("lb conf ip6-src-address 2004::1")
+            cls.vapi.ip_add_del_route(dst_address=dst4, dst_address_length=24,
+                                      next_hop_address=cls.pg1.remote_ip4n)
+            cls.vapi.ip_add_del_route(dst_address=dst6, dst_address_length=16,
+                                      next_hop_address=cls.pg1.remote_ip6n,
+                                      is_ipv6=1)
+            cls.vapi.lb_conf(ip4_src_address="39.40.41.42",
+                             ip6_src_address="2004::1")
         except Exception:
             super(TestLB, cls).tearDownClass()
             raise
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestLB, cls).tearDownClass()
+
     def tearDown(self):
         super(TestLB, self).tearDown()
-        if not self.vpp_dead:
-            self.logger.info(self.vapi.cli("show lb vip verbose"))
+
+    def show_commands_at_teardown(self):
+        self.logger.info(self.vapi.cli("show lb vip verbose"))
 
     def getIPv4Flow(self, id):
         return (IP(dst="90.0.%u.%u" % (id / 255, id % 255),
@@ -183,8 +191,8 @@ class TestLB(VppTestCase):
                 self.logger.error(ppp("Unexpected or invalid packet:", p))
                 raise
 
-        # This is just to 1roughly check that the balancing algorithm
-        # is not completly biased.
+        # This is just to roughly check that the balancing algorithm
+        # is not completely biased.
         for asid in self.ass:
             if load[asid] < len(self.packets) / (len(self.ass) * 2):
                 self.logger.error(