MAP: Use explicit address/prefix types in API

[vpp.git] / test / vpp_bier.py

diff --git a/test/vpp_bier.py b/test/vpp_bier.py
index 328d4f0..f389ca1 100644 (file)
--- a/test/vpp_bier.py
+++ b/test/vpp_bier.py
@@ -4,7 +4,7 @@
 
 import socket
 from vpp_object import VppObject
-from vpp_ip_route import MPLS_LABEL_INVALID, VppRoutePath
+from vpp_ip_route import MPLS_LABEL_INVALID, VppRoutePath, VppMplsLabel
 
 
 class BIER_HDR_PAYLOAD:
@@ -120,11 +120,38 @@ class VppBierRoute(VppObject):
         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
+
     def add_vpp_config(self):
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            self.paths,
+            self.encode_paths(),
             is_add=1)
         self._test.registry.register(self, self._test.logger)
 
@@ -132,9 +159,45 @@ class VppBierRoute(VppObject):
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            self.paths,
+            self.encode_paths(),
             is_add=0)
 
+    def update_paths(self, paths):
+        self.paths = paths
+        self._test.vapi.bier_route_add_del(
+            self.tbl_id,
+            self.bp,
+            self.encode_paths(),
+            is_replace=1)
+
+    def add_path(self, path):
+        self._test.vapi.bier_route_add_del(
+            self.tbl_id,
+            self.bp,
+            [self.encode_path(path)],
+            is_add=1,
+            is_replace=0)
+        self.paths.append(path)
+        self._test.registry.register(self, self._test.logger)
+
+    def remove_path(self, path):
+        self._test.vapi.bier_route_add_del(
+            self.tbl_id,
+            self.bp,
+            [self.encode_path(path)],
+            is_add=0,
+            is_replace=0)
+        self.paths.remove(path)
+
+    def remove_all_paths(self):
+        self._test.vapi.bier_route_add_del(
+            self.tbl_id,
+            self.bp,
+            [],
+            is_add=0,
+            is_replace=1)
+        self.paths = []
+
     def __str__(self):
         return self.object_id()
 
@@ -219,11 +282,12 @@ class VppBierDispEntry(VppObject):
     BIER Disposition Entry
     """
 
-    def __init__(self, test, tbl_id, bp, payload_proto, nh, nh_tbl,
-                 rpf_id=~0):
+    def __init__(self, test, tbl_id, bp, payload_proto, nh_proto,
+                 nh, nh_tbl, rpf_id=~0):
         self._test = test
         self.tbl_id = tbl_id
         self.nh_tbl = nh_tbl
+        self.nh_proto = nh_proto
         self.bp = bp
         self.payload_proto = payload_proto
         self.rpf_id = rpf_id
@@ -234,6 +298,7 @@ class VppBierDispEntry(VppObject):
             self.tbl_id,
             self.bp,
             self.payload_proto,
+            self.nh_proto,
             self.nh,
             self.nh_tbl,
             self.rpf_id,
@@ -245,6 +310,7 @@ class VppBierDispEntry(VppObject):
             self.tbl_id,
             self.bp,
             self.payload_proto,
+            self.nh_proto,
             self.nh,
             self.nh_tbl,
             self.rpf_id,