binary-api debug CLI works with plugins

[vpp.git] / src / plugins / ioam / lib-vxlan-gpe / vxlan_gpe_test.c

diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
index b5fee72..7c4088e 100644 (file)
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
@@ -23,6 +23,7 @@
 #include <vlibmemory/api.h>
 #include <vlibsocket/api.h>
 #include <vppinfra/error.h>
+#include <vlibapi/vat_helper_macros.h>
 
 /* Declare message IDs */
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h>
@@ -96,49 +97,9 @@ _(VXLAN_GPE_IOAM_VNI_DISABLE_REPLY, vxlan_gpe_ioam_vni_disable_reply)          \
 _(VXLAN_GPE_IOAM_TRANSIT_ENABLE_REPLY, vxlan_gpe_ioam_transit_enable_reply)    \
 _(VXLAN_GPE_IOAM_TRANSIT_DISABLE_REPLY, vxlan_gpe_ioam_transit_disable_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));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->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_vxlan_gpe_ioam_enable (vat_main_t * vam)
 {
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
   unformat_input_t *input = vam->input;
   vl_api_vxlan_gpe_ioam_enable_t *mp;
   f64 timeout;
@@ -179,7 +140,6 @@ api_vxlan_gpe_ioam_enable (vat_main_t * vam)
 static int
 api_vxlan_gpe_ioam_disable (vat_main_t * vam)
 {
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
   vl_api_vxlan_gpe_ioam_disable_t *mp;
   f64 timeout;
 
@@ -192,8 +152,6 @@ api_vxlan_gpe_ioam_disable (vat_main_t * vam)
 static int
 api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
 {
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
   unformat_input_t *line_input = vam->input;
   vl_api_vxlan_gpe_ioam_vni_enable_t *mp;
   ip4_address_t local4, remote4;
@@ -289,8 +247,6 @@ api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
 static int
 api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
 {
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
   unformat_input_t *line_input = vam->input;
   vl_api_vxlan_gpe_ioam_vni_disable_t *mp;
   ip4_address_t local4, remote4;
@@ -386,8 +342,6 @@ api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
 static int
 api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam)
 {
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
   unformat_input_t *line_input = vam->input;
   vl_api_vxlan_gpe_ioam_transit_enable_t *mp;
   ip4_address_t local4;
@@ -458,8 +412,6 @@ api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam)
 static int
 api_vxlan_gpe_ioam_transit_disable (vat_main_t * vam)
 {
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
   unformat_input_t *line_input = vam->input;
   vl_api_vxlan_gpe_ioam_transit_disable_t *mp;
   ip4_address_t local4;
@@ -545,8 +497,8 @@ _(vxlan_gpe_ioam_transit_disable, ""\
   "dst-ip <dst_ip> [outer-fib-index <outer_fib_index>]") \
 
 
-void
-vat_api_hookup (vat_main_t * vam)
+static void
+vxlan_gpe_vat_api_hookup (vat_main_t * vam)
 {
   vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
   /* Hook up handlers for replies from the data plane plug-in */
@@ -584,7 +536,7 @@ vat_plugin_register (vat_main_t * vam)
   sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
 
   if (sm->msg_id_base != (u16) ~ 0)
-    vat_api_hookup (vam);
+    vxlan_gpe_vat_api_hookup (vam);
 
   vec_free (name);