summaryrefslogtreecommitdiffstats
path: root/src/plugins/oddbuf/oddbuf_test.c
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-10-02 17:00:30 +0200
committerDamjan Marion <dmarion@me.com>2019-10-03 12:38:03 +0000
commit7ff64fb97541c769ba423e53166d80b9eef25279 (patch)
tree9fa02034eeb9a577265190754515edcecf8aa966 /src/plugins/oddbuf/oddbuf_test.c
parent2e7a43ca453c677c00d371ea5dfdba71267ab185 (diff)
oddbuf: remove api boilerplate
Type: refactor Change-Id: Ic4922da46bf941249dd74b1a8bc6a98c62c099b7 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/oddbuf/oddbuf_test.c')
-rw-r--r--src/plugins/oddbuf/oddbuf_test.c89
1 files changed, 3 insertions, 86 deletions
diff --git a/src/plugins/oddbuf/oddbuf_test.c b/src/plugins/oddbuf/oddbuf_test.c
index 25c0bc05336..4bae5774c5f 100644
--- a/src/plugins/oddbuf/oddbuf_test.c
+++ b/src/plugins/oddbuf/oddbuf_test.c
@@ -23,30 +23,8 @@
uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
/* Declare message IDs */
-#include <oddbuf/oddbuf_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <oddbuf/oddbuf_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun /* define message structures */
-#include <oddbuf/oddbuf_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <oddbuf/oddbuf_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <oddbuf/oddbuf_all_api_h.h>
-#undef vl_api_version
-
+#include <oddbuf/oddbuf.api_enum.h>
+#include <oddbuf/oddbuf.api_types.h>
typedef struct
{
@@ -60,33 +38,6 @@ oddbuf_test_main_t oddbuf_test_main;
#define __plugin_msg_base oddbuf_test_main.msg_id_base
#include <vlibapi/vat_helper_macros.h>
-#define foreach_standard_reply_retval_handler \
-_(oddbuf_enable_disable_reply)
-
-#define _(n) \
- static void vl_api_##n##_t_handler \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = oddbuf_test_main.vat_main; \
- i32 retval = ntohl(mp->retval); \
- if (vam->async_mode) { \
- vam->async_errors += (retval < 0); \
- } else { \
- vam->retval = retval; \
- vam->result_ready = 1; \
- } \
- }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg \
-_(ODDBUF_ENABLE_DISABLE_REPLY, oddbuf_enable_disable_reply)
-
-
static int
api_oddbuf_enable_disable (vat_main_t * vam)
{
@@ -128,41 +79,7 @@ api_oddbuf_enable_disable (vat_main_t * vam)
return ret;
}
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(oddbuf_enable_disable, "<intfc> [disable]")
-
-static void
-oddbuf_api_hookup (vat_main_t * vam)
-{
- oddbuf_test_main_t *otmp = &oddbuf_test_main;
- /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + otmp->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_vpe_api_reply_msg;
-#undef _
-
- /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
- foreach_vpe_api_msg;
-#undef _
-
- /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
- foreach_vpe_api_msg;
-#undef _
-}
-
-VAT_PLUGIN_REGISTER (oddbuf);
+#include <oddbuf/oddbuf.api_test.c>
/*
* fd.io coding-style-patch-verification: ON