1 files changed, 22 insertions, 28 deletions

diff --git a/src/vnet/lisp-gpe/lisp_gpe.api b/src/vnet/lisp-gpe/lisp_gpe.api
index 8f60b15ad87..9fbd795a071 100644
--- a/src/vnet/lisp-gpe/lisp_gpe.api
+++ b/src/vnet/lisp-gpe/lisp_gpe.api
@@ -13,7 +13,10 @@
  * limitations under the License.
  */
 
-option version = "1.0.0";
+option version = "2.0.0";
+
+import "vnet/interface_types.api";
+import "vnet/lisp-cp/lisp_types.api";
 
 /** \brief GPE locator structure
     @param is_ip4 - whether addr is IPv4 or v6
@@ -22,9 +25,8 @@ option version = "1.0.0";
 */
 typedef gpe_locator
 {
-  u8 is_ip4;
   u8 weight;
-  u8 addr[16];
+  vl_api_address_t addr;
 };
 
 /** \brief add or delete GPE tunnel
@@ -49,12 +51,9 @@ manual_print manual_endian define gpe_add_del_fwd_entry
 {
   u32 client_index;
   u32 context;
-  u8 is_add;
-  u8 eid_type;
-  u8 rmt_eid[16];
-  u8 lcl_eid[16];
-  u8 rmt_len;
-  u8 lcl_len;
+  bool is_add [default=true];
+  vl_api_eid_t rmt_eid;
+  vl_api_eid_t lcl_eid;
   u32 vni;
   u32 dp_table;
   u8 action;
@@ -72,13 +71,13 @@ define gpe_add_del_fwd_entry_reply
 /** \brief enable or disable gpe protocol
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
-    @param is_en - enable protocol if non-zero, else disable
+    @param is_enable [default=true] - enable protocol if non-zero, else disable
 */
 autoreply define gpe_enable_disable
 {
   u32 client_index;
   u32 context;
-  u8 is_en;
+  bool is_enable [default=true];
 };
 
 /** \brief add or delete gpe_iface
@@ -90,8 +89,8 @@ autoreply define gpe_add_del_iface
 {
   u32 client_index;
   u32 context;
-  u8 is_add;
-  u8 is_l2;
+  bool is_add [default=true];
+  bool is_l2;
   u32 dp_table;
   u32 vni;
 };
@@ -121,11 +120,8 @@ typedef gpe_fwd_entry
 {
   u32 fwd_entry_index;
   u32 dp_table;
-  u8 eid_type;
-  u8 leid_prefix_len;
-  u8 reid_prefix_len;
-  u8 leid[16];
-  u8 reid[16];
+  vl_api_eid_t leid;
+  vl_api_eid_t reid;
   u32 vni;
   u8 action;
 };
@@ -161,7 +157,7 @@ autoreply define gpe_set_encap_mode
 {
   u32 client_index;
   u32 context;
-  u8 mode;
+  bool is_vxlan;
 };
 
 /** \brief get GPE encapsulation mode
@@ -184,6 +180,7 @@ define gpe_get_encap_mode_reply
 {
   u32 context;
   i32 retval;
+  /* FIXME: gpe encap enum */
   u8 encap_mode;
 };
 
@@ -200,11 +197,10 @@ autoreply define gpe_add_del_native_fwd_rpath
 {
   u32 client_index;
   u32 context;
-  u8 is_add;
+  bool is_add [default=true];
   u32 table_id;
-  u32 nh_sw_if_index;
-  u8 is_ip4;
-  u8 nh_addr[16];
+  vl_api_interface_index_t nh_sw_if_index;
+  vl_api_address_t nh_addr;
 };
 
 /** \brief get GPE native fwd rpath
@@ -215,7 +211,7 @@ define gpe_native_fwd_rpaths_get
 {
   u32 client_index;
   u32 context;
-  u8 is_ip4;
+  bool is_ip4;
 };
 
 /** \brief Reply for get native fwd rpath
@@ -228,9 +224,8 @@ define gpe_native_fwd_rpaths_get
 typedef gpe_native_fwd_rpath
 {
   u32 fib_index;
-  u32 nh_sw_if_index;
-  u8 is_ip4;
-  u8 nh_addr[16];
+  vl_api_interface_index_t nh_sw_if_index;
+  vl_api_address_t nh_addr;
 };
 
 manual_print manual_endian define gpe_native_fwd_rpaths_get_reply
@@ -246,4 +241,3 @@ manual_print manual_endian define gpe_native_fwd_rpaths_get_reply
  * eval: (c-set-style "gnu")
  * End:
  */
-