X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbier%2Fbier.api;h=da2989bbe441cbbefa3b04d5879e160783ddd014;hb=494a09a3959f3782a7c7f1fa42b7d16a99c98630;hp=f7a13e4705b7dd70d27acb01aff69a41892e0e9a;hpb=fa1da15ca5ea6ce308f16e1a44a604c4bec8091b;p=vpp.git

diff --git a/src/vnet/bier/bier.api b/src/vnet/bier/bier.api
index f7a13e4705b..da2989bbe44 100644
--- a/src/vnet/bier/bier.api
+++ b/src/vnet/bier/bier.api
@@ -18,7 +18,8 @@
     This file defines vpp BIER control-plane API messages which are generally
     called through a shared memory interface.
 */
-vl_api_version 1.0.0
+option version = "1.1.0";
+import "vnet/fib/fib_types.api";
 
 /** \brief BIER Table Indentifier
     @param bt_set - The BIER set
@@ -63,37 +64,6 @@ define bier_table_details
   vl_api_bier_table_id_t bt_tbl_id;
 };
 
-/** \brief FIB path
-    @param sw_if_index - index of the interface
-    @param weight - The weight, for UCMP
-    @param preference - The preference of the path. lowest preference is prefered
-    @param is_local - local if non-zero, else remote
-    @param is_drop - Drop the packet
-    @param is_udp_encap - The path describes a UDP-o-IP encapsulation.
-    @param afi - the afi of the next hop, IP46_TYPE_IP4=1, IP46_TYPE_IP6=2
-    @param next_hop[16] - the next hop address
-    @param next_hop_id - Used when the path resolves via an object that has a unique
-                         identifier. e.g. the UDP encap object
-
-    WARNING: this type is replicated, pending cleanup completion
-*/
-typeonly define fib_path3
-{
-  u32 sw_if_index;
-  u32 table_id;
-  u8 weight;
-  u8 preference;
-  u8 is_local;
-  u8 is_drop;
-  u8 is_udp_encap;
-  u8 afi;
-  u8 next_hop[16];
-  u32 next_hop_id;
-  u32 rpf_id;
-  u8 n_labels;
-  u32 label_stack[16];
-};
-
 /** \brief BIER Route Add / del route
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -102,6 +72,8 @@ typeonly define fib_path3
     @param br_is_add - Is this a route add or delete
     @param br_is_replace - Are the paths specfied replacing those already
                            present or are they to be combined.
+			   is_replace = 1 and n_paths=0 implies delete the
+			   route and all paths;
     @param br_n_paths - The number of paths
     @param br_paths - The array of paths
 */
@@ -109,12 +81,12 @@ autoreply define bier_route_add_del
 {
   u32 client_index;
   u32 context;
-  u16 br_bp;
+  u32 br_bp;
   u8 br_is_add;
   u8 br_is_replace;
   vl_api_bier_table_id_t br_tbl_id;
   u8 br_n_paths;
-  vl_api_fib_path3_t br_paths[br_n_paths];
+  vl_api_fib_path_t br_paths[br_n_paths];
 };
 
 define bier_route_dump
@@ -126,12 +98,11 @@ define bier_route_dump
 
 define bier_route_details
 {
-  u32 client_index;
   u32 context;
   u16 br_bp;
   vl_api_bier_table_id_t br_tbl_id;
   u32 br_n_paths;
-  vl_api_fib_path3_t br_paths[br_n_paths];
+  vl_api_fib_path_t br_paths[br_n_paths];
 };
 
 /** \brief BIER Imposition Add
@@ -139,7 +110,9 @@ define bier_route_details
     @param context - sender context, to match reply w/ request
     @param bi_tbl_id - The BIER table-id used to forward post encap
     @param bi_src - The source Bit-position in the encap.
-    @param bi_n_bytes - The number of bytes in the following bit-string
+    @param bi_n_bytes - The number of bytes in the following bit-string.
+                        VPP only supports BSL of 1024 and less, so this is
+			a u8 field.
     @param bi_bytes - The bit-string represented as a byte array (MSB first)
 */
 define bier_imp_add
@@ -185,7 +158,6 @@ define bier_imp_dump
 
 define bier_imp_details
 {
-  u32 client_index;
   u32 context;
   vl_api_bier_table_id_t bi_tbl_id;
   u16 bi_src;
@@ -221,7 +193,8 @@ define bier_disp_table_details
 /** \brief BIER Disposition Entry Add / del
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
-    @param bde_bp - The Bit-position value for the entry
+    @param bde_bp - The Bit-position value for the entry, i.e. the sender's
+                    Use 0 for the default (match any source) entry.
     @param bde_tbl_id - The BIER dispositiontable-id the route is added in
     @param bde_next_hop_sw_if_index - the nextop interface
     @param bde_is_add - Is this a route add or delete
@@ -238,7 +211,7 @@ autoreply define bier_disp_entry_add_del
   u8 bde_is_add;
   u8 bde_payload_proto;
   u8 bde_n_paths;
-  vl_api_fib_path3_t bde_paths[bde_n_paths];
+  vl_api_fib_path_t bde_paths[bde_n_paths];
 };
 
 define bier_disp_entry_dump
@@ -256,7 +229,7 @@ define bier_disp_entry_details
   u8 bde_is_add;
   u8 bde_payload_proto;
   u8 bde_n_paths;
-  vl_api_fib_path3_t bde_paths[bde_n_paths];
+  vl_api_fib_path_t bde_paths[bde_n_paths];
 };
 
 /*