X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fmpls%2Fmpls.api;h=3c817db1306a2ec8a97b7e8d7cd644eb3c654530;hb=d0a59722135ec77e637097ef99edb6865bc38929;hp=c8a3ffb742203d3c7f019c207b82b6efa64310c1;hpb=11b8dbf78af49d270a0e72abe7dea73eec30d85f;p=vpp.git

diff --git a/src/vnet/mpls/mpls.api b/src/vnet/mpls/mpls.api
index c8a3ffb7422..3c817db1306 100644
--- a/src/vnet/mpls/mpls.api
+++ b/src/vnet/mpls/mpls.api
@@ -13,6 +13,8 @@
  * limitations under the License.
  */
 
+vl_api_version 1.0.0
+
 /** \brief Bind/Unbind an MPLS local label to an IP prefix. i.e. create
            a per-prefix label entry.
     @param client_index - opaque cookie to identify the sender
@@ -48,6 +50,7 @@ autoreply define mpls_ip_bind_unbind
     @param mt_is_multicast - Is the tunnel's underlying LSP multicast
     @param mt_next_hop_proto_is_ip4 - The next-hop is IPV4
     @param mt_next_hop_weight - The weight, for UCMP
+    @param mt_next_hop_preference - The preference
     @param mt_next_hop[16] - the nextop address
     @param mt_next_hop_sw_if_index - the next-hop SW interface
     @param mt_next_hop_table_id - the next-hop table-id (if appropriate)
@@ -64,6 +67,7 @@ define mpls_tunnel_add_del
   u8 mt_is_multicast;
   u8 mt_next_hop_proto_is_ip4;
   u8 mt_next_hop_weight;
+  u8 mt_next_hop_preference;
   u8 mt_next_hop[16];
   u8 mt_next_hop_n_out_labels;
   u32 mt_next_hop_sw_if_index;
@@ -110,7 +114,8 @@ define mpls_tunnel_dump
 typeonly manual_print manual_endian define fib_path2
 {
   u32 sw_if_index;
-  u32 weight;
+  u8 weight;
+  u8 preference;
   u8 is_local;
   u8 is_drop;
   u8 is_unreach;
@@ -133,6 +138,24 @@ manual_endian manual_print define mpls_tunnel_details
   vl_api_fib_path2_t mt_paths[mt_count];
 };
 
+/** \brief MPLS Route Add / del route
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mt_table_id - The MPLS table-id the route is added in
+    @param mt_is_add - Is this a route add or delete
+    @param mt_name - A client provided name/tag for the table. If this
+                     is not set by the client, then VPP will generate
+		     something meaningfull.
+*/
+autoreply define mpls_table_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 mt_table_id;
+  u8  mt_is_add;
+  u8  mt_name[64];
+};
+
 /** \brief MPLS Route Add / del route
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -153,7 +176,7 @@ manual_endian manual_print define mpls_tunnel_details
     @param mr_is_interface_rx - Interface Receive path
     @param mr_is_interface_rx - RPF-ID Receive path. The next-hop interface
                                 is used as the RPF-ID
-    @param mr_next_hop_proto_is_ip4 - The next-hop is IPV4
+    @param mr_next_hop_proto - The next-hop protocol, of type dpo_proto_t
     @param mr_next_hop_weight - The weight, for UCMP
     @param mr_next_hop[16] - the nextop address
     @param mr_next_hop_sw_if_index - the next-hop SW interface
@@ -179,8 +202,9 @@ autoreply define mpls_route_add_del
   u8 mr_is_resolve_attached;
   u8 mr_is_interface_rx;
   u8 mr_is_rpf_id;
-  u8 mr_next_hop_proto_is_ip4;
+  u8 mr_next_hop_proto;
   u8 mr_next_hop_weight;
+  u8 mr_next_hop_preference;
   u8 mr_next_hop[16];
   u8 mr_next_hop_n_out_labels;
   u32 mr_next_hop_sw_if_index;
@@ -209,6 +233,7 @@ manual_endian manual_print define mpls_fib_details
 {
   u32 context;
   u32 table_id;
+  u8  table_name[64];
   u8  eos_bit;
   u32 label;
   u32 count;