fib: fib api updates

[vpp.git] / test / test_reassembly.py

diff --git a/test/test_reassembly.py b/test/test_reassembly.py
index 05877fa..6a356a0 100644 (file)
--- a/test/test_reassembly.py
+++ b/test/test_reassembly.py
@@ -17,7 +17,7 @@ from framework import VppTestCase, VppTestRunner
 from util import ppp, fragment_rfc791, fragment_rfc8200
 from vpp_gre_interface import VppGreInterface
 from vpp_ip import DpoProto
-from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip_route import VppIpRoute, VppRoutePath, FibPathProto
 
 # 35 is enough to have >257 400-byte fragments
 test_packet_count = 35
@@ -311,7 +311,7 @@ class TestIPv4Reassembly(TestIPReassemblyMixin, VppTestCase):
         error_cnt_str = \
             "/err/ip4-reassembly-feature/fragment chain too long (drop)"
 
-        error_cnt = self.get_packet_counter(error_cnt_str)
+        error_cnt = self.statistics.get_err_counter(error_cnt_str)
 
         self.vapi.ip_reassembly_set(timeout_ms=100, max_reassemblies=1000,
                                     max_reassembly_length=3,
@@ -334,7 +334,7 @@ class TestIPv4Reassembly(TestIPReassemblyMixin, VppTestCase):
         self.pg_start()
 
         self.dst_if.get_capture(1)
-        self.assert_packet_counter_equal(error_cnt_str, error_cnt + 1)
+        self.assert_error_counter_equal(error_cnt_str, error_cnt + 1)
 
     def test_5737(self):
         """ fragment length + ip header size > 65535 """
@@ -691,7 +691,7 @@ class TestIPv6Reassembly(TestIPReassemblyMixin, VppTestCase):
         error_cnt_str = \
             "/err/ip6-reassembly-feature/fragment chain too long (drop)"
 
-        error_cnt = self.get_packet_counter(error_cnt_str)
+        error_cnt = self.statistics.get_err_counter(error_cnt_str)
 
         self.vapi.ip_reassembly_set(timeout_ms=100, max_reassemblies=1000,
                                     max_reassembly_length=3,
@@ -709,7 +709,7 @@ class TestIPv6Reassembly(TestIPReassemblyMixin, VppTestCase):
         self.pg_start()
 
         self.dst_if.get_capture(1)
-        self.assert_packet_counter_equal(error_cnt_str, error_cnt + 1)
+        self.assert_error_counter_equal(error_cnt_str, error_cnt + 1)
 
     def test_overlap1(self):
         """ overlapping fragments case #1 (differs from IP test case)"""
@@ -1203,10 +1203,9 @@ class TestFIFReassembly(VppTestCase):
             sw_if_index=self.gre6.sw_if_index, enable_ip6=True)
 
         self.route6 = VppIpRoute(self, self.tun_ip6, 128,
-                                 [VppRoutePath(self.src_if.remote_ip6,
-                                               self.src_if.sw_if_index,
-                                               proto=DpoProto.DPO_PROTO_IP6)],
-                                 is_ip6=1)
+                                 [VppRoutePath(
+                                     self.src_if.remote_ip6,
+                                     self.src_if.sw_if_index)])
         self.route6.add_vpp_config()
 
         self.reset_packet_infos()