ioam: remove api boilerplate

Note: The VAT _test.c plugins need some more adjustments.

Type: refactor
Change-Id: Ifa150683d7d68db7950f66ef85eea73c8281ba14
Signed-off-by: Ole Troan <ot@cisco.com>

3 files changed, 5 insertions, 116 deletions

diff --git a/src/plugins/ioam/ip6/ioam_cache.c b/src/plugins/ioam/ip6/ioam_cache.c
index d315bc6c61c..74b50c9282e 100644
--- a/src/plugins/ioam/ip6/ioam_cache.c
+++ b/src/plugins/ioam/ip6/ioam_cache.c
@@ -29,38 +29,14 @@
 #include "ioam_cache.h"
 
 /* define message IDs */
-#include <ioam/ip6/ioam_cache_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/ip6/ioam_cache_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/ip6/ioam_cache_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <ioam/ip6/ioam_cache_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/ip6/ioam_cache_all_api_h.h>
-#undef vl_api_version
+#include <ioam/ip6/ioam_cache.api_enum.h>
+#include <ioam/ip6/ioam_cache.api_types.h>
 
 #define REPLY_MSG_ID_BASE cm->msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
 ioam_cache_main_t ioam_cache_main;
 
-/* List of message types that this plugin understands */
-#define foreach_ioam_cache_plugin_api_msg                        \
-_(IOAM_CACHE_IP6_ENABLE_DISABLE, ioam_cache_ip6_enable_disable)
-
 static u8 *
 ioam_e2e_id_trace_handler (u8 * s, ip6_hop_by_hop_option_t * opt)
 {
@@ -183,38 +159,6 @@ static void vl_api_ioam_cache_ip6_enable_disable_t_handler
   REPLY_MACRO (VL_API_IOAM_CACHE_IP6_ENABLE_DISABLE_REPLY);
 }
 
-/* Set up the API message handling tables */
-static clib_error_t *
-ioam_cache_plugin_api_hookup (vlib_main_t * vm)
-{
-  ioam_cache_main_t *sm = &ioam_cache_main;
-#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_ioam_cache_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <ioam/ip6/ioam_cache_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (ioam_cache_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_ioam_cache;
-#undef _
-}
-
 static clib_error_t *
 set_ioam_cache_command_fn (vlib_main_t * vm,
 			   unformat_input_t * input, vlib_cli_command_t * cmd)
@@ -368,29 +312,20 @@ VLIB_CLI_COMMAND (show_ioam_cache_command, static) =
     "show ioam ip6 cache [verbose]",.function = show_ioam_cache_command_fn};
 /* *INDENT_ON* */
 
+#include <ioam/ip6/ioam_cache.api.c>
 static clib_error_t *
 ioam_cache_init (vlib_main_t * vm)
 {
   vlib_node_t *node;
   ioam_cache_main_t *em = &ioam_cache_main;
-  clib_error_t *error = 0;
-  u8 *name;
   u32 cache_node_index = ioam_cache_node.index;
   u32 ts_node_index = ioam_cache_ts_node.index;
   vlib_node_t *ip6_hbyh_node = NULL, *ip6_hbh_pop_node = NULL, *error_node =
     NULL;
 
-  name = format (0, "ioam_cache_%08x%c", api_version, 0);
-
   clib_memset (&ioam_cache_main, 0, sizeof (ioam_cache_main));
   /* Ask for a correctly-sized block of API message decode slots */
-  em->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = ioam_cache_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (em, &api_main);
+  em->msg_id_base = setup_message_id_table ();
 
   /* Hook this node to ip6-hop-by-hop */
   ip6_hbyh_node = vlib_get_node_by_name (vm, (u8 *) "ip6-hop-by-hop");
@@ -412,9 +347,7 @@ ioam_cache_init (vlib_main_t * vm)
   node = vlib_get_node_by_name (vm, (u8 *) "ip6-add-syn-hop-by-hop");
   em->ip6_reset_ts_hbh_node_index = node->index;
 
-  vec_free (name);
-
-  return error;
+  return 0;
 }
 
 VLIB_INIT_FUNCTION (ioam_cache_init);
diff --git a/src/plugins/ioam/ip6/ioam_cache_all_api_h.h b/src/plugins/ioam/ip6/ioam_cache_all_api_h.h
deleted file mode 100644
index 61272a5187e..00000000000
--- a/src/plugins/ioam/ip6/ioam_cache_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <ioam/ip6/ioam_cache.api.h>
diff --git a/src/plugins/ioam/ip6/ioam_cache_msg_enum.h b/src/plugins/ioam/ip6/ioam_cache_msg_enum.h
deleted file mode 100644
index 8afd067b808..00000000000
--- a/src/plugins/ioam/ip6/ioam_cache_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_ioam_cache_msg_enum_h
-#define included_ioam_cache_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <ioam/ip6/ioam_cache_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_ioam_cache_msg_enum_h */