aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/export-vxlan-gpe
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-12-09 14:25:09 +0100
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2019-12-10 04:11:04 +0000
commit0fa66d618e7d839782a896f75bc8b0337cc2a2b8 (patch)
tree9a9b8593063d59dbf66cc6d09914df072c6663e6 /src/plugins/ioam/export-vxlan-gpe
parent668605fc873a6409f38df712106f4b1290d87648 (diff)
ioam: use explicit api types
Also remove API boilerplate. Type: fix Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: I62e795f5af3843af7912707ade4ba178ff326942
Diffstat (limited to 'src/plugins/ioam/export-vxlan-gpe')
-rw-r--r--src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api7
-rw-r--r--src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c2
-rw-r--r--src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c99
3 files changed, 12 insertions, 96 deletions
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
index f6a63dfad65..64a36b86ce7 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
@@ -15,6 +15,7 @@
*/
option version = "1.0.0";
+import "vnet/ip/ip_types.api";
/* Define a simple binary API to control the feature */
@@ -26,11 +27,11 @@ autoreply define vxlan_gpe_ioam_export_enable_disable {
u32 context;
/* Enable / disable the feature */
- u8 is_disable;
+ bool is_disable;
/* Collector ip address */
- u8 collector_address[4];
- u8 src_address[4];
+ vl_api_ip4_address_t collector_address;
+ vl_api_ip4_address_t src_address;
/* Src ip address */
};
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
index cc3713c5413..f802a049365 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
@@ -25,7 +25,7 @@
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
-
+#include <vnet/format_fns.h>
#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
/* define message IDs */
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
index a3a253fd9c1..1fc48f775a2 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
@@ -22,59 +22,23 @@
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <vppinfra/error.h>
+#include <vnet/format_fns.h>
-#define __plugin_msg_base export_test_main.msg_id_base
+#define __plugin_msg_base vxlan_gpe_ioam_export_test_main.msg_id_base
#include <vlibapi/vat_helper_macros.h>
/* Declare message IDs */
#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api_enum.h>
#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api_types.h>
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-
-#define vl_endianfun /* define message structures */
-#define vl_printfun
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h>
-#undef vl_endianfun
-#undef vl_printfun
-#undef vl_api_version
-
typedef struct
{
/* API message ID base */
u16 msg_id_base;
vat_main_t *vat_main;
-} export_test_main_t;
-
-static export_test_main_t export_test_main;
-
-#define foreach_standard_reply_retval_handler \
-_(vxlan_gpe_ioam_export_enable_disable_reply)
-
-#define _(n) \
- static void vl_api_##n##_t_handler \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = export_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 _
+} vxlan_gpe_ioam_export_test_main_t;
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg \
-_(VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE_REPLY, vxlan_gpe_ioam_export_enable_disable_reply)
+vxlan_gpe_ioam_export_test_main_t vxlan_gpe_ioam_export_test_main;
static int
api_vxlan_gpe_ioam_export_enable_disable (vat_main_t * vam)
@@ -105,58 +69,9 @@ api_vxlan_gpe_ioam_export_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 \
-_(vxlan_gpe_ioam_export_enable_disable, "<intfc> [disable]")
-
-static void
-vxlan_gpe_ioam_vat_api_hookup (vat_main_t * vam)
-{
- export_test_main_t *sm = &export_test_main;
- /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + sm->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 _
-}
-
-clib_error_t *
-vxlan_gpe_ioam_export_vat_plugin_register (vat_main_t * vam)
-{
- export_test_main_t *sm = &export_test_main;
- u8 *name;
-
- sm->vat_main = vam;
-
- name = format (0, "vxlan_gpe_ioam_export_%08x%c", api_version, 0);
- sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
- if (sm->msg_id_base != (u16) ~ 0)
- vxlan_gpe_ioam_vat_api_hookup (vam);
-
- vec_free (name);
-
- return 0;
-}
+/* Override generated plugin register symbol */
+#define vat_plugin_register vxlan_gpe_ioam_export_vat_plugin_register
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api_test.c>
/*
* fd.io coding-style-patch-verification: ON