1 files changed, 6 insertions, 77 deletions

diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c
index e2ab2ac25df..cafa212a710 100644
--- a/src/plugins/lb/api.c
+++ b/src/plugins/lb/api.c
@@ -23,47 +23,18 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 #include <vpp/app/version.h>
+#include <vnet/format_fns.h>
 #include <vnet/ip/ip_types_api.h>
 
 /* define message IDs */
-#include <lb/lb_msg_enum.h>
+#include <lb/lb.api_enum.h>
+#include <lb/lb.api_types.h>
 
-/* define message structures */
-#define vl_typedefs
-#include <lb/lb_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <lb/lb_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <lb/lb_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <lb/lb_all_api_h.h>
-#undef vl_api_version
 
 #define REPLY_MSG_ID_BASE lbm->msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-/* List of message types that this plugin understands */
-#define foreach_lb_plugin_api_msg            \
-_(LB_CONF, lb_conf)                          \
-_(LB_ADD_DEL_VIP, lb_add_del_vip)            \
-_(LB_ADD_DEL_AS, lb_add_del_as)              \
-_(LB_VIP_DUMP, lb_vip_dump)                  \
-_(LB_AS_DUMP, lb_as_dump)                    \
-_(LB_FLUSH_VIP, lb_flush_vip)                \
-_(LB_ADD_DEL_INTF_NAT4, lb_add_del_intf_nat4)  \
-_(LB_ADD_DEL_INTF_NAT6, lb_add_del_intf_nat6)  \
-
-
 /* Macro to finish up custom dump fns */
 #define FINISH                                  \
     vec_add1 (s, 0);                            \
@@ -444,60 +415,18 @@ static void *vl_api_lb_flush_vip_t_print
   FINISH;
 }
 
-/* Set up the API message handling tables */
-static clib_error_t *
-lb_plugin_api_hookup (vlib_main_t *vm)
-{
-lb_main_t *lbm = &lb_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + lbm->msg_id_base),     \
-                           #n,                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_lb_plugin_api_msg;
-#undef _
-
-    return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <lb/lb_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (lb_main_t * lmp, api_main_t * am)
-{
-#define _(id,n,crc)   vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lmp->msg_id_base);
-  foreach_vl_msg_name_crc_lb ;
-#undef _
-}
-
+#include <lb/lb.api.c>
 static clib_error_t * lb_api_init (vlib_main_t * vm)
 {
   lb_main_t * lbm = &lb_main;
-  clib_error_t * error = 0;
-  u8 * name;
 
   lbm->vlib_main = vm;
   lbm->vnet_main = vnet_get_main();
 
-  name = format (0, "lb_%08x%c", api_version, 0);
-
   /* Ask for a correctly-sized block of API message decode slots */
-  lbm->msg_id_base = vl_msg_api_get_msg_ids
-      ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = lb_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (lbm, &api_main);
-
-  vec_free (name);
+  lbm->msg_id_base = setup_message_id_table ();
 
-  return error;
+  return 0;
 }
 
 VLIB_INIT_FUNCTION (lb_api_init);