API: Cleaning up message naming that does not follow the conventions

is_address_reachable - Disabled so deleted
cli_request - Renamed to cli
vnet_summary_stats_reply - Renamed to vnet_get_summary_stats_reply
bridge_domain_sw_if_details - Deleted, incorporated in main message
l2_fib_table_entry - Renamed to l2_fib_table_details

Change-Id: I93b7e8769a3ba7b4989b3c270270f575f386464f
Signed-off-by: Ole Troan <ot@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Signed-off-by: Ole Troan <ot@cisco.com>

4 files changed, 13 insertions, 109 deletions

diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index 7e4c341e..60eb5331 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -104,7 +104,6 @@
 #define foreach_vpe_api_msg                                             \
 _(WANT_OAM_EVENTS, want_oam_events)                                     \
 _(OAM_ADD_DEL, oam_add_del)                                             \
-_(IS_ADDRESS_REACHABLE, is_address_reachable)                           \
 _(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable)           \
 _(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath)                       \
 _(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect)           \
@@ -118,7 +117,7 @@ _(RESET_FIB, reset_fib)							\
 _(CREATE_LOOPBACK, create_loopback)					\
 _(CREATE_LOOPBACK_INSTANCE, create_loopback_instance)			\
 _(CONTROL_PING, control_ping)                                           \
-_(CLI_REQUEST, cli_request)                                             \
+_(CLI, cli)                                                             \
 _(CLI_INBAND, cli_inband)						\
 _(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit)			\
 _(L2_PATCH_ADD_DEL, l2_patch_add_del)					\
@@ -694,82 +693,6 @@ out:
 }
 
 static void
-vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t * mp)
-{
-#if 0
-  vpe_main_t *rm = &vpe_main;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  ip_lookup_main_t *lm;
-  union
-  {
-    ip4_address_t ip4;
-    ip6_address_t ip6;
-  } addr;
-  u32 adj_index, sw_if_index;
-  vl_api_is_address_reachable_t *rmp;
-  ip_adjacency_t *adj;
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    {
-      increment_missing_api_client_counter (rm->vlib_main);
-      return;
-    }
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  clib_memcpy (rmp, mp, sizeof (*rmp));
-
-  sw_if_index = mp->next_hop_sw_if_index;
-  clib_memcpy (&addr, mp->address, sizeof (addr));
-  if (mp->is_ipv6)
-    {
-      lm = &im6->lookup_main;
-      adj_index = ip6_fib_lookup (im6, sw_if_index, &addr.ip6);
-    }
-  else
-    {
-      lm = &im4->lookup_main;
-      // FIXME NOT an ADJ
-      adj_index = ip4_fib_lookup (im4, sw_if_index, &addr.ip4);
-    }
-  if (adj_index == ~0)
-    {
-      rmp->is_error = 1;
-      goto send;
-    }
-  adj = ip_get_adjacency (lm, adj_index);
-
-  if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE
-      && adj->rewrite_header.sw_if_index == sw_if_index)
-    {
-      rmp->is_known = 1;
-    }
-  else
-    {
-      if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP
-	  && adj->rewrite_header.sw_if_index == sw_if_index)
-	{
-	  if (mp->is_ipv6)
-	    ip6_probe_neighbor (rm->vlib_main, &addr.ip6, sw_if_index);
-	  else
-	    ip4_probe_neighbor (rm->vlib_main, &addr.ip4, sw_if_index);
-	}
-      else if (adj->lookup_next_index == IP_LOOKUP_NEXT_DROP)
-	{
-	  rmp->is_known = 1;
-	  goto send;
-	}
-      rmp->is_known = 0;
-    }
-
-send:
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-#endif
-}
-
-static void
   vl_api_sw_interface_set_mpls_enable_t_handler
   (vl_api_sw_interface_set_mpls_enable_t * mp)
 {
@@ -828,7 +751,7 @@ vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
 {
   stats_main_t *sm = &stats_main;
   vnet_interface_main_t *im = sm->interface_main;
-  vl_api_vnet_summary_stats_reply_t *rmp;
+  vl_api_vnet_get_summary_stats_reply_t *rmp;
   vlib_combined_counter_main_t *cm;
   vlib_counter_t v;
   int i, which;
@@ -842,7 +765,7 @@ vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
     return;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VNET_SUMMARY_STATS_REPLY);
+  rmp->_vl_msg_id = ntohs (VL_API_VNET_GET_SUMMARY_STATS_REPLY);
   rmp->context = mp->context;
   rmp->retval = 0;
 
@@ -1115,7 +1038,7 @@ shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
 
 
 static void
-vl_api_cli_request_t_handler (vl_api_cli_request_t * mp)
+vl_api_cli_t_handler (vl_api_cli_t * mp)
 {
   vl_api_cli_reply_t *rp;
   unix_shared_memory_queue_t *q;
diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index c073c52d..9071883b 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -1656,12 +1656,12 @@ static void *vl_api_want_interface_events_t_print
   FINISH;
 }
 
-static void *vl_api_cli_request_t_print
-  (vl_api_cli_request_t * mp, void *handle)
+static void *
+vl_api_cli_t_print (vl_api_cli_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: cli_request ");
+  s = format (0, "SCRIPT: cli ");
 
   FINISH;
 }
@@ -3023,7 +3023,7 @@ _(DELETE_VHOST_USER_IF, delete_vhost_user_if)				\
 _(SW_INTERFACE_DUMP, sw_interface_dump)					\
 _(CONTROL_PING, control_ping)						\
 _(WANT_INTERFACE_EVENTS, want_interface_events)				\
-_(CLI_REQUEST, cli_request)						\
+_(CLI, cli)								\
 _(CLI_INBAND, cli_inband)						\
 _(MEMCLNT_CREATE, memclnt_create)					\
 _(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump)           \
diff --git a/src/vpp/api/summary_stats_client.c b/src/vpp/api/summary_stats_client.c
index 03999567..2c81d667 100644
--- a/src/vpp/api/summary_stats_client.c
+++ b/src/vpp/api/summary_stats_client.c
@@ -101,8 +101,8 @@ vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
 
 
 static void
-vl_api_vnet_summary_stats_reply_t_handler (vl_api_vnet_summary_stats_reply_t *
-					   mp)
+  vl_api_vnet_get_summary_stats_reply_t_handler
+  (vl_api_vnet_get_summary_stats_reply_t * mp)
 {
   test_main_t *tm = &test_main;
   static u8 *sb;
@@ -134,7 +134,7 @@ vl_api_vnet_summary_stats_reply_t_handler (vl_api_vnet_summary_stats_reply_t *
 }
 
 #define foreach_api_msg                                                 \
-_(VNET_SUMMARY_STATS_REPLY, vnet_summary_stats_reply)
+_(VNET_GET_SUMMARY_STATS_REPLY, vnet_get_summary_stats_reply)
 
 int
 connect_to_vpe (char *name)
diff --git a/src/vpp/api/vpe.api b/src/vpp/api/vpe.api
index 99ae4784..d3c7e985 100644
--- a/src/vpp/api/vpe.api
+++ b/src/vpp/api/vpe.api
@@ -135,25 +135,6 @@ autoreply define reset_vrf
   u32 vrf_id;
 };
 
-/** \brief Is Address Reachable request - DISABLED
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param next_hop_sw_if_index - index of interface used to get to next hop
-    @param is_ipv6 - 1 for IPv6, 0 for IPv4
-    @param is_error - address not found or does not match intf
-    @param address[] - Address in question 
-*/
-define is_address_reachable
-{
-  u32 client_index;		/* (api_main_t *) am->my_client_index */
-  u32 context;
-  u32 next_hop_sw_if_index;
-  u8 is_known;			/* on reply, this is the answer */
-  u8 is_ipv6;
-  u8 is_error;			/* address not found or does not match intf */
-  u8 address[16];
-};
-
 /** \brief Want Stats, register for stats updates
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -256,7 +237,7 @@ define vnet_get_summary_stats
     @param total_bytes -
     @param vector_rate - 
 */
-define vnet_summary_stats_reply
+define vnet_get_summary_stats_reply
 {
   u32 context;
   i32 retval;
@@ -414,7 +395,7 @@ define control_ping_reply
     @param context - sender context, to match reply w/ request
     @param cmd_in_shmem - pointer to cli command string
 */
-define cli_request
+define cli
 {
   u32 client_index;
   u32 context;