X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_bier.py;h=ef9a9ab75ecbf4672e728fee45f09ae5f9efeeda;hb=f051072;hp=58c4f7248da17c742fd044dca805a0b24f1cb3b4;hpb=d792d9c01e60656cbfe1b0f1fd6a9b125f5dab0c;p=vpp.git

diff --git a/test/vpp_bier.py b/test/vpp_bier.py
index 58c4f7248da..ef9a9ab75ec 100644
--- a/test/vpp_bier.py
+++ b/test/vpp_bier.py
@@ -4,6 +4,7 @@
 
 import socket
 from vpp_object import VppObject
+from vpp_ip_route import MPLS_LABEL_INVALID, VppRoutePath
 
 
 class BIER_HDR_PAYLOAD:
@@ -18,7 +19,7 @@ class BIER_HDR_PAYLOAD:
 
 
 class VppBierTableID():
-    def __init__(self, set_id, sub_domain_id, hdr_len_id):
+    def __init__(self, sub_domain_id, set_id, hdr_len_id):
         self.set_id = set_id
         self.sub_domain_id = sub_domain_id
         self.hdr_len_id = hdr_len_id
@@ -113,22 +114,17 @@ class VppBierRoute(VppObject):
     BIER route
     """
 
-    def __init__(self, test, tbl_id, bp, nh, out_label,
-                 disp_table=0):
+    def __init__(self, test, tbl_id, bp, paths):
         self._test = test
         self.tbl_id = tbl_id
-        self.out_label = out_label
         self.bp = bp
-        self.disp_table = disp_table
-        self.nh = socket.inet_pton(socket.AF_INET, nh)
+        self.paths = paths
 
     def add_vpp_config(self):
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            self.nh,
-            self.out_label,
-            self.disp_table,
+            self.paths,
             is_add=1)
         self._test.registry.register(self, self._test.logger)
 
@@ -136,9 +132,7 @@ class VppBierRoute(VppObject):
         self._test.vapi.bier_route_add_del(
             self.tbl_id,
             self.bp,
-            self.nh,
-            self.out_label,
-            self.disp_table,
+            self.paths,
             is_add=0)
 
     def __str__(self):
@@ -225,11 +219,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
@@ -240,6 +235,7 @@ class VppBierDispEntry(VppObject):
             self.tbl_id,
             self.bp,
             self.payload_proto,
+            self.nh_proto,
             self.nh,
             self.nh_tbl,
             self.rpf_id,
@@ -251,6 +247,7 @@ class VppBierDispEntry(VppObject):
             self.tbl_id,
             self.bp,
             self.payload_proto,
+            self.nh_proto,
             self.nh,
             self.nh_tbl,
             self.rpf_id,