X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_lb.py;h=4603bd10db8dcec48b53aea9fe4f2aba6f741c49;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=4c0bfadaccb915842f989404cbe449b09e65d387;hpb=7f9b7f9f492d1748d8ba025b3a713058fdb1943d;p=vpp.git

diff --git a/test/test_lb.py b/test/test_lb.py
index 4c0bfadaccb..4603bd10db8 100644
--- a/test/test_lb.py
+++ b/test/test_lb.py
@@ -9,6 +9,8 @@ from scapy.data import IP_PROTOS
 
 from framework import VppTestCase
 from util import ppp
+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip import INVALID_INDEX
 
 """ TestLB is a subclass of  VPPTestCase classes.
 
@@ -50,13 +52,17 @@ class TestLB(VppTestCase):
                 i.disable_ipv6_ra()
                 i.resolve_arp()
                 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(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)
+
+            dst4 = VppIpRoute(cls, "10.0.0.0", 24,
+                              [VppRoutePath(cls.pg1.remote_ip4,
+                                            INVALID_INDEX)],
+                              register=False)
+            dst4.add_vpp_config()
+            dst6 = VppIpRoute(cls, "2002::", 16,
+                              [VppRoutePath(cls.pg1.remote_ip6,
+                                            INVALID_INDEX)],
+                              register=False)
+            dst6.add_vpp_config()
             cls.vapi.lb_conf(ip4_src_address="39.40.41.42",
                              ip6_src_address="2004::1")
         except Exception:
@@ -69,8 +75,9 @@ class TestLB(VppTestCase):
 
     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),