X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_dvr.py;h=d5ffd3b157767c1d2fab6c3df2bf4c3f692086e8;hb=6f533d780ded2d0d2a4ba2224e4a9f7d181c7577;hp=ae7864cc3e68a7e12314aeca1015531172ca3244;hpb=4271c971919bb8defa3ca54f4a362676cd57bfb2;p=vpp.git

diff --git a/test/test_dvr.py b/test/test_dvr.py
index ae7864cc3e6..d5ffd3b1577 100644
--- a/test/test_dvr.py
+++ b/test/test_dvr.py
@@ -1,8 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import unittest
 
 from framework import VppTestCase, VppTestRunner
-from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip_route import VppIpRoute, VppRoutePath, FibPathType
 from vpp_l2 import L2_PORT_TYPE
 from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint
 
@@ -75,13 +75,13 @@ class TestDVR(VppTestCase):
                       IP(src=any_src_addr,
                          dst=ip_non_tag_bridged) /
                       UDP(sport=1234, dport=1234) /
-                      Raw('\xa5' * 100))
+                      Raw(b'\xa5' * 100))
         pkt_tag = (Ether(src=self.pg0.remote_mac,
                          dst=self.loop0.local_mac) /
                    IP(src=any_src_addr,
                       dst=ip_tag_bridged) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100))
+                   Raw(b'\xa5' * 100))
 
         #
         # Two sub-interfaces so we can test VLAN tag push/pop
@@ -120,7 +120,7 @@ class TestDVR(VppTestCase):
             self, ip_non_tag_bridged, 32,
             [VppRoutePath("0.0.0.0",
                           self.pg1.sw_if_index,
-                          is_dvr=1)])
+                          type=FibPathType.FIB_PATH_TYPE_DVR)])
         route_no_tag.add_vpp_config()
 
         #
@@ -138,7 +138,7 @@ class TestDVR(VppTestCase):
             self, ip_tag_bridged, 32,
             [VppRoutePath("0.0.0.0",
                           sub_if_on_pg3.sw_if_index,
-                          is_dvr=1)])
+                          type=FibPathType.FIB_PATH_TYPE_DVR)])
         route_with_tag.add_vpp_config()
 
         #
@@ -158,7 +158,7 @@ class TestDVR(VppTestCase):
                           IP(src=any_src_addr,
                              dst=ip_tag_bridged) /
                           UDP(sport=1234, dport=1234) /
-                          Raw('\xa5' * 100))
+                          Raw(b'\xa5' * 100))
 
         rx = self.send_and_expect(self.pg2,
                                   pkt_tag_to_tag * NUM_PKTS,
@@ -175,7 +175,7 @@ class TestDVR(VppTestCase):
                               IP(src=any_src_addr,
                                  dst=ip_non_tag_bridged) /
                               UDP(sport=1234, dport=1234) /
-                              Raw('\xa5' * 100))
+                              Raw(b'\xa5' * 100))
 
         rx = self.send_and_expect(self.pg2,
                                   pkt_tag_to_non_tag * NUM_PKTS,
@@ -235,17 +235,19 @@ class TestDVR(VppTestCase):
         #
         # Do a FIB dump to make sure the paths are correctly reported as DVR
         #
-        routes = self.vapi.ip_fib_dump()
+        routes = self.vapi.ip_route_dump(0)
 
         for r in routes:
-            if (inet_pton(AF_INET, ip_tag_bridged) == r.address):
-                self.assertEqual(r.path[0].sw_if_index,
+            if (ip_tag_bridged == str(r.route.prefix.network_address)):
+                self.assertEqual(r.route.paths[0].sw_if_index,
                                  sub_if_on_pg3.sw_if_index)
-                self.assertEqual(r.path[0].is_dvr, 1)
-            if (inet_pton(AF_INET, ip_non_tag_bridged) == r.address):
-                self.assertEqual(r.path[0].sw_if_index,
+                self.assertEqual(r.route.paths[0].type,
+                                 FibPathType.FIB_PATH_TYPE_DVR)
+            if (ip_non_tag_bridged == str(r.route.prefix.network_address)):
+                self.assertEqual(r.route.paths[0].sw_if_index,
                                  self.pg1.sw_if_index)
-                self.assertEqual(r.path[0].is_dvr, 1)
+                self.assertEqual(r.route.paths[0].type,
+                                 FibPathType.FIB_PATH_TYPE_DVR)
 
         #
         # the explicit route delete is require so it happens before
@@ -268,33 +270,33 @@ class TestDVR(VppTestCase):
                       IP(src="2.2.2.2",
                          dst="1.1.1.1") /
                       UDP(sport=1234, dport=1234) /
-                      Raw('\xa5' * 100))
+                      Raw(b'\xa5' * 100))
         pkt_to_tag = (Ether(src=self.pg0.remote_mac,
                             dst=self.pg2.remote_mac) /
                       IP(src="2.2.2.2",
                          dst="1.1.1.2") /
                       UDP(sport=1234, dport=1234) /
-                      Raw('\xa5' * 100))
+                      Raw(b'\xa5' * 100))
         pkt_from_tag = (Ether(src=self.pg3.remote_mac,
                               dst=self.pg2.remote_mac) /
                         Dot1Q(vlan=93) /
                         IP(src="2.2.2.2",
                            dst="1.1.1.1") /
                         UDP(sport=1234, dport=1234) /
-                        Raw('\xa5' * 100))
+                        Raw(b'\xa5' * 100))
         pkt_from_to_tag = (Ether(src=self.pg3.remote_mac,
                                  dst=self.pg2.remote_mac) /
                            Dot1Q(vlan=93) /
                            IP(src="2.2.2.2",
                               dst="1.1.1.2") /
                            UDP(sport=1234, dport=1234) /
-                           Raw('\xa5' * 100))
+                           Raw(b'\xa5' * 100))
         pkt_bcast = (Ether(src=self.pg0.remote_mac,
                            dst="ff:ff:ff:ff:ff:ff") /
                      IP(src="2.2.2.2",
                         dst="255.255.255.255") /
                      UDP(sport=1234, dport=1234) /
-                     Raw('\xa5' * 100))
+                     Raw(b'\xa5' * 100))
 
         #
         # A couple of sub-interfaces for tags
@@ -332,14 +334,16 @@ class TestDVR(VppTestCase):
         #
         # Add a DVR route to steer traffic at L3
         #
-        route_1 = VppIpRoute(self, "1.1.1.1", 32,
-                             [VppRoutePath("0.0.0.0",
-                                           self.pg1.sw_if_index,
-                                           is_dvr=1)])
-        route_2 = VppIpRoute(self, "1.1.1.2", 32,
-                             [VppRoutePath("0.0.0.0",
-                                           sub_if_on_pg2.sw_if_index,
-                                           is_dvr=1)])
+        route_1 = VppIpRoute(
+            self, "1.1.1.1", 32,
+            [VppRoutePath("0.0.0.0",
+                          self.pg1.sw_if_index,
+                          type=FibPathType.FIB_PATH_TYPE_DVR)])
+        route_2 = VppIpRoute(
+            self, "1.1.1.2", 32,
+            [VppRoutePath("0.0.0.0",
+                          sub_if_on_pg2.sw_if_index,
+                          type=FibPathType.FIB_PATH_TYPE_DVR)])
         route_1.add_vpp_config()
         route_2.add_vpp_config()