API refactoring : classify

Change-Id: Ib75197ef8e5057e7f0d9361a10705c3743d05333
Signed-off-by: Pavel Kotucek <pkotucek@cisco.com>

2 files changed, 3 insertions, 793 deletions

diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index 3afc3383..6e7e9c10 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -62,10 +62,7 @@
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vnet/classify/vnet_classify.h>
 #include <vnet/classify/input_acl.h>
-#include <vnet/classify/policer_classify.h>
-#include <vnet/classify/flow_classify.h>
 #include <vnet/l2/l2_classify.h>
 #include <vnet/vxlan/vxlan.h>
 #include <vnet/l2/l2_vtr.h>
@@ -139,8 +136,6 @@ _(CLI_REQUEST, cli_request)                                             \
 _(CLI_INBAND, cli_inband)						\
 _(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit)			\
 _(L2_PATCH_ADD_DEL, l2_patch_add_del)					\
-_(CLASSIFY_ADD_DEL_TABLE, classify_add_del_table)			\
-_(CLASSIFY_ADD_DEL_SESSION, classify_add_del_session)			\
 _(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table)     \
 _(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables)   \
 _(GET_NODE_INDEX, get_node_index)                                       \
@@ -165,13 +160,6 @@ _(IOAM_ENABLE, ioam_enable)                                             \
 _(IOAM_DISABLE, ioam_disable)                                           \
 _(POLICER_ADD_DEL, policer_add_del)                                     \
 _(POLICER_DUMP, policer_dump)                                           \
-_(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface)       \
-_(POLICER_CLASSIFY_DUMP, policer_classify_dump)                         \
-_(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
-_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface)             \
-_(CLASSIFY_TABLE_INFO,classify_table_info)                              \
-_(CLASSIFY_SESSION_DUMP,classify_session_dump)                          \
-_(CLASSIFY_SESSION_DETAILS,classify_session_details)                    \
 _(SET_IPFIX_EXPORTER, set_ipfix_exporter)                               \
 _(IPFIX_EXPORTER_DUMP, ipfix_exporter_dump)                             \
 _(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream)                 \
@@ -189,8 +177,6 @@ _(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,                     \
 _(DELETE_SUBIF, delete_subif)                                           \
 _(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)           \
 _(PUNT, punt)                                                           \
-_(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
-_(FLOW_CLASSIFY_DUMP, flow_classify_dump)                               \
 _(FEATURE_ENABLE_DISABLE, feature_enable_disable)
 
 #define QUOTE_(x) #x
@@ -1412,99 +1398,6 @@ vl_api_set_arp_neighbor_limit_t_handler (vl_api_set_arp_neighbor_limit_t * mp)
   REPLY_MACRO (VL_API_SET_ARP_NEIGHBOR_LIMIT_REPLY);
 }
 
-#define foreach_classify_add_del_table_field    \
-_(table_index)                                  \
-_(nbuckets)                                     \
-_(memory_size)                                  \
-_(skip_n_vectors)                               \
-_(match_n_vectors)                              \
-_(next_table_index)                             \
-_(miss_next_index)                              \
-_(current_data_flag)                            \
-_(current_data_offset)
-
-static void vl_api_classify_add_del_table_t_handler
-  (vl_api_classify_add_del_table_t * mp)
-{
-  vl_api_classify_add_del_table_reply_t *rmp;
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vnet_classify_table_t *t;
-  int rv;
-
-#define _(a) u32 a;
-  foreach_classify_add_del_table_field;
-#undef _
-
-#define _(a) a = ntohl(mp->a);
-  foreach_classify_add_del_table_field;
-#undef _
-
-  /* The underlying API fails silently, on purpose, so check here */
-  if (mp->is_add == 0)		/* delete */
-    {
-      if (pool_is_free_index (cm->tables, table_index))
-	{
-	  rv = VNET_API_ERROR_NO_SUCH_TABLE;
-	  goto out;
-	}
-    }
-  else				/* add or update */
-    {
-      if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
-	table_index = ~0;
-    }
-
-  rv = vnet_classify_add_del_table
-    (cm, mp->mask, nbuckets, memory_size,
-     skip_n_vectors, match_n_vectors,
-     next_table_index, miss_next_index, &table_index,
-     current_data_flag, current_data_offset, mp->is_add, mp->del_chain);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CLASSIFY_ADD_DEL_TABLE_REPLY,
-  ({
-    if (rv == 0 && mp->is_add)
-      {
-        t = pool_elt_at_index (cm->tables, table_index);
-        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
-        rmp->match_n_vectors = ntohl(t->match_n_vectors);
-        rmp->new_table_index = ntohl(table_index);
-      }
-    else
-      {
-        rmp->skip_n_vectors = ~0;
-        rmp->match_n_vectors = ~0;
-        rmp->new_table_index = ~0;
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static void vl_api_classify_add_del_session_t_handler
-  (vl_api_classify_add_del_session_t * mp)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vl_api_classify_add_del_session_reply_t *rmp;
-  int rv;
-  u32 table_index, hit_next_index, opaque_index, metadata;
-  i32 advance;
-  u8 action;
-
-  table_index = ntohl (mp->table_index);
-  hit_next_index = ntohl (mp->hit_next_index);
-  opaque_index = ntohl (mp->opaque_index);
-  advance = ntohl (mp->advance);
-  action = mp->action;
-  metadata = ntohl (mp->metadata);
-
-  rv = vnet_classify_add_del_session
-    (cm, table_index, mp->match, hit_next_index, opaque_index,
-     advance, action, metadata, mp->is_add);
-
-  REPLY_MACRO (VL_API_CLASSIFY_ADD_DEL_SESSION_REPLY);
-}
-
 static void vl_api_classify_set_interface_ip_table_t_handler
   (vl_api_classify_set_interface_ip_table_t * mp)
 {
@@ -2528,288 +2421,6 @@ vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
     }
 }
 
-static void
-  vl_api_policer_classify_set_interface_t_handler
-  (vl_api_policer_classify_set_interface_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_policer_classify_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  l2_table_index = ntohl (mp->l2_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_policer_classify_intfc (vm, sw_if_index, ip4_table_index,
-					ip6_table_index, l2_table_index,
-					mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_POLICER_CLASSIFY_SET_INTERFACE_REPLY);
-}
-
-static void
-send_policer_classify_details (u32 sw_if_index,
-			       u32 table_index,
-			       unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_policer_classify_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_POLICER_CLASSIFY_DETAILS);
-  mp->context = context;
-  mp->sw_if_index = htonl (sw_if_index);
-  mp->table_index = htonl (table_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_policer_classify_dump_t_handler (vl_api_policer_classify_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  policer_classify_main_t *pcm = &policer_classify_main;
-  u32 *vec_tbl;
-  int i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
-
-  if (vec_len (vec_tbl))
-    {
-      for (i = 0; i < vec_len (vec_tbl); i++)
-	{
-	  if (vec_elt (vec_tbl, i) == ~0)
-	    continue;
-
-	  send_policer_classify_details (i, vec_elt (vec_tbl, i), q,
-					 mp->context);
-	}
-    }
-}
-
-static void
-vl_api_classify_table_ids_t_handler (vl_api_classify_table_ids_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vnet_classify_table_t *t;
-  u32 *table_ids = 0;
-  u32 count;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    vec_add1 (table_ids, ntohl(t - cm->tables));
-  }));
-  /* *INDENT-ON* */
-  count = vec_len (table_ids);
-
-  vl_api_classify_table_ids_reply_t *rmp;
-  rmp = vl_msg_api_alloc_as_if_client (sizeof (*rmp) + count * sizeof (u32));
-  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_IDS_REPLY);
-  rmp->context = mp->context;
-  rmp->count = ntohl (count);
-  clib_memcpy (rmp->ids, table_ids, count * sizeof (u32));
-  rmp->retval = 0;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-
-  vec_free (table_ids);
-}
-
-static void
-  vl_api_classify_table_by_interface_t_handler
-  (vl_api_classify_table_by_interface_t * mp)
-{
-  vl_api_classify_table_by_interface_reply_t *rmp;
-  int rv = 0;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 *acl = 0;
-
-  vec_validate (acl, INPUT_ACL_N_TABLES - 1);
-  vec_set (acl, ~0);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  input_acl_main_t *am = &input_acl_main;
-
-  int if_idx;
-  u32 type;
-
-  for (type = 0; type < INPUT_ACL_N_TABLES; type++)
-    {
-      u32 *vec_tbl = am->classify_table_index_by_sw_if_index[type];
-      if (vec_len (vec_tbl))
-	{
-	  for (if_idx = 0; if_idx < vec_len (vec_tbl); if_idx++)
-	    {
-	      if (vec_elt (vec_tbl, if_idx) == ~0 || sw_if_index != if_idx)
-		{
-		  continue;
-		}
-	      acl[type] = vec_elt (vec_tbl, if_idx);
-	    }
-	}
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CLASSIFY_TABLE_BY_INTERFACE_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(sw_if_index);
-    rmp->l2_table_id = ntohl(acl[INPUT_ACL_TABLE_L2]);
-    rmp->ip4_table_id = ntohl(acl[INPUT_ACL_TABLE_IP4]);
-    rmp->ip6_table_id = ntohl(acl[INPUT_ACL_TABLE_IP6]);
-  }));
-  /* *INDENT-ON* */
-  vec_free (acl);
-}
-
-static void
-vl_api_classify_table_info_t_handler (vl_api_classify_table_info_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vl_api_classify_table_info_reply_t *rmp = 0;
-
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 table_id = ntohl (mp->table_id);
-  vnet_classify_table_t *t;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    if (table_id == t - cm->tables)
-      {
-        rmp = vl_msg_api_alloc_as_if_client
-          (sizeof (*rmp) + t->match_n_vectors * sizeof (u32x4));
-        rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_INFO_REPLY);
-        rmp->context = mp->context;
-        rmp->table_id = ntohl(table_id);
-        rmp->nbuckets = ntohl(t->nbuckets);
-        rmp->match_n_vectors = ntohl(t->match_n_vectors);
-        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
-        rmp->active_sessions = ntohl(t->active_elements);
-        rmp->next_table_index = ntohl(t->next_table_index);
-        rmp->miss_next_index = ntohl(t->miss_next_index);
-        rmp->mask_length = ntohl(t->match_n_vectors * sizeof (u32x4));
-        clib_memcpy(rmp->mask, t->mask, t->match_n_vectors * sizeof(u32x4));
-        rmp->retval = 0;
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  if (rmp == 0)
-    {
-      rmp = vl_msg_api_alloc (sizeof (*rmp));
-      rmp->_vl_msg_id = ntohs ((VL_API_CLASSIFY_TABLE_INFO_REPLY));
-      rmp->context = mp->context;
-      rmp->retval = ntohl (VNET_API_ERROR_CLASSIFY_TABLE_NOT_FOUND);
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t *
-					   mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_classify_session_details (unix_shared_memory_queue_t * q,
-			       u32 table_id,
-			       u32 match_length,
-			       vnet_classify_entry_t * e, u32 context)
-{
-  vl_api_classify_session_details_t *rmp;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_SESSION_DETAILS);
-  rmp->context = context;
-  rmp->table_id = ntohl (table_id);
-  rmp->hit_next_index = ntohl (e->next_index);
-  rmp->advance = ntohl (e->advance);
-  rmp->opaque_index = ntohl (e->opaque_index);
-  rmp->match_length = ntohl (match_length);
-  clib_memcpy (rmp->match, e->key, match_length);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_classify_session_dump_t_handler (vl_api_classify_session_dump_t * mp)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  unix_shared_memory_queue_t *q;
-
-  u32 table_id = ntohl (mp->table_id);
-  vnet_classify_table_t *t;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    if (table_id == t - cm->tables)
-      {
-        vnet_classify_bucket_t * b;
-        vnet_classify_entry_t * v, * save_v;
-        int i, j, k;
-
-        for (i = 0; i < t->nbuckets; i++)
-          {
-            b = &t->buckets [i];
-            if (b->offset == 0)
-              continue;
-
-            save_v = vnet_classify_get_entry (t, b->offset);
-            for (j = 0; j < (1<<b->log2_pages); j++)
-              {
-                for (k = 0; k < t->entries_per_page; k++)
-                  {
-                    v = vnet_classify_entry_at_index
-                      (t, save_v, j*t->entries_per_page + k);
-                    if (vnet_classify_entry_is_free (v))
-                      continue;
-
-                    send_classify_session_details
-                      (q, table_id, t->match_n_vectors * sizeof (u32x4),
-                       v, mp->context);
-                  }
-              }
-          }
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-}
 
 static void
 vl_api_set_ipfix_exporter_t_handler (vl_api_set_ipfix_exporter_t * mp)
@@ -3400,73 +3011,6 @@ vl_api_punt_t_handler (vl_api_punt_t * mp)
 }
 
 static void
-  vl_api_flow_classify_set_interface_t_handler
-  (vl_api_flow_classify_set_interface_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_flow_classify_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_flow_classify_intfc (vm, sw_if_index, ip4_table_index,
-				     ip6_table_index, mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_FLOW_CLASSIFY_SET_INTERFACE_REPLY);
-}
-
-static void
-send_flow_classify_details (u32 sw_if_index,
-			    u32 table_index,
-			    unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_flow_classify_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_FLOW_CLASSIFY_DETAILS);
-  mp->context = context;
-  mp->sw_if_index = htonl (sw_if_index);
-  mp->table_index = htonl (table_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_flow_classify_dump_t_handler (vl_api_flow_classify_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  flow_classify_main_t *pcm = &flow_classify_main;
-  u32 *vec_tbl;
-  int i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
-
-  if (vec_len (vec_tbl))
-    {
-      for (i = 0; i < vec_len (vec_tbl); i++)
-	{
-	  if (vec_elt (vec_tbl, i) == ~0)
-	    continue;
-
-	  send_flow_classify_details (i, vec_elt (vec_tbl, i), q,
-				      mp->context);
-	}
-    }
-}
-
-static void
 vl_api_feature_enable_disable_t_handler (vl_api_feature_enable_disable_t * mp)
 {
   vl_api_feature_enable_disable_reply_t *rmp;
diff --git a/src/vpp/api/vpe.api b/src/vpp/api/vpe.api
index e784fa01..a9b34d1f 100644
--- a/src/vpp/api/vpe.api
+++ b/src/vpp/api/vpe.api
@@ -26,7 +26,7 @@
  * IP APIs: see .../src/vnet/ip/{ip.api, ip_api.c}
  * TAP APIs: see .../src/vnet/unix/{tap.api, tap_api.c}
  * VXLAN APIs: see .../src/vnet/vxlan/{vxlan.api, vxlan_api.c}
- * AF-PACKET APIs: ... see /vnet/devices/af_packet/{af_packet.api, af_packet_api.c}
+ * AF-PACKET APIs: see ... /vnet/devices/af_packet/{af_packet.api, af_packet_api.c}
  * NETMAP APIs: see ... /src/vnet/devices/netmap/{netmap.api, netmap_api.c}
  * VHOST-USER APIs: see .../vnet/devices/virtio/{vhost_user.api, vhost_user_api.c}
  * VXLAN GPE APIs: see .../src/vnet/vxlan-gpe/{vxlan_gpe.api, vxlan_gpe_api.c}
@@ -40,7 +40,8 @@
  * LISP-GPE APIs: see .../src/vnet/lisp-gpe/{lisp_gpe.api, lisp_gpe_api.c}
  * MPLS APIs: see .../src/vnet/mpls/{mpls.api, mpls_api.c}
  * SR APIs: see .../src/vnet/sr/{sr.api, sr_api.c}
- * DPDK APIs: ... see /src/vnet/devices/dpdk/{dpdk.api, dpdk_api.c}
+ * DPDK APIs: see ... /src/vnet/devices/dpdk/{dpdk.api, dpdk_api.c}
+ * CLASSIFY APIs: see ... /src/vnet/classify/{classify.api, classify_api.c}
  */
 
 /** \brief Create a new subinterface with the given vlan id
@@ -685,109 +686,6 @@ define bd_ip_mac_add_del_reply
   i32 retval;
 };
 
-/** \brief Add/Delete classification table request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add- if non-zero add the table, else delete it
-    @param del_chain - if non-zero delete the whole chain of tables
-    @param table_index - if add, reuturns index of the created table, else specifies the table to delete  
-    @param nbuckets - number of buckets when adding a table
-    @param memory_size - memory size when adding a table
-    @param match_n_vectors - number of match vectors
-    @param next_table_index - index of next table
-    @param miss_next_index - index of miss table
-    @param current_data_flag - option to use current node's packet payload
-            as the starting point from where packets are classified,
-            This option is only valid for L2/L3 input ACL for now.
-            0: by default, classify data from the buffer's start location
-            1: classify packets from VPP node’s current data pointer
-    @param current_data_offset - a signed value to shift the start location of
-            the packet to be classified
-            For example, if input IP ACL node is used, L2 header’s first byte
-            can be accessible by configuring current_data_offset to -14
-            if there is no vlan tag.
-            This is valid only if current_data_flag is set to 1.
-    @param mask[] - match mask
-*/
-define classify_add_del_table
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 del_chain;
-  u32 table_index;
-  u32 nbuckets;
-  u32 memory_size;
-  u32 skip_n_vectors;
-  u32 match_n_vectors;
-  u32 next_table_index;
-  u32 miss_next_index;
-  u32 current_data_flag;
-  i32 current_data_offset;
-  u8 mask[0];
-};
-
-/** \brief Add/Delete classification table response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the table add/del requst
-    @param new_table_index - for add, returned index of the new table
-    @param skip_n_vectors - for add, returned value of skip_n_vectors in table
-    @param match_n_vectors -for add, returned value of match_n_vectors in table
-*/
-define classify_add_del_table_reply
-{
-  u32 context;
-  i32 retval;
-  u32 new_table_index;
-  u32 skip_n_vectors;
-  u32 match_n_vectors;
-};
-
-/** \brief Classify add / del session request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add session if non-zero, else delete
-    @param table_index - index of the table to add/del the session, required
-    @param hit_next_index - for add, hit_next_index of new session, required
-    @param opaque_index - for add, opaque_index of new session
-    @param advance -for add, advance value for session
-    @param action -
-           0: no action (by default)
-              metadata is not used.
-           1: Classified IP packets will be looked up from the
-              specified ipv4 fib table (configured by metadata as VRF id).
-              Only valid for L3 input ACL node
-           2: Classified IP packets will be looked up from the
-              specified ipv6 fib table (configured by metadata as VRF id).
-              Only valid for L3 input ACL node
-    @param metadata - valid only if action != 0
-           VRF id if action is 1 or 2.
-    @param match[] - for add, match value for session, required
-*/
-define classify_add_del_session
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u32 table_index;
-  u32 hit_next_index;
-  u32 opaque_index;
-  i32 advance;
-  u8 action;
-  u32 metadata;
-  u8 match[0];
-};
-
-/** \brief Classify add / del session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the add/del session request
-*/
-define classify_add_del_session_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set/unset the classification table for an interface request 
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -1491,187 +1389,6 @@ define policer_details
   u64 last_update_time;
 };
 
-/** \brief Set/unset policer classify interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to set/unset policer classify
-    @param ip4_table_index - ip4 classify table index (~0 for skip)
-    @param ip6_table_index - ip6 classify table index (~0 for skip)
-    @param l2_table_index  -  l2 classify table index (~0 for skip)
-    @param is_add - Set if non-zero, else unset
-    Note: User is recommeneded to use just one valid table_index per call.
-          (ip4_table_index, ip6_table_index, or l2_table_index)
-*/
-define policer_classify_set_interface
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 ip4_table_index;
-  u32 ip6_table_index;
-  u32 l2_table_index;
-  u8 is_add;
-};
-
-/** \brief Set/unset policer classify interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define policer_classify_set_interface_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get list of policer classify interfaces and tables
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param type - classify table type
-*/
-define policer_classify_dump
-{
-  u32 client_index;
-  u32 context;
-  u8 type;
-};
-
-/** \brief Policer iclassify operational state response.
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - software interface index
-    @param table_index - classify table index
-*/
-define policer_classify_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u32 table_index;
-};
-
-/** \brief Classify get table IDs request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define classify_table_ids
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for classify get table IDs request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param ids - array of classify table ids
-*/
-define classify_table_ids_reply
-{
-  u32 context;
-  i32 retval;
-  u32 count;
-  u32 ids[count];
-};
-
-/** \brief Classify table ids by interface index request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface
-*/
-define classify_table_by_interface
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-/** \brief Reply for classify table id by interface index request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param sw_if_index - index of the interface
-    @param l2_table_id - l2 classify table index
-    @param ip4_table_id - ip4 classify table index
-    @param ip6_table_id - ip6 classify table index
-*/
-define classify_table_by_interface_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-  u32 l2_table_id;
-  u32 ip4_table_id;
-  u32 ip6_table_id;
-};
-
-/** \brief Classify table info
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param table_id - classify table index
-*/
-define classify_table_info
-{
-  u32 client_index;
-  u32 context;
-  u32 table_id;
-};
-
-/** \brief Reply for classify table info request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param table_id - classify table index
-    @param nbuckets - number of buckets when adding a table
-    @param match_n_vectors - number of match vectors
-    @param skip_n_vectors - number of skip_n_vectors
-    @param active_sessions - number of sessions (active entries)
-    @param next_table_index - index of next table
-    @param miss_next_index - index of miss table
-    @param mask[] - match mask
-*/
-define classify_table_info_reply
-{
-  u32 context;
-  i32 retval;
-  u32 table_id;
-  u32 nbuckets;
-  u32 match_n_vectors;
-  u32 skip_n_vectors;
-  u32 active_sessions;
-  u32 next_table_index;
-  u32 miss_next_index;
-  u32 mask_length;
-  u8 mask[mask_length];
-};
-
-/** \brief Classify sessions dump request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param table_id - classify table index
-*/
-define classify_session_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 table_id;
-};
-
-/** \brief Reply for classify table session dump request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param table_id - classify table index
-    @param hit_next_index - hit_next_index of session
-    @param opaque_index - for add, opaque_index of session
-    @param advance - advance value of session
-    @param match[] - match value for session
-*/
-define classify_session_details
-{
-  u32 context;
-  i32 retval;
-  u32 table_id;
-  u32 hit_next_index;
-  i32 advance;
-  u32 opaque_index;
-  u32 match_length;
-  u8 match[match_length];
-};
-
 /** \brief Configure IPFIX exporter process request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -1825,57 +1542,6 @@ define ipfix_classify_table_details {
     u8 transport_protocol;
 };
 
-/** \brief Set/unset flow classify interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to set/unset flow classify
-    @param ip4_table_index - ip4 classify table index (~0 for skip)
-    @param ip6_table_index - ip6 classify table index (~0 for skip)
-    @param l2_table_index  -  l2 classify table index (~0 for skip)
-    @param is_add - Set if non-zero, else unset
-    Note: User is recommeneded to use just one valid table_index per call.
-          (ip4_table_index, ip6_table_index, or l2_table_index)
-*/
-define flow_classify_set_interface {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 ip4_table_index;
-    u32 ip6_table_index;
-    u8  is_add;
-};
-
-/** \brief Set/unset flow classify interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define flow_classify_set_interface_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief Get list of flow classify interfaces and tables
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param type - classify table type
-*/
-define flow_classify_dump {
-    u32 client_index;
-    u32 context;
-    u8 type;
-};
-
-/** \brief Flow classify operational state response.
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - software interface index
-    @param table_index - classify table index
-*/
-define flow_classify_details {
-    u32 context;
-    u32 sw_if_index;
-    u32 table_index;
-};
-
 /** \brief Query relative index via node names
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request