From fe6bdfd84573cd8813a211f9094ee734f088ce16 Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Fri, 20 Jan 2017 19:50:09 -0500
Subject: binary-api debug CLI works with plugins

Change-Id: I81f33f5153d5afac94b66b5a8cb91da77463af79
Signed-off-by: Dave Barach <dave@barachs.net>
---
 src/plugins/lb/lb_test.c | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

(limited to 'src/plugins/lb/lb_test.c')

diff --git a/src/plugins/lb/lb_test.c b/src/plugins/lb/lb_test.c
index 8c2eaa91ce9..7e3519a8e4f 100644
--- a/src/plugins/lb/lb_test.c
+++ b/src/plugins/lb/lb_test.c
@@ -19,6 +19,7 @@
 #include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 #include <lb/lb.h>
+#include <vlibapi/vat_helper_macros.h>
 
 //TODO: Move that to vat/plugin_api.c
 //////////////////////////
@@ -127,35 +128,8 @@ foreach_standard_reply_retval_handler;
   _(LB_ADD_DEL_VIP_REPLY, lb_add_del_vip_reply)                       \
   _(LB_ADD_DEL_AS_REPLY, lb_add_del_as_reply)
 
-/* M: construct, but don't yet send a message */
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memcpy (mp, &mps, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + lbtm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
 static int api_lb_conf (vat_main_t * vam)
 {
-  lb_test_main_t *lbtm = &lb_test_main;
   unformat_input_t *i = vam->input;
   f64 timeout;
   vl_api_lb_conf_t mps, *mp;
@@ -177,7 +151,6 @@ static int api_lb_conf (vat_main_t * vam)
 
 static int api_lb_add_del_vip (vat_main_t * vam)
 {
-  lb_test_main_t *lbtm = &lb_test_main;
   unformat_input_t * i = vam->input;
   f64 timeout;
   vl_api_lb_add_del_vip_t mps, *mp;
@@ -215,7 +188,6 @@ static int api_lb_add_del_vip (vat_main_t * vam)
 
 static int api_lb_add_del_as (vat_main_t * vam)
 {
-  lb_test_main_t *lbtm = &lb_test_main;
   unformat_input_t * i = vam->input;
   f64 timeout;
   vl_api_lb_add_del_as_t mps, *mp;
@@ -246,7 +218,8 @@ _(lb_conf, "<ip4-src-addr> <ip6-src-address> <sticky_buckets_per_core> <flow_tim
 _(lb_add_del_vip, "<ip-prefix> [gre4|gre6] <new_table_len> [del]") \
 _(lb_add_del_as, "<vip-ip-prefix> <address> [del]")
 
-void vat_api_hookup (vat_main_t *vam)
+static void 
+lb_vat_api_hookup (vat_main_t *vam)
 {
   lb_test_main_t * lbtm = &lb_test_main;
   /* Hook up handlers for replies from the data plane plug-in */
@@ -285,7 +258,7 @@ clib_error_t * vat_plugin_register (vat_main_t *vam)
   lbtm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
 
   if (lbtm->msg_id_base != (u16) ~0)
-    vat_api_hookup (vam);
+    lb_vat_api_hookup (vam);
 
   vec_free(name);
 
-- 
cgit 1.2.3-korg