X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_lb.py;h=93b389a1444af8e8344f76ef08a828081ea280ec;hb=90cf21b5d8fd2d3e531e841dcd752311df5f8a50;hp=1652cc5d4d488e1cd89e6e79d394eb2c48a1d453;hpb=a5b2eec0535f9025319a752891d77ff9948ae0df;p=vpp.git

diff --git a/test/test_lb.py b/test/test_lb.py
index 1652cc5d4d4..93b389a1444 100644
--- a/test/test_lb.py
+++ b/test/test_lb.py
@@ -57,16 +57,21 @@ class TestLB(VppTestCase):
             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.cli("lb conf ip4-src-address 39.40.41.42")
-            cls.vapi.cli("lb conf ip6-src-address 2004::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),
@@ -186,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(