1 files changed, 4 insertions, 44 deletions

diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c
index 2e870238..9f9d0c99 100644
--- a/src/plugins/ioam/lib-pot/pot_test.c
+++ b/src/plugins/ioam/lib-pot/pot_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-pot/pot_msg_enum.h>
@@ -118,48 +119,9 @@ _(POT_PROFILE_ACTIVATE_REPLY, pot_profile_activate_reply)               \
 _(POT_PROFILE_DEL_REPLY, pot_profile_del_reply)                         \
 _(POT_PROFILE_SHOW_CONFIG_DETAILS, pot_profile_show_config_details)
 
-
-/* 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_pot_profile_add (vat_main_t *vam)
 {
 #define MAX_BITS 64
-    pot_test_main_t * sm = &pot_test_main;
     unformat_input_t *input = vam->input;
     vl_api_pot_profile_add_t *mp;
     u8 *name = NULL;
@@ -234,7 +196,6 @@ OUT:
 static int api_pot_profile_activate (vat_main_t *vam)
 {
 #define MAX_BITS 64
-    pot_test_main_t * sm = &pot_test_main;  
     unformat_input_t *input = vam->input;
     vl_api_pot_profile_activate_t *mp;
     u8 *name = NULL;
@@ -275,7 +236,6 @@ OUT:
 
 static int api_pot_profile_del (vat_main_t *vam)
 {
-    pot_test_main_t * sm = &pot_test_main;
     vl_api_pot_profile_del_t *mp;
     f64 timeout;
    
@@ -287,7 +247,6 @@ static int api_pot_profile_del (vat_main_t *vam)
 
 static int api_pot_profile_show_config_dump (vat_main_t *vam)
 {
-    pot_test_main_t * sm = &pot_test_main;
     unformat_input_t *input = vam->input;
     vl_api_pot_profile_show_config_dump_t *mp;
     f64 timeout;
@@ -320,7 +279,8 @@ _(pot_profile_activate, "name <name> id [0-1] ")    			\
 _(pot_profile_del, "[id <nn>]")                                         \
 _(pot_profile_show_config_dump, "id [0-1]")
 
-void vat_api_hookup (vat_main_t *vam)
+static void 
+pot_vat_api_hookup (vat_main_t *vam)
 {
     pot_test_main_t * sm = &pot_test_main;
     /* Hook up handlers for replies from the data plane plug-in */
@@ -357,7 +317,7 @@ clib_error_t * 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);
+    pot_vat_api_hookup (vam);
   
   vec_free(name);