fib: Table Replace
[vpp.git] / test / test_ip6.py
index 4f267b8..c6cced9 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import unittest
@@ -23,11 +23,12 @@ from util import ppp, ip6_normalize, mk_ll_addr
 from vpp_ip import DpoProto
 from vpp_ip_route import VppIpRoute, VppRoutePath, find_route, VppIpMRoute, \
     VppMRoutePath, MRouteItfFlags, MRouteEntryFlags, VppMplsIpBind, \
-    VppMplsRoute, VppMplsTable, VppIpTable
+    VppMplsRoute, VppMplsTable, VppIpTable, FibPathType, FibPathProto, \
+    VppIpInterfaceAddress, find_route_in_dump, find_mroute_in_dump
 from vpp_neighbor import find_nbr, VppNeighbor
 from vpp_pg_interface import is_ipv6_misc
 from vpp_sub_interface import VppSubInterface, VppDot1QSubint
-from ipaddress import IPv6Network, IPv4Network
+from ipaddress import IPv6Network, IPv6Address
 
 AF_INET6 = socket.AF_INET6
 
@@ -217,9 +218,6 @@ class TestIPv6(TestIPv6ND):
             i.config_ip6()
             i.resolve_ndp()
 
-        # config 2M FIB entries
-        self.config_fib_entries(200)
-
     def tearDown(self):
         """Run standard test teardown and log ``show ip6 neighbors``."""
         for i in self.interfaces:
@@ -234,34 +232,6 @@ class TestIPv6(TestIPv6ND):
             self.logger.info(self.vapi.cli("show ip6 neighbors"))
             # info(self.vapi.cli("show ip6 fib"))  # many entries
 
-    def config_fib_entries(self, count):
-        """For each interface add to the FIB table *count* routes to
-        "fd02::1/128" destination with interface's local address as next-hop
-        address.
-
-        :param int count: Number of FIB entries.
-
-        - *TODO:* check if the next-hop address shouldn't be remote address
-          instead of local address.
-        """
-        n_int = len(self.interfaces)
-        percent = 0
-        counter = 0.0
-        dest_addr = inet_pton(AF_INET6, "fd02::1")
-        dest_addr_len = 128
-        for i in self.interfaces:
-            next_hop_address = i.local_ip6n
-            for j in range(count / n_int):
-                self.vapi.ip_add_del_route(dst_address=dest_addr,
-                                           dst_address_length=dest_addr_len,
-                                           next_hop_address=next_hop_address,
-                                           is_ipv6=1)
-                counter += 1
-                if counter / count * 100 > percent:
-                    self.logger.info("Configure %d FIB entries .. %d%% done" %
-                                     (count, percent))
-                    percent += 1
-
     def modify_packet(self, src_if, packet_size, pkt):
         """Add load, set destination IP and extend packet to required packet
         size for defined interface.
@@ -270,7 +240,7 @@ class TestIPv6(TestIPv6ND):
         :param int packet_size: Required packet size.
         :param Scapy pkt: Packet to be modified.
         """
-        dst_if_idx = packet_size / 10 % 2
+        dst_if_idx = int(packet_size / 10 % 2)
         dst_if = self.flows[src_if][dst_if_idx]
         info = self.create_packet_info(src_if, dst_if)
         payload = self.info_to_payload(info)
@@ -483,8 +453,7 @@ class TestIPv6(TestIPv6ND):
                                  self.pg0._remote_hosts[2].ip6))
         self.assertFalse(find_route(self,
                                     self.pg0._remote_hosts[2].ip6,
-                                    128,
-                                    inet=AF_INET6))
+                                    128))
 
         #
         # send an NS from a link local address to the interface's global
@@ -511,8 +480,7 @@ class TestIPv6(TestIPv6ND):
                                  self.pg0._remote_hosts[2].ip6_ll))
         self.assertFalse(find_route(self,
                                     self.pg0._remote_hosts[2].ip6_ll,
-                                    128,
-                                    inet=AF_INET6))
+                                    128))
 
         #
         # An NS to the router's own Link-local
@@ -538,8 +506,7 @@ class TestIPv6(TestIPv6ND):
                                  self.pg0._remote_hosts[3].ip6_ll))
         self.assertFalse(find_route(self,
                                     self.pg0._remote_hosts[3].ip6_ll,
-                                    128,
-                                    inet=AF_INET6))
+                                    128))
 
     def test_ns_duplicates(self):
         """ ND Duplicates"""
@@ -649,7 +616,7 @@ class TestIPv6(TestIPv6ND):
             # the options are nested in the scapy packet in way that i cannot
             # decipher how to decode. this 1st layer of option always returns
             # nested classes, so a direct obj1=obj2 comparison always fails.
-            # however, the getlayer(.., 2) does give one instnace.
+            # however, the getlayer(.., 2) does give one instance.
             # so we cheat here and construct a new opt instance for comparison
             rd = ICMPv6NDOptPrefixInfo(
                 prefixlen=raos.prefixlen,
@@ -662,7 +629,9 @@ class TestIPv6(TestIPv6ND):
                     rd = rx.getlayer(
                         ICMPv6NDOptPrefixInfo, ii + 2)
             else:
-                self.assertEqual(pi_opt, raos)
+                self.assertEqual(pi_opt, raos, 'Expected: %s, received: %s'
+                                 % (pi_opt.show(dump=True),
+                                    raos.show(dump=True)))
 
     def send_and_expect_ra(self, intf, pkts, remark, dst_ip=None,
                            filter_out_fn=is_ipv6_misc,
@@ -777,8 +746,8 @@ class TestIPv6(TestIPv6ND):
         #
         # Configure The RA to announce the links prefix
         #
-        self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
-                               self.pg0.local_ip6_prefix_len)
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg0.local_ip6,
+                               self.pg0.local_ip6_prefix_len))
 
         #
         # RAs should now contain the prefix information option
@@ -803,8 +772,8 @@ class TestIPv6(TestIPv6ND):
         # Change the prefix info to not off-link
         #  L-flag is clear
         #
-        self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
-                               self.pg0.local_ip6_prefix_len,
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg0.local_ip6,
+                               self.pg0.local_ip6_prefix_len),
                                off_link=1)
 
         opt = ICMPv6NDOptPrefixInfo(
@@ -823,8 +792,8 @@ class TestIPv6(TestIPv6ND):
         # Change the prefix info to not off-link, no-autoconfig
         #  L and A flag are clear in the advert
         #
-        self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
-                               self.pg0.local_ip6_prefix_len,
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg0.local_ip6,
+                               self.pg0.local_ip6_prefix_len),
                                off_link=1,
                                no_autoconfig=1)
 
@@ -844,8 +813,8 @@ class TestIPv6(TestIPv6ND):
         # Change the flag settings back to the defaults
         #  L and A flag are set in the advert
         #
-        self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
-                               self.pg0.local_ip6_prefix_len)
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg0.local_ip6,
+                               self.pg0.local_ip6_prefix_len))
 
         opt = ICMPv6NDOptPrefixInfo(
             prefixlen=self.pg0.local_ip6_prefix_len,
@@ -863,8 +832,8 @@ class TestIPv6(TestIPv6ND):
         # Change the prefix info to not off-link, no-autoconfig
         #  L and A flag are clear in the advert
         #
-        self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
-                               self.pg0.local_ip6_prefix_len,
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg0.local_ip6,
+                               self.pg0.local_ip6_prefix_len),
                                off_link=1,
                                no_autoconfig=1)
 
@@ -884,8 +853,8 @@ class TestIPv6(TestIPv6ND):
         # Use the reset to defaults option to revert to defaults
         #  L and A flag are clear in the advert
         #
-        self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
-                               self.pg0.local_ip6_prefix_len,
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg0.local_ip6,
+                               self.pg0.local_ip6_prefix_len),
                                use_default=1)
 
         opt = ICMPv6NDOptPrefixInfo(
@@ -903,8 +872,8 @@ class TestIPv6(TestIPv6ND):
         #
         # Advertise Another prefix. With no L-flag/A-flag
         #
-        self.pg0.ip6_ra_prefix(self.pg1.local_ip6,
-                               self.pg1.local_ip6_prefix_len,
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg1.local_ip6,
+                               self.pg1.local_ip6_prefix_len),
                                off_link=1,
                                no_autoconfig=1)
 
@@ -933,8 +902,8 @@ class TestIPv6(TestIPv6ND):
         # Remove the first prefix-info - expect the second is still in the
         # advert
         #
-        self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
-                               self.pg0.local_ip6_prefix_len,
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg0.local_ip6,
+                               self.pg0.local_ip6_prefix_len),
                                is_no=1)
 
         opt = ICMPv6NDOptPrefixInfo(
@@ -952,8 +921,8 @@ class TestIPv6(TestIPv6ND):
         #
         # Remove the second prefix-info - expect no prefix-info in the adverts
         #
-        self.pg0.ip6_ra_prefix(self.pg1.local_ip6,
-                               self.pg1.local_ip6_prefix_len,
+        self.pg0.ip6_ra_prefix('%s/%s' % (self.pg1.local_ip6,
+                               self.pg1.local_ip6_prefix_len),
                                is_no=1)
 
         self.pg0.ip6_ra_config(send_unicast=1)
@@ -967,6 +936,79 @@ class TestIPv6(TestIPv6ND):
         self.pg0.ip6_ra_config(no=1, suppress=1, send_unicast=0)
 
 
+class TestIPv6IfAddrRoute(VppTestCase):
+    """ IPv6 Interface Addr Route Test Case """
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPv6IfAddrRoute, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPv6IfAddrRoute, cls).tearDownClass()
+
+    def setUp(self):
+        super(TestIPv6IfAddrRoute, self).setUp()
+
+        # create 1 pg interface
+        self.create_pg_interfaces(range(1))
+
+        for i in self.pg_interfaces:
+            i.admin_up()
+            i.config_ip6()
+            i.resolve_ndp()
+
+    def tearDown(self):
+        super(TestIPv6IfAddrRoute, self).tearDown()
+        for i in self.pg_interfaces:
+            i.unconfig_ip6()
+            i.admin_down()
+
+    def test_ipv6_ifaddrs_same_prefix(self):
+        """ IPv6 Interface Addresses Same Prefix test
+
+        Test scenario:
+
+            - Verify no route in FIB for prefix 2001:10::/64
+            - Configure IPv4 address 2001:10::10/64  on an interface
+            - Verify route in FIB for prefix 2001:10::/64
+            - Configure IPv4 address 2001:10::20/64 on an interface
+            - Delete 2001:10::10/64 from interface
+            - Verify route in FIB for prefix 2001:10::/64
+            - Delete 2001:10::20/64 from interface
+            - Verify no route in FIB for prefix 2001:10::/64
+        """
+
+        addr1 = "2001:10::10"
+        addr2 = "2001:10::20"
+
+        if_addr1 = VppIpInterfaceAddress(self, self.pg0, addr1, 64)
+        if_addr2 = VppIpInterfaceAddress(self, self.pg0, addr2, 64)
+        self.assertFalse(if_addr1.query_vpp_config())
+        self.assertFalse(find_route(self, addr1, 128))
+        self.assertFalse(find_route(self, addr2, 128))
+
+        # configure first address, verify route present
+        if_addr1.add_vpp_config()
+        self.assertTrue(if_addr1.query_vpp_config())
+        self.assertTrue(find_route(self, addr1, 128))
+        self.assertFalse(find_route(self, addr2, 128))
+
+        # configure second address, delete first, verify route not removed
+        if_addr2.add_vpp_config()
+        if_addr1.remove_vpp_config()
+        self.assertFalse(if_addr1.query_vpp_config())
+        self.assertTrue(if_addr2.query_vpp_config())
+        self.assertFalse(find_route(self, addr1, 128))
+        self.assertTrue(find_route(self, addr2, 128))
+
+        # delete second address, verify route removed
+        if_addr2.remove_vpp_config()
+        self.assertFalse(if_addr1.query_vpp_config())
+        self.assertFalse(find_route(self, addr1, 128))
+        self.assertFalse(find_route(self, addr2, 128))
+
+
 class TestICMPv6Echo(VppTestCase):
     """ ICMPv6 Echo Test Case """
 
@@ -1204,33 +1246,33 @@ class TestIPv6RDControlPlane(TestIPv6ND):
     def get_default_routes(fib):
         list = []
         for entry in fib:
-            if entry.address_length == 0:
-                for path in entry.path:
+            if entry.route.prefix.prefixlen == 0:
+                for path in entry.route.paths:
                     if path.sw_if_index != 0xFFFFFFFF:
-                        default_route = {}
-                        default_route['sw_if_index'] = path.sw_if_index
-                        default_route['next_hop'] = path.next_hop
-                        list.append(default_route)
+                        defaut_route = {}
+                        defaut_route['sw_if_index'] = path.sw_if_index
+                        defaut_route['next_hop'] = path.nh.address.ip6
+                        list.append(defaut_route)
         return list
 
     @staticmethod
     def get_interface_addresses(fib, pg):
         list = []
         for entry in fib:
-            if entry.address_length == 128:
-                path = entry.path[0]
+            if entry.route.prefix.prefixlen == 128:
+                path = entry.route.paths[0]
                 if path.sw_if_index == pg.sw_if_index:
-                    list.append(entry.address)
+                    list.append(str(entry.route.prefix.network_address))
         return list
 
     def test_all(self):
         """ Test handling of SLAAC addresses and default routes """
 
-        fib = self.vapi.ip6_fib_dump()
+        fib = self.vapi.ip_route_dump(0, True)
         default_routes = self.get_default_routes(fib)
         initial_addresses = set(self.get_interface_addresses(fib, self.pg0))
         self.assertEqual(default_routes, [])
-        router_address = self.pg0.remote_ip6n_ll
+        router_address = IPv6Address(text_type(self.pg0.remote_ip6_ll))
 
         self.vapi.ip6_nd_address_autoconfig(self.pg0.sw_if_index, 1, 1)
 
@@ -1256,16 +1298,17 @@ class TestIPv6RDControlPlane(TestIPv6ND):
         self.pg0.add_stream([packet])
         self.pg_start()
 
-        self.sleep(0.1)
+        self.sleep_on_vpp_time(0.1)
 
-        fib = self.vapi.ip6_fib_dump()
+        fib = self.vapi.ip_route_dump(0, True)
 
         # check FIB for new address
         addresses = set(self.get_interface_addresses(fib, self.pg0))
         new_addresses = addresses.difference(initial_addresses)
         self.assertEqual(len(new_addresses), 1)
-        prefix = list(new_addresses)[0][:8] + '\0\0\0\0\0\0\0\0'
-        self.assertEqual(inet_ntop(AF_INET6, prefix), '1::')
+        prefix = IPv6Network(text_type("%s/%d" % (list(new_addresses)[0], 20)),
+                             strict=False)
+        self.assertEqual(prefix, IPv6Network(text_type('1::/20')))
 
         # check FIB for new default route
         default_routes = self.get_default_routes(fib)
@@ -1279,24 +1322,24 @@ class TestIPv6RDControlPlane(TestIPv6ND):
         self.pg0.add_stream([packet])
         self.pg_start()
 
-        self.sleep(0.1)
+        self.sleep_on_vpp_time(0.1)
 
         # check that default route is deleted
-        fib = self.vapi.ip6_fib_dump()
+        fib = self.vapi.ip_route_dump(0, True)
         default_routes = self.get_default_routes(fib)
         self.assertEqual(len(default_routes), 0)
 
-        self.sleep(0.1)
+        self.sleep_on_vpp_time(0.1)
 
         # send RA
         packet = self.create_ra_packet(self.pg0)
         self.pg0.add_stream([packet])
         self.pg_start()
 
-        self.sleep(0.1)
+        self.sleep_on_vpp_time(0.1)
 
         # check FIB for new default route
-        fib = self.vapi.ip6_fib_dump()
+        fib = self.vapi.ip_route_dump(0, True)
         default_routes = self.get_default_routes(fib)
         self.assertEqual(len(default_routes), 1)
         dr = default_routes[0]
@@ -1308,20 +1351,20 @@ class TestIPv6RDControlPlane(TestIPv6ND):
         self.pg0.add_stream([packet])
         self.pg_start()
 
-        self.sleep(0.1)
+        self.sleep_on_vpp_time(0.1)
 
         # check that default route still exists
-        fib = self.vapi.ip6_fib_dump()
+        fib = self.vapi.ip_route_dump(0, True)
         default_routes = self.get_default_routes(fib)
         self.assertEqual(len(default_routes), 1)
         dr = default_routes[0]
         self.assertEqual(dr['sw_if_index'], self.pg0.sw_if_index)
         self.assertEqual(dr['next_hop'], router_address)
 
-        self.sleep(1)
+        self.sleep_on_vpp_time(1)
 
         # check that default route is deleted
-        fib = self.vapi.ip6_fib_dump()
+        fib = self.vapi.ip_route_dump(0, True)
         default_routes = self.get_default_routes(fib)
         self.assertEqual(len(default_routes), 0)
 
@@ -1330,13 +1373,14 @@ class TestIPv6RDControlPlane(TestIPv6ND):
         new_addresses = addresses.difference(initial_addresses)
 
         self.assertEqual(len(new_addresses), 1)
-        prefix = list(new_addresses)[0][:8] + '\0\0\0\0\0\0\0\0'
-        self.assertEqual(inet_ntop(AF_INET6, prefix), '1::')
+        prefix = IPv6Network(text_type("%s/%d" % (list(new_addresses)[0], 20)),
+                             strict=False)
+        self.assertEqual(prefix, IPv6Network(text_type('1::/20')))
 
-        self.sleep(1)
+        self.sleep_on_vpp_time(1)
 
         # check that SLAAC address is deleted
-        fib = self.vapi.ip6_fib_dump()
+        fib = self.vapi.ip_route_dump(0, True)
         addresses = set(self.get_interface_addresses(fib, self.pg0))
         new_addresses = addresses.difference(initial_addresses)
         self.assertEqual(len(new_addresses), 0)
@@ -1424,7 +1468,7 @@ class IPv6NDProxyTest(TestIPv6ND):
              IPv6(dst=self.pg0._remote_hosts[2].ip6,
                   src=self.pg0.remote_ip6) /
              inet6.UDP(sport=10000, dport=20000) /
-             Raw('\xa5' * 100))
+             Raw(b'\xa5' * 100))
 
         self.pg0.add_stream(t)
         self.pg_enable_capture(self.pg_interfaces)
@@ -1486,7 +1530,7 @@ class IPv6NDProxyTest(TestIPv6ND):
               IPv6(dst=self.pg0._remote_hosts[2].ip6,
                    src=self.pg0._remote_hosts[3].ip6) /
               inet6.UDP(sport=10000, dport=20000) /
-              Raw('\xa5' * 100))
+              Raw(b'\xa5' * 100))
 
         self.pg2.add_stream(t2)
         self.pg_enable_capture(self.pg_interfaces)
@@ -1574,12 +1618,15 @@ class TestIPNull(VppTestCase):
                    dst=self.pg0.local_mac) /
              IPv6(src=self.pg0.remote_ip6, dst="2001::1") /
              inet6.UDP(sport=1234, dport=1234) /
-             Raw('\xa5' * 100))
+             Raw(b'\xa5' * 100))
 
         #
         # A route via IP NULL that will reply with ICMP unreachables
         #
-        ip_unreach = VppIpRoute(self, "2001::", 64, [], is_unreach=1, is_ip6=1)
+        ip_unreach = VppIpRoute(
+            self, "2001::", 64,
+            [VppRoutePath("::", 0xffffffff,
+                          type=FibPathType.FIB_PATH_TYPE_ICMP_UNREACH)])
         ip_unreach.add_vpp_config()
 
         self.pg0.add_stream(p)
@@ -1599,8 +1646,10 @@ class TestIPNull(VppTestCase):
         #
         # A route via IP NULL that will reply with ICMP prohibited
         #
-        ip_prohibit = VppIpRoute(self, "2001::1", 128, [],
-                                 is_prohibit=1, is_ip6=1)
+        ip_prohibit = VppIpRoute(
+            self, "2001::1", 128,
+            [VppRoutePath("::", 0xffffffff,
+                          type=FibPathType.FIB_PATH_TYPE_ICMP_PROHIBIT)])
         ip_prohibit.add_vpp_config()
 
         self.pg0.add_stream(p)
@@ -1661,20 +1710,19 @@ class TestIPDisabled(VppTestCase):
             [VppMRoutePath(self.pg1.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
              VppMRoutePath(self.pg0.sw_if_index,
-                           MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)],
-            is_ip6=1)
+                           MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)])
         route_ff_01.add_vpp_config()
 
         pu = (Ether(src=self.pg1.remote_mac,
                     dst=self.pg1.local_mac) /
               IPv6(src="2001::1", dst=self.pg0.remote_ip6) /
               inet6.UDP(sport=1234, dport=1234) /
-              Raw('\xa5' * 100))
+              Raw(b'\xa5' * 100))
         pm = (Ether(src=self.pg1.remote_mac,
                     dst=self.pg1.local_mac) /
               IPv6(src="2001::1", dst="ffef::1") /
               inet6.UDP(sport=1234, dport=1234) /
-              Raw('\xa5' * 100))
+              Raw(b'\xa5' * 100))
 
         #
         # PG1 does not forward IP traffic
@@ -1785,7 +1833,7 @@ class TestIP6LoadBalance(VppTestCase):
             port_ip_hdr = (
                 IPv6(dst="3000::1", src="3000:1::1") /
                 inet6.UDP(sport=1234, dport=1234 + ii) /
-                Raw('\xa5' * 100))
+                Raw(b'\xa5' * 100))
             port_ip_pkts.append((Ether(src=self.pg0.remote_mac,
                                        dst=self.pg0.local_mac) /
                                  port_ip_hdr))
@@ -1807,7 +1855,7 @@ class TestIP6LoadBalance(VppTestCase):
             src_ip_hdr = (
                 IPv6(dst="3000::1", src="3000:1::%d" % ii) /
                 inet6.UDP(sport=1234, dport=1234) /
-                Raw('\xa5' * 100))
+                Raw(b'\xa5' * 100))
             src_ip_pkts.append((Ether(src=self.pg0.remote_mac,
                                       dst=self.pg0.local_mac) /
                                 src_ip_hdr))
@@ -1821,12 +1869,9 @@ class TestIP6LoadBalance(VppTestCase):
         #
         route_3000_1 = VppIpRoute(self, "3000::1", 128,
                                   [VppRoutePath(self.pg1.remote_ip6,
-                                                self.pg1.sw_if_index,
-                                                proto=DpoProto.DPO_PROTO_IP6),
+                                                self.pg1.sw_if_index),
                                    VppRoutePath(self.pg2.remote_ip6,
-                                                self.pg2.sw_if_index,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1)
+                                                self.pg2.sw_if_index)])
         route_3000_1.add_vpp_config()
 
         #
@@ -1841,12 +1886,10 @@ class TestIP6LoadBalance(VppTestCase):
         route_67 = VppMplsRoute(self, 67, 0,
                                 [VppRoutePath(self.pg1.remote_ip6,
                                               self.pg1.sw_if_index,
-                                              labels=[67],
-                                              proto=DpoProto.DPO_PROTO_IP6),
+                                              labels=[67]),
                                  VppRoutePath(self.pg2.remote_ip6,
                                               self.pg2.sw_if_index,
-                                              labels=[67],
-                                              proto=DpoProto.DPO_PROTO_IP6)])
+                                              labels=[67])])
         route_67.add_vpp_config()
 
         #
@@ -1910,32 +1953,26 @@ class TestIP6LoadBalance(VppTestCase):
                                    src="4000:1::1") /
                               inet6.UDP(sport=1234,
                                         dport=1234 + ii) /
-                              Raw('\xa5' * 100)))
+                              Raw(b'\xa5' * 100)))
             src_pkts.append((Ether(src=self.pg0.remote_mac,
                                    dst=self.pg0.local_mac) /
                              IPv6(dst="4000::1",
                                   src="4000:1::%d" % ii) /
                              inet6.UDP(sport=1234, dport=1234) /
-                             Raw('\xa5' * 100)))
+                             Raw(b'\xa5' * 100)))
 
         route_3000_2 = VppIpRoute(self, "3000::2", 128,
                                   [VppRoutePath(self.pg3.remote_ip6,
-                                                self.pg3.sw_if_index,
-                                                proto=DpoProto.DPO_PROTO_IP6),
+                                                self.pg3.sw_if_index),
                                    VppRoutePath(self.pg4.remote_ip6,
-                                                self.pg4.sw_if_index,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1)
+                                                self.pg4.sw_if_index)])
         route_3000_2.add_vpp_config()
 
         route_4000_1 = VppIpRoute(self, "4000::1", 128,
                                   [VppRoutePath("3000::1",
-                                                0xffffffff,
-                                                proto=DpoProto.DPO_PROTO_IP6),
+                                                0xffffffff),
                                    VppRoutePath("3000::2",
-                                                0xffffffff,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1)
+                                                0xffffffff)])
         route_4000_1.add_vpp_config()
 
         #
@@ -1962,20 +1999,16 @@ class TestIP6LoadBalance(VppTestCase):
                                    src="6000:1::1") /
                               inet6.UDP(sport=1234,
                                         dport=1234 + ii) /
-                              Raw('\xa5' * 100)))
+                              Raw(b'\xa5' * 100)))
 
         route_5000_2 = VppIpRoute(self, "5000::2", 128,
                                   [VppRoutePath(self.pg3.remote_ip6,
-                                                self.pg3.sw_if_index,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1)
+                                                self.pg3.sw_if_index)])
         route_5000_2.add_vpp_config()
 
         route_6000_1 = VppIpRoute(self, "6000::1", 128,
                                   [VppRoutePath("5000::2",
-                                                0xffffffff,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1)
+                                                0xffffffff)])
         route_6000_1.add_vpp_config()
 
         #
@@ -2020,7 +2053,7 @@ class TestIP6Punt(VppTestCase):
              IPv6(src=self.pg0.remote_ip6,
                   dst=self.pg0.local_ip6) /
              inet6.TCP(sport=1234, dport=1234) /
-             Raw('\xa5' * 100))
+             Raw(b'\xa5' * 100))
 
         pkts = p * 1025
 
@@ -2168,16 +2201,14 @@ class TestIPDeag(VppTestCase):
         route_to_dst = VppIpRoute(self, "1::1", 128,
                                   [VppRoutePath("::",
                                                 0xffffffff,
-                                                nh_table_id=1,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1)
-        route_to_src = VppIpRoute(self, "1::2", 128,
-                                  [VppRoutePath("::",
-                                                0xffffffff,
-                                                nh_table_id=2,
-                                                is_source_lookup=1,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1)
+                                                nh_table_id=1)])
+        route_to_src = VppIpRoute(
+            self, "1::2", 128,
+            [VppRoutePath("::",
+                          0xffffffff,
+                          nh_table_id=2,
+                          type=FibPathType.FIB_PATH_TYPE_SOURCE_LOOKUP)])
+
         route_to_dst.add_vpp_config()
         route_to_src.add_vpp_config()
 
@@ -2189,12 +2220,12 @@ class TestIPDeag(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IPv6(src="5::5", dst="1::1") /
                  inet6.TCP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
+                 Raw(b'\xa5' * 100))
         p_src = (Ether(src=self.pg0.remote_mac,
                        dst=self.pg0.local_mac) /
                  IPv6(src="2::2", dst="1::2") /
                  inet6.TCP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
+                 Raw(b'\xa5' * 100))
         pkts_dst = p_dst * 257
         pkts_src = p_src * 257
 
@@ -2208,9 +2239,7 @@ class TestIPDeag(VppTestCase):
         #
         route_in_dst = VppIpRoute(self, "1::1", 128,
                                   [VppRoutePath(self.pg1.remote_ip6,
-                                                self.pg1.sw_if_index,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1,
+                                                self.pg1.sw_if_index)],
                                   table_id=1)
         route_in_dst.add_vpp_config()
 
@@ -2221,9 +2250,7 @@ class TestIPDeag(VppTestCase):
         #
         route_in_src = VppIpRoute(self, "2::2", 128,
                                   [VppRoutePath(self.pg2.remote_ip6,
-                                                self.pg2.sw_if_index,
-                                                proto=DpoProto.DPO_PROTO_IP6)],
-                                  is_ip6=1,
+                                                self.pg2.sw_if_index)],
                                   table_id=2)
         route_in_src.add_vpp_config()
         self.send_and_expect(self.pg0, pkts_src, self.pg2)
@@ -2233,16 +2260,14 @@ class TestIPDeag(VppTestCase):
         #
         route_loop = VppIpRoute(self, "3::3", 128,
                                 [VppRoutePath("::",
-                                              0xffffffff,
-                                              proto=DpoProto.DPO_PROTO_IP6)],
-                                is_ip6=1)
+                                              0xffffffff)])
         route_loop.add_vpp_config()
 
         p_l = (Ether(src=self.pg0.remote_mac,
                      dst=self.pg0.local_mac) /
                IPv6(src="3::4", dst="3::3") /
                inet6.TCP(sport=1234, dport=1234) /
-               Raw('\xa5' * 100))
+               Raw(b'\xa5' * 100))
 
         self.send_and_assert_no_replies(self.pg0, p_l * 257,
                                         "IP lookup loop")
@@ -2286,7 +2311,7 @@ class TestIP6Input(VppTestCase):
                           dst=self.pg1.remote_ip6,
                           hlim=1) /
                      inet6.UDP(sport=1234, dport=1234) /
-                     Raw('\xa5' * 100))
+                     Raw(b'\xa5' * 100))
 
         rx = self.send_and_expect(self.pg0, p_version * NUM_PKTS, self.pg0)
         rx = rx[0]
@@ -2325,7 +2350,7 @@ class TestIP6Input(VppTestCase):
                           dst=dst or self.pg1.remote_ip6,
                           version=3) /
                      l4 /
-                     Raw('\xa5' * 100))
+                     Raw(b'\xa5' * 100))
 
         self.send_and_assert_no_replies(self.pg0, p_version * NUM_PKTS,
                                         remark=msg or "",
@@ -2339,11 +2364,152 @@ class TestIP6Input(VppTestCase):
              IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6) /
              IPv6ExtHdrHopByHop() /
              inet6.UDP(sport=1234, dport=1234) /
-             Raw('\xa5' * 100))
+             Raw(b'\xa5' * 100))
 
         self.pg0.add_stream(p)
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
+
+class TestIPReplace(VppTestCase):
+    """ IPv6 Table Replace """
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPReplace, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPReplace, cls).tearDownClass()
+
+    def setUp(self):
+        super(TestIPReplace, self).setUp()
+
+        self.create_pg_interfaces(range(4))
+
+        table_id = 1
+        self.tables = []
+
+        for i in self.pg_interfaces:
+            i.admin_up()
+            i.config_ip6()
+            i.resolve_arp()
+            i.generate_remote_hosts(2)
+            self.tables.append(VppIpTable(self, table_id,
+                                          True).add_vpp_config())
+            table_id += 1
+
+    def tearDown(self):
+        super(TestIPReplace, self).tearDown()
+        for i in self.pg_interfaces:
+            i.admin_down()
+            i.unconfig_ip4()
+
+    def test_replace(self):
+        """ IP Table Replace """
+
+        N_ROUTES = 20
+        links = [self.pg0, self.pg1, self.pg2, self.pg3]
+        routes = [[], [], [], []]
+
+        # the sizes of 'empty' tables
+        for t in self.tables:
+            self.assertEqual(len(t.dump()), 2)
+            self.assertEqual(len(t.mdump()), 5)
+
+        # load up the tables with some routes
+        for ii, t in enumerate(self.tables):
+            for jj in range(1, N_ROUTES):
+                uni = VppIpRoute(
+                    self, "2001::%d" % jj if jj != 0 else "2001::", 128,
+                    [VppRoutePath(links[ii].remote_hosts[0].ip6,
+                                  links[ii].sw_if_index),
+                     VppRoutePath(links[ii].remote_hosts[1].ip6,
+                                  links[ii].sw_if_index)],
+                    table_id=t.table_id).add_vpp_config()
+                multi = VppIpMRoute(
+                    self, "::",
+                    "ff:2001::%d" % jj, 128,
+                    MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE,
+                    [VppMRoutePath(self.pg0.sw_if_index,
+                                   MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT,
+                                   proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
+                     VppMRoutePath(self.pg1.sw_if_index,
+                                   MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
+                                   proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
+                     VppMRoutePath(self.pg2.sw_if_index,
+                                   MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
+                                   proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
+                     VppMRoutePath(self.pg3.sw_if_index,
+                                   MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
+                                   proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)],
+                    table_id=t.table_id).add_vpp_config()
+                routes[ii].append({'uni': uni,
+                                   'multi': multi})
+
+        #
+        # replace the tables a few times
+        #
+        for kk in range(3):
+            # replace each table
+            for t in self.tables:
+                t.replace_begin()
+
+            # all the routes are still there
+            for ii, t in enumerate(self.tables):
+                dump = t.dump()
+                mdump = t.mdump()
+                for r in routes[ii]:
+                    self.assertTrue(find_route_in_dump(dump, r['uni'], t))
+                    self.assertTrue(find_mroute_in_dump(mdump, r['multi'], t))
+
+            # redownload the even numbered routes
+            for ii, t in enumerate(self.tables):
+                for jj in range(0, N_ROUTES, 2):
+                    routes[ii][jj]['uni'].add_vpp_config()
+                    routes[ii][jj]['multi'].add_vpp_config()
+
+            # signal each table converged
+            for t in self.tables:
+                t.replace_end()
+
+            # we should find the even routes, but not the odd
+            for ii, t in enumerate(self.tables):
+                dump = t.dump()
+                mdump = t.mdump()
+                for jj in range(0, N_ROUTES, 2):
+                    self.assertTrue(find_route_in_dump(
+                        dump, routes[ii][jj]['uni'], t))
+                    self.assertTrue(find_mroute_in_dump(
+                        mdump, routes[ii][jj]['multi'], t))
+                for jj in range(1, N_ROUTES - 1, 2):
+                    self.assertFalse(find_route_in_dump(
+                        dump, routes[ii][jj]['uni'], t))
+                    self.assertFalse(find_mroute_in_dump(
+                        mdump, routes[ii][jj]['multi'], t))
+
+            # reload all the routes
+            for ii, t in enumerate(self.tables):
+                for r in routes[ii]:
+                    r['uni'].add_vpp_config()
+                    r['multi'].add_vpp_config()
+
+            # all the routes are still there
+            for ii, t in enumerate(self.tables):
+                dump = t.dump()
+                mdump = t.mdump()
+                for r in routes[ii]:
+                    self.assertTrue(find_route_in_dump(dump, r['uni'], t))
+                    self.assertTrue(find_mroute_in_dump(mdump, r['multi'], t))
+
+        #
+        # finally flush the tables for good measure
+        #
+        for t in self.tables:
+            t.flush()
+            self.assertEqual(len(t.dump()), 2)
+            self.assertEqual(len(t.mdump()), 5)
+
+
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)