ioam: remove api boilerplate

[vpp.git] / src / plugins / ioam / lib-pot / pot_test.c

diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c
index 48d5bd4..1db4286 100644 (file)
--- a/src/plugins/ioam/lib-pot/pot_test.c
+++ b/src/plugins/ioam/lib-pot/pot_test.c
@@ -21,38 +21,25 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 
 #define __plugin_msg_base pot_test_main.msg_id_base
 #include <vlibapi/vat_helper_macros.h>
 
 /* Declare message IDs */
-#include <ioam/lib-pot/pot_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_typedefs
+#include <ioam/lib-pot/pot.api_enum.h>
+#include <ioam/lib-pot/pot.api_types.h>
 
-/* declare message handlers for each api */
-
-#define vl_endianfun             /* define message structures */
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
+#define vl_endianfun            /* define message structures */
 #define vl_printfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
 #define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-pot/pot_all_api_h.h>
+#define vl_print(handle, ...)
+#include <ioam/lib-pot/pot.api.h>
+#undef vl_endianfun
+#undef vl_printfun
 #undef vl_api_version
 
-
 typedef struct {
     /* API message ID base */
     u16 msg_id_base;
@@ -111,7 +98,7 @@ foreach_standard_reply_retval_handler;
 foreach_custom_reply_retval_handler;
 #undef _
 
-/* 
+/*
  * Table of message reply handlers, must include boilerplate handlers
  * we just generated
  */
@@ -132,9 +119,9 @@ static int api_pot_profile_add (vat_main_t *vam)
     u64 secret_key = 0;
     u32  bits = MAX_BITS;
     u64 lpc = 0, poly2 = 0;
-    f64 timeout;
     u8 id = 0;
     int rv = 0;
+    int ret;
 
     while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
       {
@@ -167,7 +154,7 @@ static int api_pot_profile_add (vat_main_t *vam)
         rv = -99;
         goto OUT;
       }
-    
+
     M2(POT_PROFILE_ADD, mp, vec_len(name));
 
     mp->list_name_len = vec_len(name);
@@ -187,9 +174,11 @@ static int api_pot_profile_add (vat_main_t *vam)
       }
     mp->id = id;
     mp->max_bits = bits;
-      
-    S; W;
-  
+
+    S(mp);
+    W (ret);
+    return ret;
+
 OUT:
     vec_free(name);
     return(rv);
@@ -203,8 +192,8 @@ static int api_pot_profile_activate (vat_main_t *vam)
     u8 *name = NULL;
     u8 id = 0;
     int rv = 0;
-    f64 timeout;
-    
+    int ret;
+
     while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
       {
         if (unformat(input, "name %s", &name))
@@ -221,15 +210,17 @@ static int api_pot_profile_activate (vat_main_t *vam)
         rv = -99;
         goto OUT;
       }
-    
+
     M2(POT_PROFILE_ACTIVATE, mp, vec_len(name));
 
     mp->list_name_len = vec_len(name);
     clib_memcpy(mp->list_name, name, mp->list_name_len);
     mp->id = id;
-      
-    S; W;
-  
+
+    S(mp);
+    W (ret);
+    return ret;
+
 OUT:
     vec_free(name);
     return(rv);
@@ -239,20 +230,21 @@ OUT:
 static int api_pot_profile_del (vat_main_t *vam)
 {
     vl_api_pot_profile_del_t *mp;
-    f64 timeout;
-   
+    int ret;
+
     M(POT_PROFILE_DEL, mp);
     mp->list_name_len = 0;
-    S; W;
-    return 0;
+    S(mp);
+    W (ret);
+    return ret;
 }
 
 static int api_pot_profile_show_config_dump (vat_main_t *vam)
 {
     unformat_input_t *input = vam->input;
     vl_api_pot_profile_show_config_dump_t *mp;
-    f64 timeout;
     u8 id = 0;
+    int ret;
 
     while(unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
     {
@@ -264,11 +256,12 @@ static int api_pot_profile_show_config_dump (vat_main_t *vam)
 
     mp->id = id;
 
-    S; W;
-    return 0;
+    S(mp);
+    W (ret);
+    return ret;
 }
 
-/* 
+/*
  * List of messages that the api test plugin sends,
  * and that the data plane plugin processes
  */
@@ -281,7 +274,7 @@ _(pot_profile_activate, "name <name> id [0-1] ")                            \
 _(pot_profile_del, "[id <nn>]")                                         \
 _(pot_profile_show_config_dump, "id [0-1]")
 
-static void 
+static void
 pot_vat_api_hookup (vat_main_t *vam)
 {
     pot_test_main_t * sm = &pot_test_main;
@@ -293,22 +286,24 @@ pot_vat_api_hookup (vat_main_t *vam)
                            vl_noop_handler,                     \
                            vl_api_##n##_t_endian,               \
                            vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1); 
+                           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 _    
-    
+#undef _
+
     /* Help strings */
 #define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
     foreach_vpe_api_msg;
 #undef _
 }
 
-clib_error_t * vat_plugin_register (vat_main_t *vam)
+
+clib_error_t *
+pot_vat_plugin_register (vat_main_t *vam)
 {
   pot_test_main_t * sm = &pot_test_main;
   u8 * name;
@@ -317,11 +312,12 @@ clib_error_t * vat_plugin_register (vat_main_t *vam)
 
   name = format (0, "ioam_pot_%08x%c", api_version, 0);
   sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+  vec_free(name);
 
   if (sm->msg_id_base != (u16) ~0)
     pot_vat_api_hookup (vam);
-  
-  vec_free(name);
-  
+  else
+    return clib_error_return (0, "ioam_pot plugin not loaded...");
+
   return 0;
 }