lisp: Move to plugin

Type: refactor

Change-Id: I54df533a8f863c4e49742903cf2457f18b4fc506
Signed-off-by: Neale Ranns <nranns@cisco.com>

1 files changed, 7 insertions, 405 deletions

diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index b17e7ded2b2..4a2c2cb7838 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -38,7 +38,6 @@
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vnet/lisp-cp/lisp_types.h>
 #include <vnet/qos/qos_types.h>
 
 #include <vnet/ethernet/ethernet.h>
@@ -2523,364 +2522,6 @@ static void *vl_api_ip_source_and_port_range_check_interface_add_del_t_print
   FINISH;
 }
 
-static void *vl_api_lisp_enable_disable_t_print
-  (vl_api_lisp_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_enable_disable %s",
-	      mp->is_enable ? "enable" : "disable");
-
-  FINISH;
-}
-
-static void *vl_api_gpe_add_del_iface_t_print
-  (vl_api_gpe_add_del_iface_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: gpe_add_del_iface ");
-
-  s = format (s, "%s ", mp->is_add ? "up" : "down");
-  s = format (s, "vni %d ", mp->vni);
-  s = format (s, "%s %d ", mp->is_l2 ? "bd_id" : "table_id", mp->dp_table);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_pitr_set_locator_set_t_print
-  (vl_api_lisp_pitr_set_locator_set_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_pitr_set_locator_set ");
-
-  if (mp->is_add)
-    s = format (s, "locator-set %s ", mp->ls_name);
-  else
-    s = format (s, "del");
-
-  FINISH;
-}
-
-static u8 *
-format_nsh_address_vat (u8 * s, va_list * args)
-{
-  nsh_t *a = va_arg (*args, nsh_t *);
-  return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si);
-}
-
-static u8 *
-format_lisp_flat_eid (u8 * s, va_list * args)
-{
-  vl_api_eid_t *eid = va_arg (*args, vl_api_eid_t *);
-
-  switch (eid->type)
-    {
-    case EID_TYPE_API_PREFIX:
-      if (eid->address.prefix.address.af)
-	return format (s, "%U/%d", format_ip6_address,
-		       eid->address.prefix.address.un.ip6,
-		       eid->address.prefix.len);
-      return format (s, "%U/%d", format_ip4_address,
-		     eid->address.prefix.address.un.ip4,
-		     eid->address.prefix.len);
-    case EID_TYPE_API_MAC:
-      return format (s, "%U", format_ethernet_address, eid->address.mac);
-    case EID_TYPE_API_NSH:
-      return format (s, "%U", format_nsh_address_vat, eid->address.nsh);
-    }
-  return 0;
-}
-
-static void *vl_api_lisp_add_del_remote_mapping_t_print
-  (vl_api_lisp_add_del_remote_mapping_t * mp, void *handle)
-{
-  u8 *s;
-  u32 rloc_num = 0;
-
-  s = format (0, "SCRIPT: lisp_add_del_remote_mapping ");
-
-  if (mp->del_all)
-    s = format (s, "del-all ");
-
-  s = format (s, "%s ", mp->is_add ? "add" : "del");
-  s = format (s, "vni %d ", (mp->vni));
-
-  s = format (s, "eid %U ", format_lisp_flat_eid, &mp->deid);
-
-  if (mp->is_src_dst)
-    {
-      s = format (s, "seid %U ", format_lisp_flat_eid, &mp->seid);
-    }
-  rloc_num = (mp->rloc_num);
-
-  if (0 == rloc_num)
-    s = format (s, "action %d", mp->action);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_adjacency_t_print
-  (vl_api_lisp_add_del_adjacency_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_adjacency ");
-
-  s = format (s, "%s ", mp->is_add ? "add" : "del");
-  s = format (s, "vni %d ", (mp->vni));
-  s = format (s, "reid %U leid %U ",
-	      format_lisp_flat_eid, &mp->reid, format_lisp_flat_eid,
-	      &mp->leid);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_map_request_itr_rlocs_t_print
-  (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_map_request_itr_rlocs ");
-
-  if (mp->is_add)
-    s = format (s, "%s", mp->locator_set_name);
-  else
-    s = format (s, "del");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_eid_table_add_del_map_t_print
-  (vl_api_lisp_eid_table_add_del_map_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_eid_table_add_del_map ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  s = format (s, "vni %d ", (mp->vni));
-  s = format (s, "%s %d ", mp->is_l2 ? "bd_index" : "vrf", (mp->dp_table));
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_local_eid_t_print
-  (vl_api_lisp_add_del_local_eid_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_local_eid ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  s = format (s, "vni %d ", (mp->vni));
-  s = format (s, "eid %U ", format_lisp_flat_eid, &mp->eid);
-  s = format (s, "locator-set %s ", mp->locator_set_name);
-  if (mp->key.id)
-    {
-      u32 key_id = mp->key.id;
-      s = format (s, "key-id %U", format_hmac_key_id, key_id);
-      s = format (s, "secret-key %s", mp->key.key);
-    }
-  FINISH;
-}
-
-static void *vl_api_gpe_add_del_fwd_entry_t_print
-  (vl_api_gpe_add_del_fwd_entry_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: gpe_add_del_fwd_entry TODO");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_map_resolver_t_print
-  (vl_api_lisp_add_del_map_resolver_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_map_resolver ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  if (mp->ip_address.af)
-    s = format (s, "%U ", format_ip6_address, mp->ip_address.un.ip6);
-  else
-    s = format (s, "%U ", format_ip4_address, mp->ip_address.un.ip4);
-
-  FINISH;
-}
-
-static void *vl_api_gpe_enable_disable_t_print
-  (vl_api_gpe_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: gpe_enable_disable ");
-
-  s = format (s, "%s ", mp->is_enable ? "enable" : "disable");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_locator_set_t_print
-  (vl_api_lisp_add_del_locator_set_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_locator_set ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  s = format (s, "locator-set %s ", mp->locator_set_name);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_locator_t_print
-  (vl_api_lisp_add_del_locator_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_locator ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  s = format (s, "locator-set %s ", mp->locator_set_name);
-  s = format (s, "sw_if_index %d ", mp->sw_if_index);
-  s = format (s, "p %d w %d ", mp->priority, mp->weight);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_locator_set_dump_t_print
-  (vl_api_lisp_locator_set_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_locator_set_dump ");
-  if (mp->filter == 1)
-    s = format (s, "local");
-  else if (mp->filter == 2)
-    s = format (s, "remote");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_locator_dump_t_print
-  (vl_api_lisp_locator_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_locator_dump ");
-  if (mp->is_index_set)
-    s = format (s, "ls_index %d", (mp->ls_index));
-  else
-    s = format (s, "ls_name %s", mp->ls_name);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_map_request_mode_t_print
-  (vl_api_lisp_map_request_mode_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_map_request_mode ");
-
-  s = mp->is_src_dst ? format (s, "src-dst") : format (s, "dst-only");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_eid_table_dump_t_print
-  (vl_api_lisp_eid_table_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_eid_table_dump ");
-
-  if (mp->eid_set)
-    {
-      s = format (s, "vni %d ", (mp->vni));
-      s = format (s, "eid %U ", format_lisp_flat_eid, &mp->eid);
-      switch (mp->filter)
-	{
-	case 1:
-	  s = format (s, "local ");
-	  break;
-	case 2:
-	  s = format (s, "remote ");
-	  break;
-	default:
-	  break;
-	}
-    }
-  FINISH;
-}
-
-static void *vl_api_lisp_rloc_probe_enable_disable_t_print
-  (vl_api_lisp_rloc_probe_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable ");
-  if (mp->is_enable)
-    s = format (s, "enable");
-  else
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_map_register_enable_disable_t_print
-  (vl_api_lisp_map_register_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_map_register_enable_disable ");
-  if (mp->is_enable)
-    s = format (s, "enable");
-  else
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_adjacencies_get_t_print
-  (vl_api_lisp_adjacencies_get_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_adjacencies_get ");
-  s = format (s, "vni %d", (mp->vni));
-
-  FINISH;
-}
-
-static void *vl_api_lisp_eid_table_map_dump_t_print
-  (vl_api_lisp_eid_table_map_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_eid_table_map_dump ");
-
-  if (mp->is_l2)
-    s = format (s, "l2");
-  else
-    s = format (s, "l3");
-
-  FINISH;
-}
-
 static void *vl_api_ipsec_tunnel_if_add_del_t_print
   (vl_api_ipsec_tunnel_if_add_del_t * mp, void *handle)
 {
@@ -2923,6 +2564,13 @@ static void *vl_api_ipsec_tunnel_if_add_del_t_print
   FINISH;
 }
 
+/* static u8 * */
+/* format_nsh_address_vat (u8 * s, va_list * args) */
+/* { */
+/*   nsh_t *a = va_arg (*args, nsh_t *); */
+/*   return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); */
+/* } */
+
 static const char *policy_strs[] = {
   "BYPASS",
   "DISCARD",
@@ -3381,24 +3029,6 @@ static void * vl_api_ ## f ## _t_print          \
 foreach_no_print_function;
 #undef _
 
-#define foreach_custom_print_no_arg_function                            \
-_(lisp_eid_table_vni_dump)                                              \
-_(lisp_map_resolver_dump)                                               \
-_(lisp_map_server_dump)                                                 \
-_(show_lisp_rloc_probe_state)                                           \
-_(show_lisp_map_register_state)                                         \
-_(show_lisp_map_request_mode)
-
-#define _(f)                                                            \
-static void * vl_api_ ## f ## _t_print                                  \
-  (vl_api_ ## f ## _t * mp, void * handle)                              \
-{                                                                       \
-  u8 * s;                                                               \
-  s = format (0, "SCRIPT: " #f );                                       \
-  FINISH;                                                               \
-}
-foreach_custom_print_no_arg_function;
-#undef _
 #define foreach_custom_print_function                                   \
 _(CREATE_LOOPBACK, create_loopback)                                     \
 _(CREATE_LOOPBACK_INSTANCE, create_loopback_instance)                   \
@@ -3525,34 +3155,6 @@ _(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,                               \
   ip_source_and_port_range_check_add_del)                               \
 _(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,                     \
   ip_source_and_port_range_check_interface_add_del)                     \
-_(LISP_ENABLE_DISABLE, lisp_enable_disable)                             \
-_(GPE_ENABLE_DISABLE, gpe_enable_disable)                               \
-_(GPE_ADD_DEL_IFACE, gpe_add_del_iface)                                 \
-_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set)                 \
-_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode)                         \
-_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode)               \
-_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping)             \
-_(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency)                       \
-_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS,                                   \
-  lisp_add_del_map_request_itr_rlocs)                                   \
-_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map)               \
-_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid)                       \
-_(GPE_ADD_DEL_FWD_ENTRY, gpe_add_del_fwd_entry)                         \
-_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set)                   \
-_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver)                 \
-_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator)                           \
-_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump)                             \
-_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump)                     \
-_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump)                     \
-_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump)                       \
-_(LISP_MAP_SERVER_DUMP, lisp_map_server_dump)                           \
-_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)                         \
-_(LISP_LOCATOR_DUMP, lisp_locator_dump)                                 \
-_(LISP_ADJACENCIES_GET, lisp_adjacencies_get)                           \
-_(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state)               \
-_(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state)           \
-_(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable)       \
-_(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable)   \
 _(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd)		\
 _(IPSEC_SAD_ENTRY_ADD_DEL, ipsec_sad_entry_add_del)			\
 _(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del)					\