qos: api cleanup

Use autogenerated code.
Does not change API definitions.

Type: improvement

Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: I39505763371c98b75ff7b697dacd3eeb0d41d40a

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index e92eee3..cc0e8c3 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -2018,7 +2018,6 @@ _(hw_interface_set_mtu_reply)                           \
 _(tcp_configure_src_addresses_reply)                   \
 _(session_rule_add_del_reply)                          \
 _(ip_container_proxy_add_del_reply)                     \
-_(qos_record_enable_disable_reply)                     \
 
 #define _(n)                                    \
     static void vl_api_##n##_t_handler          \
@@ -2163,7 +2162,6 @@ _(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply)               \
 _(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply)              \
 _(SESSION_RULES_DETAILS, session_rules_details)                                \
 _(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply)  \
-_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply)            \
 
 #define foreach_standalone_reply_msg                                   \
 _(SW_INTERFACE_EVENT, sw_interface_event)
@@ -9306,56 +9304,6 @@ api_ip_container_proxy_add_del (vat_main_t * vam)
   return ret;
 }
 
-static int
-api_qos_record_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_qos_record_enable_disable_t *mp;
-  u32 sw_if_index, qs = 0xff;
-  u8 sw_if_index_set = 0;
-  u8 enable = 1;
-  int ret;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-       sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-       sw_if_index_set = 1;
-      else if (unformat (i, "%U", unformat_qos_source, &qs))
-       ;
-      else if (unformat (i, "disable"))
-       enable = 0;
-      else
-       {
-         clib_warning ("parse error '%U'", format_unformat_error, i);
-         return -99;
-       }
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-  if (qs == 0xff)
-    {
-      errmsg ("input location must be specified");
-      return -99;
-    }
-
-  M (QOS_RECORD_ENABLE_DISABLE, mp);
-
-  mp->record.sw_if_index = ntohl (sw_if_index);
-  mp->record.input_source = qs;
-  mp->enable = enable;
-
-  S (mp);
-  W (ret);
-  return ret;
-}
-
-
 static int
 q_or_quit (vat_main_t * vam)
 {
@@ -10052,7 +10000,6 @@ _(session_rule_add_del, "[add|del] proto <tcp/udp> <lcl-ip>/<plen> "    \
   "<lcl-port> <rmt-ip>/<plen> <rmt-port> action <nn>")                 \
 _(session_rules_dump, "")                                              \
 _(ip_container_proxy_add_del, "[add|del] <address> <sw_if_index>")     \
-_(qos_record_enable_disable, "<record-source> <intfc> | sw_if_index <id> [disable]")
 
 /* List of command functions, CLI names map directly to functions */
 #define foreach_cli_function                                    \

diff --git a/src/vnet/qos/qos_api.c b/src/vnet/qos/qos_api.c
index af0a700..b8d98e6 100644 (file)
--- a/src/vnet/qos/qos_api.c
+++ b/src/vnet/qos/qos_api.c
@@ -24,35 +24,14 @@
 #include <vnet/qos/qos_mark.h>
 #include <vnet/qos/qos_egress_map.h>
 
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs            /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun           /* define message structures */
-#include <vnet/vnet_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 <vnet/vnet_all_api_h.h>
-#undef vl_printfun
+#include <vnet/format_fns.h>
+#include <vnet/qos/qos.api_enum.h>
+#include <vnet/qos/qos.api_types.h>
 
+#define REPLY_MSG_ID_BASE msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-
-#define foreach_qos_api_msg                                             \
-  _(QOS_RECORD_ENABLE_DISABLE, qos_record_enable_disable)               \
-  _(QOS_RECORD_DUMP, qos_record_dump)                                   \
-  _(QOS_STORE_ENABLE_DISABLE, qos_store_enable_disable)                 \
-  _(QOS_STORE_DUMP, qos_store_dump)                                     \
-  _(QOS_EGRESS_MAP_DELETE, qos_egress_map_delete)                       \
-  _(QOS_EGRESS_MAP_UPDATE, qos_egress_map_update)                       \
-  _(QOS_EGRESS_MAP_DUMP, qos_egress_map_dump)                           \
-  _(QOS_MARK_ENABLE_DISABLE, qos_mark_enable_disable)                   \
-  _(QOS_MARK_DUMP, qos_mark_dump)
+static u16 msg_id_base;
 
 static int
 qos_source_decode (vl_api_qos_source_t v, qos_source_t * q)
@@ -121,7 +100,7 @@ send_qos_record_details (u32 sw_if_index, qos_source_t input_source, void *c)
   ctx = c;
   mp = vl_msg_api_alloc_zero (sizeof (*mp));
 
-  mp->_vl_msg_id = ntohs (VL_API_QOS_RECORD_DETAILS);
+  mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_QOS_RECORD_DETAILS);
   mp->context = ctx->context;
   mp->record.sw_if_index = htonl (sw_if_index);
   mp->record.input_source = qos_source_encode (input_source);
@@ -188,7 +167,7 @@ send_qos_store_details (u32 sw_if_index,
   ctx = c;
   mp = vl_msg_api_alloc_zero (sizeof (*mp));
 
-  mp->_vl_msg_id = ntohs (VL_API_QOS_STORE_DETAILS);
+  mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_QOS_STORE_DETAILS);
   mp->context = ctx->context;
   mp->store.sw_if_index = htonl (sw_if_index);
   mp->store.input_source = qos_source_encode (input_source);
@@ -259,7 +238,7 @@ send_qos_egress_map_details (qos_egress_map_id_t id,
   ctx = c;
   mp = vl_msg_api_alloc_zero (sizeof (*mp));
 
-  mp->_vl_msg_id = ntohs (VL_API_QOS_EGRESS_MAP_DETAILS);
+  mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_QOS_EGRESS_MAP_DETAILS);
   mp->context = ctx->context;
   mp->map.id = htonl (id);
 
@@ -325,7 +304,7 @@ send_qos_mark_details (u32 sw_if_index,
   ctx = c;
   mp = vl_msg_api_alloc_zero (sizeof (*mp));
 
-  mp->_vl_msg_id = ntohs (VL_API_QOS_MARK_DETAILS);
+  mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_QOS_MARK_DETAILS);
   mp->context = ctx->context;
   mp->mark.sw_if_index = htonl (sw_if_index);
   mp->mark.output_source = qos_source_encode (output_source);
@@ -352,37 +331,15 @@ vl_api_qos_mark_dump_t_handler (vl_api_qos_mark_dump_t * mp)
   qos_mark_walk (send_qos_mark_details, &ctx);
 }
 
-#define vl_msg_name_crc_list
-#include <vnet/qos/qos.api.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_qos;
-#undef _
-}
+#include <vnet/qos/qos.api.c>
 
 static clib_error_t *
 qos_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = vlibapi_get_main ();
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #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_qos_api_msg;
-#undef _
-
   /*
    * Set up the (msg_name, crc, message-id) table
    */
-  setup_message_id_table (am);
+  REPLY_MSG_ID_BASE = setup_message_id_table ();
 
   return 0;
 }

diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
index d0b6135..802661f 100644 (file)
--- a/src/vnet/vnet_all_api_h.h
+++ b/src/vnet/vnet_all_api_h.h
@@ -44,7 +44,6 @@
 #include <vnet/srmpls/sr_mpls.api.h>
 #include <vnet/tcp/tcp.api.h>
 #include <vnet/ip/punt.api.h>
-#include <vnet/qos/qos.api.h>
 #include <vnet/syslog/syslog.api.h>
 #include <vnet/devices/virtio/virtio.api.h>