1 files changed, 90 insertions, 222 deletions

diff --git a/vpp/vpp-api/vpe.api b/vpp/vpp-api/vpe.api
index bcc3f4ec1b3..2da94215f1e 100644
--- a/vpp/vpp-api/vpe.api
+++ b/vpp/vpp-api/vpe.api
@@ -361,7 +361,9 @@ define create_vlan_subif_reply
     @param mr_next_hop[16] - the nextop address
     @param mr_next_hop_sw_if_index - the next-hop SW interface
     @param mr_next_hop_table_id - the next-hop table-id (if appropriate)
-    @param mr_next_hop_out_label - the next-hop output label
+    @param mr_next_hop_n_out_labels - the number of labels in the label stack
+    @param mr_next_hop_out_label_stack - the next-hop output label stack, outer most first
+    @param next_hop_via_label - The next-hop is a resolved via a local label
 */
 define mpls_route_add_del
 {
@@ -380,9 +382,11 @@ define mpls_route_add_del
   u8 mr_next_hop_proto_is_ip4;
   u8 mr_next_hop_weight;
   u8 mr_next_hop[16];
+  u8 mr_next_hop_n_out_labels;
   u32 mr_next_hop_sw_if_index;
   u32 mr_next_hop_table_id;
-  u32 mr_next_hop_out_label;
+  u32 mr_next_hop_via_label;
+  u32 mr_next_hop_out_label_stack[mr_next_hop_n_out_labels];
 };
 
 /** \brief Reply for MPLS route add / del request
@@ -532,16 +536,92 @@ define mpls_ip_bind_unbind_reply
   i32 retval;
 };
 
+/** \brief MPLS tunnel Add / del route
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mt_is_add - Is this a route add or delete
+    @param mt_sw_if_index - The SW interface index of the tunnel to delete
+    @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[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)
+    @param mt_next_hop_n_out_labels - the number of next-hop output labels
+    @param mt_next_hop_out_label_stack - the next-hop output label stack,  outer most first
+*/
+define mpls_tunnel_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 mt_sw_if_index;
+  u8 mt_is_add;
+  u8 mt_l2_only;
+  u8 mt_next_hop_proto_is_ip4;
+  u8 mt_next_hop_weight;
+  u8 mt_next_hop[16];
+  u8 mt_next_hop_n_out_labels;
+  u32 mt_next_hop_sw_if_index;
+  u32 mt_next_hop_table_id;
+  u32 mt_next_hop_out_label_stack[mt_next_hop_n_out_labels];
+};
+
+/** \brief Reply for MPLS tunnel add / del request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param sw_if_index - SW interface index of the tunnel created
+*/
+define mpls_tunnel_add_del_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief Dump mpls eth tunnel table
+    @param client_index - opaque cookie to identify the sender
+    @param tunnel_index - eth tunnel identifier or -1 in case of all tunnels
+*/
+define mpls_tunnel_dump
+{
+  u32 client_index;
+  u32 context;
+  i32 tunnel_index;
+};
+
+/** \brief mpls eth tunnel operational state response
+    @param tunnel_index - eth tunnel identifier
+    @param intfc_address - interface ipv4 addr
+    @param mask_width - interface ipv4 addr mask
+    @param hw_if_index - interface id
+    @param l2_only -
+    @param tunnel_dst_mac -
+    @param tx_sw_if_index -
+    @param encap_index - reference to mpls label table
+    @param nlabels - number of resolved labels
+    @param labels - resolved labels
+*/
+define mpls_tunnel_details
+{
+  u32 context;
+  u32 tunnel_index;
+  u8 mt_l2_only;
+  u8 mt_sw_if_index;
+  u8 mt_next_hop_proto_is_ip4;
+  u8 mt_next_hop[16];
+  u32 mt_next_hop_sw_if_index;
+  u32 mt_next_hop_table_id;
+  u32 mt_next_hop_n_labels;
+  u32 mt_next_hop_out_labels[mt_next_hop_n_labels];
+};
+
 /** \brief Add / del route request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param sw_if_index - software index of the new vlan's parent interface
     @param vrf_id - fib table /vrf associated with the route
     @param lookup_in_vrf - 
-    @param resolve_attempts - 
     @param classify_table_index - 
     @param create_vrf_if_needed - 
-    @param resolve_if_needed - 
     @param is_add - 1 if adding the route, 0 if deleting
     @param is_drop - Drop the packet
     @param is_unreach - Drop the packet and rate limit send ICMP unreachable
@@ -555,6 +635,9 @@ define mpls_ip_bind_unbind_reply
     @param dst_address_length - 
     @param dst_address[16] - 
     @param next_hop_address[16] - 
+    @param next_hop_n_out_labels - the number of labels in the label stack
+    @param next_hop_out_label_stack - the next-hop output label stack, outer most first
+    @param next_hop_via_label - The next-hop is a resolved via a local label
 */
 define ip_add_del_route
 {
@@ -562,12 +645,9 @@ define ip_add_del_route
   u32 context;
   u32 next_hop_sw_if_index;
   u32 table_id;
-  u32 resolve_attempts;
   u32 classify_table_index;
-  u32 next_hop_out_label;
   u32 next_hop_table_id;
   u8 create_vrf_if_needed;
-  u8 resolve_if_needed;
   u8 is_add;
   u8 is_drop;
   u8 is_unreach;
@@ -584,6 +664,9 @@ define ip_add_del_route
   u8 dst_address_length;
   u8 dst_address[16];
   u8 next_hop_address[16];
+  u8 next_hop_n_out_labels;
+  u32 next_hop_via_label;
+  u32 next_hop_out_label_stack[next_hop_n_out_labels];
 };
 
 /** \brief Reply for add / del route request
@@ -596,37 +679,6 @@ define ip_add_del_route_reply
   i32 retval;
 };
 
-/** \brief Add / del MPLS encapsulation request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - vrf id
-    @param dst_address[4] - 
-    @param is_add - 1 if adding the encap, 0 if deleting
-    @param nlabels - number of labels 
-    @param labels - array of labels
-*/
-define mpls_add_del_encap
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;
-  u8 dst_address[4];
-  /* 1 = add, 0 = delete */
-  u8 is_add;
-  u8 nlabels;
-  u32 labels[0];
-};
-
-/** \brief Reply for add / del encapsulation request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define mpls_add_del_encap_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Proxy ARP add / del request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -1508,78 +1560,6 @@ define sw_interface_set_vxlan_bypass_reply
   i32 retval;
 };
 
-/** \brief MPLS Ethernet add / del tunnel request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - vrf_id, only for IP4
-    @param sw_if_index - interface used to reach neighbor
-    @param is_add - add if set, tunnel delete if 0
-    @param dst_mac_address - 
-    @param adj_address - 
-    @param adj_address_length -
-*/
-define mpls_ethernet_add_del_tunnel
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;
-  u32 tx_sw_if_index;
-  u8 is_add;
-  u8 l2_only;
-  u8 dst_mac_address[6];
-  u8 adj_address[4];
-  u8 adj_address_length;
-};
-
-/** \brief Reply for MPLS Ethernet add / delete tunnel request
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define mpls_ethernet_add_del_tunnel_reply
-{
-  u32 context;
-  i32 retval;
-  u32 tunnel_sw_if_index;
-};
-/** \brief MPLS Ethernet add/ del tunnel 2
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param inner_vrf_id - 
-    @param outer_vrf_id - 
-    @param resolve_attempts - 
-    @param resolve_opaque - 
-    @param resolve_if_needed -
-    @param is_add -
-    @param adj_address -
-    @param adj_address_length -
-    @param next_hop_ip4_address_in_outer_vrf -
-*/
-define mpls_ethernet_add_del_tunnel_2
-{
-  u32 client_index;
-  u32 context;
-  u32 inner_vrf_id;
-  u32 outer_vrf_id;
-  u32 resolve_attempts;
-  u32 resolve_opaque;		/* no need to set this */
-  u8 resolve_if_needed;
-  u8 is_add;
-  u8 l2_only;
-  u8 adj_address[4];
-  u8 adj_address_length;
-  u8 next_hop_ip4_address_in_outer_vrf[4];
-};
-
-/** \brief MPLS Ethernet add/ del tunnel 2
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for add /del request
-*/
-define mpls_ethernet_add_del_tunnel_2_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set L2 XConnect between two interfaces request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -4567,118 +4547,6 @@ define netmap_delete_reply
   i32 retval;
 };
 
-/** \brief Dump mpls gre tunnel table
-    @param client_index - opaque cookie to identify the sender
-    @param tunnel_index - gre tunnel identifier or -1 in case of all tunnels
-*/
-define mpls_gre_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-  i32 tunnel_index;
-};
-
-/** \brief mpls gre tunnel operational state response
-    @param tunnel_index - gre tunnel identifier
-    @param intfc_address - interface ipv4 addr
-    @param mask_width - interface ipv4 addr mask
-    @param hw_if_index - interface id
-    @param l2_only -
-    @param tunnel_src - tunnel source ipv4 addr
-    @param tunnel_dst - tunnel destination ipv4 addr
-    @param outer_fib_index - gre tunnel identifier
-    @param encap_index - reference to mpls label table
-    @param nlabels - number of resolved labels
-    @param labels - resolved labels
-*/
-define mpls_gre_tunnel_details
-{
-  u32 context;
-  u32 tunnel_index;
-
-  u32 intfc_address;
-  u32 inner_fib_index;
-  u32 mask_width;
-  u32 encap_index;
-  u32 hw_if_index;
-  u8 l2_only;
-  u32 tunnel_src;
-  u32 tunnel_dst;
-  u32 outer_fib_index;
-  u32 nlabels;
-  u32 labels[nlabels];
-};
-
-/** \brief Dump mpls eth tunnel table
-    @param client_index - opaque cookie to identify the sender
-    @param tunnel_index - eth tunnel identifier or -1 in case of all tunnels
-*/
-define mpls_eth_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-  i32 tunnel_index;
-};
-
-/** \brief mpls eth tunnel operational state response
-    @param tunnel_index - eth tunnel identifier
-    @param intfc_address - interface ipv4 addr
-    @param mask_width - interface ipv4 addr mask
-    @param hw_if_index - interface id
-    @param l2_only -
-    @param tunnel_dst_mac -
-    @param tx_sw_if_index -
-    @param encap_index - reference to mpls label table
-    @param nlabels - number of resolved labels
-    @param labels - resolved labels
-*/
-define mpls_eth_tunnel_details
-{
-  u32 context;
-  u32 tunnel_index;
-
-  u32 intfc_address;
-  u32 inner_fib_index;
-  u32 mask_width;
-  u32 encap_index;
-  u32 hw_if_index;
-  u8 l2_only;
-  u8 tunnel_dst_mac[6];
-  u32 tx_sw_if_index;
-  u32 nlabels;
-  u32 labels[nlabels];
-};
-
-/** \brief Dump mpls fib table
-    @param client_index - opaque cookie to identify the sender
-    @param fib_index    - mpls fib entry identifier or -1 in case of all entries
-*/
-define mpls_fib_encap_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief mpls fib encap table response
-    @param fib_index - fib table id
-    @param dest - destination ipv4 addr
-    @param s_bit -
-    @param entry_index - reference to mpls label table
-    @param nlabels - number of resolved labels
-    @param labels - resolved labels
-*/
-define mpls_fib_encap_details
-{
-  u32 context;
-
-  u32 fib_index;
-  u32 entry_index;
-  u32 dest;
-  u32 s_bit;
-  u32 nlabels;
-  u32 labels[nlabels];
-};
-
 /** \brief Classify get table IDs request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request