fib: fib api updates

Enhance the route add/del APIs to take a set of paths rather than just one.
Most unicast routing protocols calcualte all the available paths in one
run of the algorithm so updating all the paths at once is beneficial for the client.
two knobs control the behaviour:
  is_multipath - if set the the set of paths passed will be added to those
                 that already exist, otherwise the set will replace them.
  is_add - add or remove the set

is_add=0, is_multipath=1 and an empty set, results in deleting the route.

It is also considerably faster to add multiple paths at once, than one at a time:

vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.11
100000 routes in .572240 secs, 174751.80 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.12
100000 routes in .528383 secs, 189256.54 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.13
100000 routes in .757131 secs, 132077.52 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.14
100000 routes in .878317 secs, 113854.12 routes/sec

vat# ip_route_add_del 1.1.1.1/32 count 100000 multipath via 10.10.10.11 via 10.10.10.12 via 10.10.10.13 via 10.10.10.14
100000 routes in .900212 secs, 111084.93 routes/sec

Change-Id: I416b93f7684745099c1adb0b33edac58c9339c1a
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Signed-off-by: Ole Troan <ot@cisco.com>
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

1 files changed, 17 insertions, 36 deletions

diff --git a/test/vpp_bier.py b/test/vpp_bier.py
index 8e27f25d10f..6e087a8ee0b 100644
--- a/test/vpp_bier.py
+++ b/test/vpp_bier.py
@@ -38,10 +38,10 @@ def find_bier_table(test, bti):
 def find_bier_route(test, bti, bp):
     routes = test.vapi.bier_route_dump(bti)
     for r in routes:
-        if bti.set_id == r.br_tbl_id.bt_set \
-           and bti.sub_domain_id == r.br_tbl_id.bt_sub_domain \
-           and bti.hdr_len_id == r.br_tbl_id.bt_hdr_len_id \
-           and bp == r.br_bp:
+        if bti.set_id == r.br_route.br_tbl_id.bt_set \
+           and bti.sub_domain_id == r.br_route.br_tbl_id.bt_sub_domain \
+           and bti.hdr_len_id == r.br_route.br_tbl_id.bt_hdr_len_id \
+           and bp == r.br_route.br_bp:
             return True
     return False
 
@@ -116,39 +116,15 @@ class VppBierRoute(VppObject):
         self.tbl_id = tbl_id
         self.bp = bp
         self.paths = paths
-
-    def encode_path(self, p):
-        lstack = []
-        for l in p.nh_labels:
-            if type(l) == VppMplsLabel:
-                lstack.append(l.encode())
-            else:
-                lstack.append({'label': l, 'ttl': 255})
-        n_labels = len(lstack)
-        while (len(lstack) < 16):
-            lstack.append({})
-        return {'next_hop': p.nh_addr,
-                'weight': 1,
-                'afi': p.proto,
-                'sw_if_index': 0xffffffff,
-                'preference': 0,
-                'table_id': p.nh_table_id,
-                'next_hop_id': p.next_hop_id,
-                'is_udp_encap': p.is_udp_encap,
-                'n_labels': n_labels,
-                'label_stack': lstack}
-
-    def encode_paths(self):
-        br_paths = []
-        for p in self.paths:
-            br_paths.append(self.encode_path(p))
-        return br_paths
+        self.encoded_paths = []
+        for path in self.paths:
+            self.encoded_paths.append(path.encode())
 
     def add_vpp_config(self):
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            self.encode_paths(),
+            self.encoded_paths,
             is_add=1)
         self._test.registry.register(self, self._test.logger)
 
@@ -156,32 +132,37 @@ class VppBierRoute(VppObject):
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            self.encode_paths(),
+            self.encoded_paths,
             is_add=0)
 
     def update_paths(self, paths):
         self.paths = paths
+        self.encoded_paths = []
+        for path in self.paths:
+            self.encoded_paths.append(path.encode())
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            self.encode_paths(),
+            self.encoded_paths,
             is_replace=1)
 
     def add_path(self, path):
+        self.encoded_paths.append(path.encode())
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            [self.encode_path(path)],
+            [path.encode()],
             is_add=1,
             is_replace=0)
         self.paths.append(path)
         self._test.registry.register(self, self._test.logger)
 
     def remove_path(self, path):
+        self.encoded_paths.remove(path.encode())
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            [self.encode_path(path)],
+            [path.encode()],
             is_add=0,
             is_replace=0)
         self.paths.remove(path)