api: vat2 and json autogeneration for api messages

VAT2: A completely auto-generated replacement of VAT.
Reads input message in JSON from stdin and outputs received messages in JSON.

A VAT2 plugin is automatically built for a .api file.
There no longer a need for a separate _test.c.

Example:
vat2 show_version {}
{
        "_msgname":     "show_version_reply",
        "retval":       0,
        "program":      "vpe",
        "version":      "21.01-rc0~411-gf6eb348a6",
        "build_date":   "2020-11-19T09:49:25",
        "build_directory":      "/vpp/autogen3"
}

vat2 sw_interface_dump '{"sw_if_index": -1,
                         "name_filter_valid": 0,
                         "name_filter": ""}'
[{
                "_msgname":     "sw_interface_details",
                "sw_if_index":  0,
                "sup_sw_if_index":      0,
                "l2_address":   "00:00:00:00:00:00",
                "flags":        "Invalid ENUM",
                "type": "IF_API_TYPE_HARDWARE",
                "link_duplex":  "LINK_DUPLEX_API_UNKNOWN",
                "link_speed":   0,
                "link_mtu":     0,
                "mtu":  [0, 0, 0, 0],
                "sub_id":       0,
                "sub_number_of_tags":   0,
                "sub_outer_vlan_id":    0,
                "sub_inner_vlan_id":    0,
                "sub_if_flags": "Invalid ENUM",
                "vtr_op":       0,
                "vtr_push_dot1q":       0,
                "vtr_tag1":     0,
                "vtr_tag2":     0,
                "outer_tag":    0,
                "b_dmac":       "00:00:00:00:00:00",
                "b_smac":       "00:00:00:00:00:00",
                "b_vlanid":     0,
                "i_sid":        0,
                "interface_name":       "local0",
                "interface_dev_type":   "local",
                "tag":  ""
        }]

This is the first phase and vat2 is not integrated in packaging yet.

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

20 files changed, 80 insertions, 1012 deletions

diff --git a/src/plugins/acl/CMakeLists.txt b/src/plugins/acl/CMakeLists.txt
index 78cc818d1ea..c43dd23ea51 100644
--- a/src/plugins/acl/CMakeLists.txt
+++ b/src/plugins/acl/CMakeLists.txt
@@ -30,7 +30,4 @@ add_vpp_plugin(acl
 
   API_TEST_SOURCES
   acl_test.c
-
-  INSTALL_HEADERS
-  manual_fns.h
 )
diff --git a/src/plugins/acl/acl.api b/src/plugins/acl/acl.api
index 25c231db82a..a4706c3e529 100644
--- a/src/plugins/acl/acl.api
+++ b/src/plugins/acl/acl.api
@@ -102,7 +102,7 @@ define acl_plugin_get_conn_table_max_entries_reply
     @r - Rules for this access-list
 */
 
-manual_print manual_endian define acl_add_replace
+ define acl_add_replace
 {
   u32 client_index;
   u32 context;
@@ -132,7 +132,7 @@ define acl_add_replace_reply
     @param acl_index - ACL index to delete
 */
 
-autoreply manual_print define acl_del
+autoreply define acl_del
 {
   u32 client_index;
   u32 context;
@@ -151,7 +151,7 @@ autoreply manual_print define acl_del
     @param acl_index - index of ACL for the operation
 */
 
-autoreply manual_print define acl_interface_add_del
+autoreply define acl_interface_add_del
 {
   u32 client_index;
   u32 context;
@@ -175,7 +175,7 @@ autoreply manual_print define acl_interface_add_del
     @param acls - vector of ACL indices
 */
 
-autoreply manual_print define acl_interface_set_acl_list
+autoreply define acl_interface_set_acl_list
 {
   u32 client_index;
   u32 context;
@@ -213,7 +213,7 @@ define acl_dump
     @param r - Array of rules within this ACL
 */
 
-manual_endian manual_print define acl_details
+define acl_details
 {
   u32 context;
   u32 acl_index;
@@ -261,7 +261,7 @@ define acl_interface_list_details
     @param r - vector of MACIP ACL rules
 */
 
-manual_endian manual_print define macip_acl_add
+define macip_acl_add
 {
   u32 client_index;
   u32 context;
@@ -293,7 +293,7 @@ define macip_acl_add_reply
     @param r - vector of MACIP ACL rules
 */
 
-manual_endian manual_print define macip_acl_add_replace
+define macip_acl_add_replace
 {
   u32 client_index;
   u32 context;
@@ -323,7 +323,7 @@ define macip_acl_add_replace_reply
     @param acl_index - MACIP ACL index to delete
 */
 
-autoreply manual_print define macip_acl_del
+autoreply define macip_acl_del
 {
   u32 client_index;
   u32 context;
@@ -339,7 +339,7 @@ autoreply manual_print define macip_acl_del
     @param acl_index - MACIP ACL index
 */
 
-autoreply manual_print define macip_acl_interface_add_del
+autoreply  define macip_acl_interface_add_del
 {
   u32 client_index;
   u32 context;
@@ -372,7 +372,7 @@ define macip_acl_dump
     @param r - rules comprising this MACIP ACL
 */
 
-manual_endian manual_print define macip_acl_details
+  define macip_acl_details
 {
   u32 context;
   u32 acl_index;
@@ -442,7 +442,7 @@ define macip_acl_interface_list_details
     @param whitelist - vector of whitelisted ethertypes
 */
 
-autoreply manual_print define acl_interface_set_etype_whitelist
+autoreply  define acl_interface_set_etype_whitelist
 {
   u32 client_index;
   u32 context;
diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c
index b4770a70db0..b18e8515cde 100644
--- a/src/plugins/acl/acl.c
+++ b/src/plugins/acl/acl.c
@@ -25,6 +25,9 @@
 #include <vpp/app/version.h>
 
 #include <vnet/ethernet/ethernet_types_api.h>
+#include <vnet/ip/format.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip_types_api.h>
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -34,7 +37,6 @@
 #include <acl/acl.api_types.h>
 
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#include "manual_fns.h"
 
 #include "fa_node.h"
 #include "public_inlines.h"
@@ -132,6 +134,26 @@ print_cli_and_reset (vlib_main_t * vm, u8 * out0)
 
 typedef void (*acl_vector_print_func_t) (vlib_main_t * vm, u8 * out0);
 
+static inline u8 *
+format_acl_action (u8 * s, u8 action)
+{
+  switch (action)
+    {
+    case 0:
+      s = format (s, "deny");
+      break;
+    case 1:
+      s = format (s, "permit");
+      break;
+    case 2:
+      s = format (s, "permit+reflect");
+      break;
+    default:
+      s = format (s, "action %d", action);
+    }
+  return (s);
+}
+
 static void
 acl_print_acl_x (acl_vector_print_func_t vpr, vlib_main_t * vm,
 		 acl_main_t * am, int acl_index)
@@ -629,16 +651,16 @@ acl_interface_set_inout_acl_list (acl_main_t * am, u32 sw_if_index,
 
 
   u32 **pinout_lc_index_by_sw_if_index =
-    is_input ? &am->
-    input_lc_index_by_sw_if_index : &am->output_lc_index_by_sw_if_index;
+    is_input ? &am->input_lc_index_by_sw_if_index : &am->
+    output_lc_index_by_sw_if_index;
 
   u32 ***pinout_acl_vec_by_sw_if_index =
-    is_input ? &am->
-    input_acl_vec_by_sw_if_index : &am->output_acl_vec_by_sw_if_index;
+    is_input ? &am->input_acl_vec_by_sw_if_index : &am->
+    output_acl_vec_by_sw_if_index;
 
   u32 ***pinout_sw_if_index_vec_by_acl =
-    is_input ? &am->
-    input_sw_if_index_vec_by_acl : &am->output_sw_if_index_vec_by_acl;
+    is_input ? &am->input_sw_if_index_vec_by_acl : &am->
+    output_sw_if_index_vec_by_acl;
 
   vec_validate ((*pinout_acl_vec_by_sw_if_index), sw_if_index);
 
@@ -713,7 +735,9 @@ acl_interface_set_inout_acl_list (acl_main_t * am, u32 sw_if_index,
     {
       if (~0 != (*pinout_lc_index_by_sw_if_index)[sw_if_index])
 	{
-	  acl_plugin.put_lookup_context_index ((*pinout_lc_index_by_sw_if_index)[sw_if_index]);
+	  acl_plugin.
+	    put_lookup_context_index ((*pinout_lc_index_by_sw_if_index)
+				      [sw_if_index]);
 	  (*pinout_lc_index_by_sw_if_index)[sw_if_index] = ~0;
 	}
     }
@@ -750,8 +774,8 @@ acl_interface_add_del_inout_acl (u32 sw_if_index, u8 is_add, u8 is_input,
     : VNET_API_ERROR_ACL_IN_USE_OUTBOUND;
 
   u32 ***pinout_acl_vec_by_sw_if_index =
-    is_input ? &am->
-    input_acl_vec_by_sw_if_index : &am->output_acl_vec_by_sw_if_index;
+    is_input ? &am->input_acl_vec_by_sw_if_index : &am->
+    output_acl_vec_by_sw_if_index;
   int rv = 0;
   if (is_add)
     {
@@ -1435,9 +1459,9 @@ macip_create_classify_tables (acl_main_t * am, u32 macip_acl_index)
 
 		  vnet_classify_add_del_session (cm, tag_table,
 						 mask,
-						 a->
-						 rules[i].is_permit ? ~0 : 0,
-						 i, 0, action, metadata, 1);
+						 a->rules[i].
+						 is_permit ? ~0 : 0, i, 0,
+						 action, metadata, 1);
 		}
 	    }
 	}
@@ -2280,7 +2304,8 @@ static void
 	if (~0 != am->macip_acl_by_sw_if_index[sw_if_index])
 	  {
 	    send_macip_acl_interface_list_details (am, reg, sw_if_index,
-						   am->macip_acl_by_sw_if_index
+						   am->
+						   macip_acl_by_sw_if_index
 						   [sw_if_index],
 						   mp->context);
 	  }
diff --git a/src/plugins/acl/acl_test.c b/src/plugins/acl/acl_test.c
index c139b325568..79058cdc268 100644
--- a/src/plugins/acl/acl_test.c
+++ b/src/plugins/acl/acl_test.c
@@ -37,7 +37,6 @@ uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
 #include <acl/acl.api_enum.h>
 #include <acl/acl.api_types.h>
 #define vl_print(handle, ...)
-#include <acl/manual_fns.h>
 #undef vl_print
 #define vl_endianfun            /* define message structures */
 #include <acl/acl.api.h>
diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h
deleted file mode 100644
index f2585a9985d..00000000000
--- a/src/plugins/acl/manual_fns.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 2016 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_manual_fns_h
-#define included_manual_fns_h
-
-#include <vnet/ip/format.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip_types_api.h>
-
-#define vl_endianfun            /* define message structures */
-#include <acl/acl_types.api.h>
-#undef vl_endianfun
-
-/* Macro to finish up custom dump fns */
-#define PRINT_S \
-    vec_add1 (s, 0);                            \
-    vl_print (handle, (char *)s);               \
-    vec_free (s);
-
-static inline void
-vl_api_acl_rule_t_array_endian(vl_api_acl_rule_t *rules, u32 count)
-{
-  u32 i;
-  for(i=0; i<count; i++) {
-    vl_api_acl_rule_t_endian (&rules[i]);
-  }
-}
-
-static inline void
-vl_api_macip_acl_rule_t_array_endian(vl_api_macip_acl_rule_t *rules, u32 count)
-{
-  u32 i;
-  for(i=0; i<count; i++) {
-    vl_api_macip_acl_rule_t_endian (&rules[i]);
-  }
-}
-
-static inline void
-vl_api_acl_details_t_endian (vl_api_acl_details_t * a)
-{
-  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
-  a->context = clib_net_to_host_u32 (a->context);
-  a->acl_index = clib_net_to_host_u32 (a->acl_index);
-  /* a->tag[0..63] = a->tag[0..63] (no-op) */
-  a->count = clib_net_to_host_u32 (a->count);
-  vl_api_acl_rule_t_array_endian (a->r, a->count);
-}
-
-static inline void
-vl_api_macip_acl_details_t_endian (vl_api_macip_acl_details_t * a)
-{
-  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
-  a->context = clib_net_to_host_u32 (a->context);
-  a->acl_index = clib_net_to_host_u32 (a->acl_index);
-  /* a->tag[0..63] = a->tag[0..63] (no-op) */
-  a->count = clib_net_to_host_u32 (a->count);
-  vl_api_macip_acl_rule_t_array_endian (a->r, a->count);
-}
-
-
-static inline void
-vl_api_acl_add_replace_t_endian (vl_api_acl_add_replace_t * a)
-{
-  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
-  a->client_index = clib_net_to_host_u32 (a->client_index);
-  a->context = clib_net_to_host_u32 (a->context);
-  a->acl_index = clib_net_to_host_u32 (a->acl_index);
-  /* a->tag[0..63] = a->tag[0..63] (no-op) */
-  a->count = clib_net_to_host_u32 (a->count);
-  vl_api_acl_rule_t_array_endian (a->r, a->count);
-}
-
-static inline void
-vl_api_macip_acl_add_t_endian (vl_api_macip_acl_add_t * a)
-{
-  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
-  a->client_index = clib_net_to_host_u32 (a->client_index);
-  a->context = clib_net_to_host_u32 (a->context);
-  /* a->tag[0..63] = a->tag[0..63] (no-op) */
-  a->count = clib_net_to_host_u32 (a->count);
-  vl_api_macip_acl_rule_t_array_endian (a->r, a->count);
-}
-
-static inline void
-vl_api_macip_acl_add_replace_t_endian (vl_api_macip_acl_add_replace_t * a)
-{
-  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
-  a->client_index = clib_net_to_host_u32 (a->client_index);
-  a->context = clib_net_to_host_u32 (a->context);
-  a->acl_index = clib_net_to_host_u32 (a->acl_index);
-  /* a->tag[0..63] = a->tag[0..63] (no-op) */
-  a->count = clib_net_to_host_u32 (a->count);
-  vl_api_macip_acl_rule_t_array_endian (a->r, a->count);
-}
-
-static inline u8 *
-format_acl_action(u8 *s, u8 action)
-{
-  switch(action) {
-    case 0:
-      s = format (s, "deny");
-      break;
-    case 1:
-      s = format (s, "permit");
-      break;
-    case 2:
-      s = format (s, "permit+reflect");
-      break;
-    default:
-      s = format (s, "action %d", action);
-  }
-  return(s);
-}
-
-static inline void *
-vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle)
-{
-  u8 *s;
-  ip_prefix_t src, dst;
-
-  ip_prefix_decode2 (&a->src_prefix, &src);
-  ip_prefix_decode2 (&a->dst_prefix, &dst);
-
-  s = format (0, "  %s ", a->src_prefix.address.af ? "ipv6" : "ipv4");
-  s = format_acl_action (s, a->is_permit);
-  s = format (s, " \\\n");
-
-  s = format (s, "    src %U dst %U \\\n",
-              format_ip_prefix, &src,
-              format_ip_prefix, &dst);
-  s = format (s, "    proto %d \\\n", a->proto);
-  s = format (s, "    sport %d-%d dport %d-%d \\\n",
-	      clib_net_to_host_u16 (a->srcport_or_icmptype_first),
-	      clib_net_to_host_u16 (a->srcport_or_icmptype_last),
-	      clib_net_to_host_u16 (a->dstport_or_icmpcode_first),
-	      clib_net_to_host_u16 (a->dstport_or_icmpcode_last));
-
-  s = format (s, "    tcpflags %u mask %u, \\",
-	      a->tcp_flags_value, a->tcp_flags_mask);
-  PRINT_S;
-  return handle;
-}
-
-static inline void *
-vl_api_macip_acl_rule_t_print (vl_api_macip_acl_rule_t * a, void *handle)
-{
-  u8 *s;
-  ip_prefix_t src;
-
-  ip_prefix_decode2 (&a->src_prefix, &src);
-
-  s = format (0, "  %s %s \\\n", a->src_prefix.address.af ? "ipv6" : "ipv4",
-              a->is_permit ? "permit" : "deny");
-
-  s = format (s, "    src mac %U mask %U \\\n",
-	      format_ethernet_address, a->src_mac,
-	      format_ethernet_address, a->src_mac_mask);
-
-  s = format (s, "    src ip %U, \\",
-		format_ip_prefix, &src);
-
-  PRINT_S;
-  return handle;
-}
-
-static inline void *
-vl_api_acl_add_replace_t_print (vl_api_acl_add_replace_t * a, void *handle)
-{
-  u8 *s = 0;
-  int i;
-  u32 acl_index = clib_net_to_host_u32 (a->acl_index);
-  u32 count = clib_net_to_host_u32 (a->count);
-  if (count > 0x100000)
-    {
-      s = format (s, "WARN: acl_add_replace count endianness wrong? Fixup to avoid long loop.\n");
-      count = a->count;
-    }
-
-  s = format (s, "SCRIPT: acl_add_replace %d count %d ",
-	      acl_index, count);
-
-  if (a->tag[0])
-    s = format (s, "tag %s ", a->tag);
-
-  s = format(s, "\\\n");
-  PRINT_S;
-
-  for (i = 0; i < count; i++)
-    vl_api_acl_rule_t_print (&a->r[i], handle);
-
-  s = format(s, "\n");
-  PRINT_S;
-  return handle;
-}
-
-static inline void *
-vl_api_acl_del_t_print (vl_api_macip_acl_del_t * a, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: acl_del %d ",
-              clib_host_to_net_u32 (a->acl_index));
-
-  PRINT_S;
-  return handle;
-}
-
-
-static inline void *
-vl_api_acl_details_t_print (vl_api_acl_details_t * a, void *handle)
-{
-  u8 *s = 0;
-  int i;
-  u32 acl_index = clib_net_to_host_u32 (a->acl_index);
-  u32 count = clib_net_to_host_u32 (a->count);
-  if (count > 0x100000)
-    {
-      s = format (s, "WARN: acl_details count endianness wrong? Fixup to avoid long loop.\n");
-      count = a->count;
-    }
-
-  s = format (s, "acl_details index %d count %d ",
-	      acl_index, count);
-
-  if (a->tag[0])
-    s = format (s, "tag %s ", a->tag);
-
-  s = format(s, "\n");
-  PRINT_S;
-
-  for (i = 0; i < count; i++)
-    vl_api_acl_rule_t_print (&a->r[i], handle);
-
-  return handle;
-}
-
-static inline void *
-vl_api_macip_acl_details_t_print (vl_api_macip_acl_details_t * a,
-				  void *handle)
-{
-  u8 *s = 0;
-  int i;
-  u32 acl_index = clib_net_to_host_u32 (a->acl_index);
-  u32 count = clib_net_to_host_u32 (a->count);
-  if (count > 0x100000)
-    {
-      s = format (s, "WARN: macip_acl_details count endianness wrong? Fixup to avoid long loop.\n");
-      count = a->count;
-    }
-
-  s = format (s, "macip_acl_details index %d count %d ",
-	      acl_index, count);
-
-  if (a->tag[0])
-    s = format (s, "tag %s ", a->tag);
-
-  s = format(s, "\n");
-  PRINT_S;
-
-  for (i = 0; i < count; i++)
-    vl_api_macip_acl_rule_t_print (&a->r[i], handle);
-
-  return handle;
-}
-
-static inline void *
-vl_api_macip_acl_add_t_print (vl_api_macip_acl_add_t * a, void *handle)
-{
-  u8 *s = 0;
-  int i;
-  u32 count = clib_net_to_host_u32 (a->count);
-  if (count > 0x100000)
-    {
-      s = format (s, "WARN: macip_acl_add count endianness wrong? Fixup to avoid long loop.\n");
-      count = a->count;
-    }
-
-  s = format (s, "SCRIPT: macip_acl_add ");
-  if (a->tag[0])
-    s = format (s, "tag %s ", a->tag);
-
-  s = format (s, "count %d \\\n", count);
-
-  PRINT_S;
-
-  for (i = 0; i < count; i++)
-    vl_api_macip_acl_rule_t_print (&a->r[i], handle);
-
-  s = format (0, "\n");
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_macip_acl_add_replace_t_print (vl_api_macip_acl_add_replace_t * a, void *handle)
-{
-  u8 *s = 0;
-  int i;
-  u32 acl_index = clib_net_to_host_u32 (a->acl_index);
-  u32 count = clib_net_to_host_u32 (a->count);
-  if (count > 0x100000)
-    {
-      s = format (s, "WARN: macip_acl_add_replace count endianness wrong? Fixup to avoid long loop.\n");
-      count = a->count;
-    }
-
-  s = format (s, "SCRIPT: macip_acl_add_replace %d count %d ",
-        acl_index, count);
-  if (a->tag[0])
-    s = format (s, "tag %s ", a->tag);
-
-  s = format (s, "count %d \\\n", count);
-
-  PRINT_S;
-
-  for (i = 0; i < count; i++)
-    vl_api_macip_acl_rule_t_print (&a->r[i], handle);
-
-  s = format (0, "\n");
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_acl_interface_set_acl_list_t_print (vl_api_acl_interface_set_acl_list_t
-					   * a, void *handle)
-{
-  u8 *s;
-  int i;
-
-  s = format
-    (0, "SCRIPT: acl_interface_set_acl_list sw_if_index %d count %d\n",
-     clib_net_to_host_u32 (a->sw_if_index), (u32) a->count);
-
-  s = format (s, "    input ");
-
-  for (i = 0; i < a->count; i++)
-    {
-      if (i == a->n_input)
-        s = format (s, "output ");
-      s = format (s, "%d ", clib_net_to_host_u32 (a->acls[i]));
-    }
-
-  PRINT_S;
-  return handle;
-}
-
-static inline void *
-vl_api_acl_interface_set_etype_whitelist_t_print (vl_api_acl_interface_set_etype_whitelist_t
-					   * a, void *handle)
-{
-  u8 *s;
-  int i;
-
-  s = format
-    (0, "SCRIPT: acl_interface_set_etype_whitelist sw_if_index %d count %d\n",
-     clib_net_to_host_u32 (a->sw_if_index), (u32) a->count);
-
-  s = format (s, "    input ");
-
-  for (i = 0; i < a->count; i++)
-    {
-      if (i == a->n_input)
-        s = format (s, "output ");
-      s = format (s, "%x ", clib_net_to_host_u16 (a->whitelist[i]));
-    }
-
-  PRINT_S;
-  return handle;
-}
-
-static inline void *
-vl_api_acl_interface_add_del_t_print (vl_api_acl_interface_add_del_t * a,
-				      void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: acl_interface_add_del sw_if_index %d acl %d ",
-	      clib_net_to_host_u32 (a->sw_if_index),
-	      clib_net_to_host_u32 (a->acl_index));
-  s = format (s, "%s %s",
-	      a->is_input ? "input" : "output", a->is_add ? "add" : "del");
-
-  PRINT_S;
-  return handle;
-}
-
-static inline void *vl_api_macip_acl_interface_add_del_t_print
-  (vl_api_macip_acl_interface_add_del_t * a, void *handle)
-{
-  u8 *s;
-
-  s = format
-    (0,
-     "SCRIPT: macip_acl_interface_add_del sw_if_index %d acl_index %d ",
-     clib_net_to_host_u32 (a->sw_if_index),
-     clib_net_to_host_u32 (a->acl_index));
-  s = format (s, "%s", a->is_add ? "add" : "del");
-
-  PRINT_S;
-  return handle;
-}
-
-
-static inline void *
-vl_api_macip_acl_del_t_print (vl_api_macip_acl_del_t * a, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: macip_acl_del %d ",
-	      clib_host_to_net_u32 (a->acl_index));
-
-  PRINT_S;
-  return handle;
-}
-
-
-#endif /* included_manual_fns_h */
diff --git a/src/plugins/dns/dns.api b/src/plugins/dns/dns.api
index 866ed8abae3..17ab5244388 100644
--- a/src/plugins/dns/dns.api
+++ b/src/plugins/dns/dns.api
@@ -21,7 +21,7 @@ option version = "1.0.0";
     @param context - sender context, to match reply w/ request
     @param is_enable - 1 = enable, 0 = disable
 */
-autoreply manual_print define dns_enable_disable {
+autoreply define dns_enable_disable {
     u32 client_index;
     u32 context;
     u8 enable;
@@ -36,7 +36,7 @@ autoreply manual_print define dns_enable_disable {
     @param is_add - add = 1, delete = 0
     @param server_address - server ip address
 */
-autoreply manual_print define dns_name_server_add_del {
+autoreply define dns_name_server_add_del {
     u32 client_index;
     u32 context;
     u8 is_ip6;
@@ -51,7 +51,7 @@ autoreply manual_print define dns_name_server_add_del {
     @param context - sender context, to match reply w/ request
     @param name - the name to resolve
 */
-manual_print define dns_resolve_name {
+define dns_resolve_name {
     u32 client_index;
     u32 context;
     u8 name[256];
@@ -84,7 +84,7 @@ define dns_resolve_name_reply {
     @param is_ip6 - set if the reverse-DNS request is an ip6 address
     @param address - the address to map to a name
 */
-manual_print define dns_resolve_ip {
+define dns_resolve_ip {
     u32 client_index;
     u32 context;
     u8 is_ip6;
diff --git a/src/plugins/dns/dns.c b/src/plugins/dns/dns.c
index 045f4d616a3..de1862dd52c 100644
--- a/src/plugins/dns/dns.c
+++ b/src/plugins/dns/dns.c
@@ -2992,59 +2992,6 @@ found_src_address:
     }
 }
 
-static void *vl_api_dns_enable_disable_t_print
-  (vl_api_dns_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dns_enable_disable ");
-  s = format (s, "%s ", mp->enable ? "enable" : "disable");
-
-  FINISH;
-}
-
-static void *vl_api_dns_name_server_add_del_t_print
-  (vl_api_dns_name_server_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dns_name_server_add_del ");
-  if (mp->is_ip6)
-    s = format (s, "%U ", format_ip6_address,
-		(ip6_address_t *) mp->server_address);
-  else
-    s = format (s, "%U ", format_ip4_address,
-		(ip4_address_t *) mp->server_address);
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_dns_resolve_name_t_print
-  (vl_api_dns_resolve_name_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dns_resolve_name ");
-  s = format (s, "%s ", mp->name);
-  FINISH;
-}
-
-static void *vl_api_dns_resolve_ip_t_print
-  (vl_api_dns_resolve_ip_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dns_resolve_ip ");
-  if (mp->is_ip6)
-    s = format (s, "%U ", format_ip6_address, mp->address);
-  else
-    s = format (s, "%U ", format_ip4_address, mp->address);
-  FINISH;
-}
-
 #include <dns/dns.api.c>
 static clib_error_t *
 dns_init (vlib_main_t * vm)
diff --git a/src/plugins/flowprobe/flowprobe.api b/src/plugins/flowprobe/flowprobe.api
index 8e8b90fc4e3..55dd51d3c30 100644
--- a/src/plugins/flowprobe/flowprobe.api
+++ b/src/plugins/flowprobe/flowprobe.api
@@ -30,7 +30,7 @@ enum flowprobe_record_flags : u8
     @param which - flags indicating forwarding path
     @param sw_if_index - index of the interface
 */
-autoreply manual_print define flowprobe_tx_interface_add_del
+autoreply define flowprobe_tx_interface_add_del
 {
   /* Client identifier, set from api_main.my_client_index */
   u32 client_index;
diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c
index 9bc12c8b60c..3df877aa4a1 100644
--- a/src/plugins/flowprobe/flowprobe.c
+++ b/src/plugins/flowprobe/flowprobe.c
@@ -656,24 +656,6 @@ out:
   REPLY_MACRO (VL_API_FLOWPROBE_TX_INTERFACE_ADD_DEL_REPLY);
 }
 
-/**
- * @brief API message custom-dump function
- * @param mp vl_api_flowprobe_tx_interface_add_del_t * mp the api message
- * @param handle void * print function handle
- * @returns u8 * output string
- */
-static void *vl_api_flowprobe_tx_interface_add_del_t_print
-  (vl_api_flowprobe_tx_interface_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: flowprobe_tx_interface_add_del ");
-  s = format (s, "sw_if_index %d is_add %d which %d ",
-	      clib_host_to_net_u32 (mp->sw_if_index),
-	      (int) mp->is_add, (int) mp->which);
-  FINISH;
-}
-
 #define vec_neg_search(v,E)         \
 ({              \
   word _v(i) = 0;         \
diff --git a/src/plugins/gbp/CMakeLists.txt b/src/plugins/gbp/CMakeLists.txt
index d9034fbf3fe..95f664ff08e 100644
--- a/src/plugins/gbp/CMakeLists.txt
+++ b/src/plugins/gbp/CMakeLists.txt
@@ -51,5 +51,4 @@ add_vpp_plugin(gbp
 
   INSTALL_HEADERS
   gbp.h
-  gbp_api_print.h
 )
diff --git a/src/plugins/gbp/gbp.api b/src/plugins/gbp/gbp.api
index f7643c76c02..2f46634af52 100644
--- a/src/plugins/gbp/gbp.api
+++ b/src/plugins/gbp/gbp.api
@@ -39,14 +39,14 @@ typedef gbp_bridge_domain
   vl_api_interface_index_t bm_flood_sw_if_index;
 };
 
-manual_print autoreply define gbp_bridge_domain_add
+ autoreply define gbp_bridge_domain_add
 {
   option status="in_progress";
   u32 client_index;
   u32 context;
   vl_api_gbp_bridge_domain_t bd;
 };
-manual_print autoreply define gbp_bridge_domain_del
+ autoreply define gbp_bridge_domain_del
 {
   option status="in_progress";
   u32 client_index;
@@ -78,14 +78,14 @@ typedef gbp_route_domain
   vl_api_gbp_scope_t scope;
 };
 
-manual_print autoreply define gbp_route_domain_add
+ autoreply define gbp_route_domain_add
 {
   option status="in_progress";
   u32 client_index;
   u32 context;
   vl_api_gbp_route_domain_t rd;
 };
-manual_print autoreply define gbp_route_domain_del
+ autoreply define gbp_route_domain_del
 {
   option status="in_progress";
   u32 client_index;
@@ -136,7 +136,7 @@ typedef gbp_endpoint
   vl_api_address_t ips[n_ips];
 };
 
-manual_print define gbp_endpoint_add
+ define gbp_endpoint_add
 {
   option status="in_progress";
   u32 client_index;
@@ -152,7 +152,7 @@ define gbp_endpoint_add_reply
   u32 handle;
 };
 
-manual_print autoreply define gbp_endpoint_del
+ autoreply define gbp_endpoint_del
 {
   option status="in_progress";
   u32 client_index;
@@ -191,14 +191,14 @@ typedef gbp_endpoint_group
   vl_api_gbp_endpoint_retention_t retention;
 };
 
-manual_print autoreply define gbp_endpoint_group_add
+ autoreply define gbp_endpoint_group_add
 {
   option status="in_progress";
   u32 client_index;
   u32 context;
   vl_api_gbp_endpoint_group_t epg;
 };
-manual_print autoreply define gbp_endpoint_group_del
+ autoreply define gbp_endpoint_group_del
 {
   option status="in_progress";
   u32 client_index;
@@ -227,7 +227,7 @@ typedef gbp_recirc
   bool is_ext;
 };
 
-manual_print autoreply define gbp_recirc_add_del
+ autoreply define gbp_recirc_add_del
 {
   option status="in_progress";
   u32 client_index;
@@ -268,7 +268,7 @@ typedef gbp_subnet
   vl_api_prefix_t prefix;
 };
 
-manual_print autoreply define gbp_subnet_add_del
+ autoreply define gbp_subnet_add_del
 {
   option status="in_progress";
   u32 client_index;
@@ -338,7 +338,7 @@ typedef gbp_contract
   vl_api_gbp_rule_t rules[n_rules];
 };
 
-manual_print define gbp_contract_add_del
+ define gbp_contract_add_del
 {
   option status="in_progress";
   u32 client_index;
@@ -388,7 +388,7 @@ typedef gbp_vxlan_tunnel
   vl_api_ip4_address_t src;
 };
 
-manual_print define gbp_vxlan_tunnel_add
+ define gbp_vxlan_tunnel_add
 {
   option status="in_progress";
   u32 client_index;
@@ -404,7 +404,7 @@ define gbp_vxlan_tunnel_add_reply
   vl_api_interface_index_t sw_if_index;
 };
 
-manual_print autoreply define gbp_vxlan_tunnel_del
+ autoreply define gbp_vxlan_tunnel_del
 {
   option status="in_progress";
   u32 client_index;
@@ -440,7 +440,7 @@ typedef gbp_ext_itf
   vl_api_gbp_ext_itf_flags_t flags;
 };
 
-manual_print autoreply define gbp_ext_itf_add_del
+ autoreply define gbp_ext_itf_add_del
 {
   option status="in_progress";
   u32 client_index;
diff --git a/src/plugins/gbp/gbp_api.c b/src/plugins/gbp/gbp_api.c
index aea03d80226..ab89172b1af 100644
--- a/src/plugins/gbp/gbp_api.c
+++ b/src/plugins/gbp/gbp_api.c
@@ -42,7 +42,6 @@
 #include <vnet/format_fns.h>
 #include <vlibapi/api_helper_macros.h>
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#include "gbp_api_print.h"
 
 gbp_main_t gbp_main;
 
diff --git a/src/plugins/gbp/gbp_api_print.h b/src/plugins/gbp/gbp_api_print.h
deleted file mode 100644
index 39c25b6e476..00000000000
--- a/src/plugins/gbp/gbp_api_print.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (c) 2019 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 __GBP_API_PRINT_H__
-#define __GBP_API_PRINT_H__
-
-#include <vpp/api/types.h>
-
-/* Macro to finish up custom dump fns */
-#define PRINT_S \
-    vec_add1 (s, 0);                            \
-    vl_print (handle, (char *)s);               \
-    vec_free (s);
-
-static inline void *
-vl_api_gbp_bridge_domain_add_t_print (vl_api_gbp_bridge_domain_add_t * a,
-				      void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_bridge_domain_add ");
-  s = format (s, "bd_id %d ", ntohl (a->bd.bd_id));
-  s = format (s, "rd_id %d ", ntohl (a->bd.rd_id));
-  s = format (s, "flags %d ", ntohl (a->bd.flags));
-  s = format (s, "uu-fwd %d ", ntohl (a->bd.uu_fwd_sw_if_index));
-  s = format (s, "bvi %d ", ntohl (a->bd.bvi_sw_if_index));
-  s = format (s, "bm-flood %d", ntohl (a->bd.bm_flood_sw_if_index));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_bridge_domain_del_t_print (vl_api_gbp_bridge_domain_del_t * a,
-				      void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_bridge_domain_del ");
-  s = format (s, "bd_id %d ", ntohl (a->bd_id));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_route_domain_add_t_print (vl_api_gbp_route_domain_add_t * a,
-				     void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_route_domain_add ");
-  s = format (s, "rd_id %d ", ntohl (a->rd.rd_id));
-  s = format (s, "ip4_table_id %d ", ntohl (a->rd.ip4_table_id));
-  s = format (s, "ip6_table_id %d ", ntohl (a->rd.ip6_table_id));
-  s = format (s, "ip4_uu_sw_if_index %d ", ntohl (a->rd.ip4_uu_sw_if_index));
-  s = format (s, "ip6_uu_sw_if_index %d", ntohl (a->rd.ip6_uu_sw_if_index));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_route_domain_del_t_print (vl_api_gbp_route_domain_del_t * a,
-				     void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_route_domain_del ");
-  s = format (s, "rd_id %d", ntohl (a->rd_id));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_endpoint_add_t_print (vl_api_gbp_endpoint_add_t * a, void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_endpoint_add ");
-  s = format (s, "sw_if_index %d ", ntohl (a->endpoint.sw_if_index));
-  s = format (s, "sclass %d ", ntohs (a->endpoint.sclass));
-  s = format (s, "flags %x ", ntohl (a->endpoint.flags));
-  s = format (s, "mac %U ", format_vl_api_mac_address, a->endpoint.mac);
-  s =
-    format (s, "\n\ttun\n\t\t src %U", format_vl_api_address,
-	    &a->endpoint.tun.src);
-  s =
-    format (s, "\n\t\t dst %U ", format_vl_api_address, &a->endpoint.tun.dst);
-
-  if (a->endpoint.n_ips)
-    s = format (s, "\n\t ips");
-  for (int i = 0; i < a->endpoint.n_ips; i++)
-    s = format (s, "\n\t\t %U", format_vl_api_address, &a->endpoint.ips[i]);
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_endpoint_del_t_print (vl_api_gbp_endpoint_del_t * a, void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_endpoint_del ");
-  s = format (s, "handle %d", ntohl (a->handle));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_endpoint_group_add_t_print (vl_api_gbp_endpoint_group_add_t * a,
-				       void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_endpoint_group_add ");
-  s = format (s, "vnid %d ", ntohl (a->epg.vnid));
-  s = format (s, "sclass %d ", ntohs (a->epg.sclass));
-  s = format (s, "bd_id %d ", ntohl (a->epg.bd_id));
-  s = format (s, "rd_id %d ", ntohl (a->epg.rd_id));
-  s = format (s, "uplink_sw_if_index %d ", ntohl (a->epg.uplink_sw_if_index));
-  s =
-    format (s, "remote_ep_timeout %d",
-	    ntohl (a->epg.retention.remote_ep_timeout));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_endpoint_group_del_t_print (vl_api_gbp_endpoint_group_del_t * a,
-				       void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_endpoint_group_del ");
-  s = format (s, "sclass %d ", ntohs (a->sclass));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_recirc_add_del_t_print (vl_api_gbp_recirc_add_del_t * a,
-				   void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_recirc_add_del ");
-
-  if (a->is_add)
-    s = format (s, "add ");
-  else
-    s = format (s, "del ");
-  s = format (s, "sw_if_index %d ", ntohl (a->recirc.sw_if_index));
-  s = format (s, "sclass %d ", ntohs (a->recirc.sclass));
-  s = format (s, "is_ext %d ", a->recirc.is_ext);
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_subnet_add_del_t_print (vl_api_gbp_subnet_add_del_t * a,
-				   void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_subnet_add_del ");
-  if (a->is_add)
-    s = format (s, "add ");
-  else
-    s = format (s, "del ");
-  s = format (s, "rd_id %d ", ntohl (a->subnet.rd_id));
-  s = format (s, "sw_if_index %d ", ntohl (a->subnet.sw_if_index));
-  s = format (s, "sclass %d ", ntohs (a->subnet.sclass));
-  s = format (s, "type %d ", ntohl (a->subnet.type));
-  s =
-    format (s, "prefix %U/%d", format_vl_api_address,
-	    &a->subnet.prefix.address, a->subnet.prefix.len);
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_contract_add_del_t_print (vl_api_gbp_contract_add_del_t * a,
-				     void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_contract_add_del ");
-  if (a->is_add)
-    s = format (s, "add ");
-  else
-    s = format (s, "del ");
-  s = format (s, "scope %d ", ntohl (a->contract.scope));
-  s = format (s, "sclass %d ", ntohs (a->contract.sclass));
-  s = format (s, "dclass %d ", ntohs (a->contract.dclass));
-  s = format (s, "acl_index %d \n", ntohl (a->contract.acl_index));
-  for (int i = 0; i < a->contract.n_rules; i++)
-    {
-      s = format (s, "\t action %d\n", ntohl (a->contract.rules[i].action));
-      s =
-	format (s, "\t hash_mode %d",
-		ntohl (a->contract.rules[i].nh_set.hash_mode));
-      for (int j = 0; j < a->contract.rules[i].nh_set.n_nhs; j++)
-	{
-	  s =
-	    format (s, "\n\t \t nhs ip %U ", format_vl_api_address,
-		    &a->contract.rules[i].nh_set.nhs[j].ip);
-	  s =
-	    format (s, "nhs mac %U ", format_vl_api_mac_address,
-		    a->contract.rules[i].nh_set.nhs[j].mac);
-	  s =
-	    format (s, "nhs bd_id %d ",
-		    ntohl (a->contract.rules[i].nh_set.nhs[j].bd_id));
-	  s =
-	    format (s, "nhs rd_id %d",
-		    ntohl (a->contract.rules[i].nh_set.nhs[j].rd_id));
-	}
-      s = format (s, "\n");
-    }
-
-  if (a->contract.n_ether_types)
-    s = format (s, "\tethertypes");
-  for (int i = 0; i < a->contract.n_ether_types; i++)
-    {
-      s = format (s, " %d ", ntohs (a->contract.allowed_ethertypes[i]));
-    }
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_vxlan_tunnel_add_t_print (vl_api_gbp_vxlan_tunnel_add_t * a,
-				     void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_vxlan_tunnel_add ");
-
-  s = format (s, "vni %d ", ntohl (a->tunnel.vni));
-  s = format (s, "mode %d ", ntohl (a->tunnel.mode));
-  s = format (s, "bd_rd_id %d ", ntohl (a->tunnel.bd_rd_id));
-  s = format (s, "src %U ", format_vl_api_ip4_address, a->tunnel.src);
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_vxlan_tunnel_del_t_print (vl_api_gbp_vxlan_tunnel_del_t * a,
-				     void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_vxlan_tunnel_del ");
-  s = format (s, "vni %d ", ntohl (a->vni));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-static inline void *
-vl_api_gbp_ext_itf_add_del_t_print (vl_api_gbp_ext_itf_add_del_t * a,
-				    void *handle)
-{
-  u8 *s = 0;
-
-  s = format (s, "SCRIPT: gbp_ext_itf_add_del ");
-  if (a->is_add)
-    s = format (s, "add ");
-  else
-    s = format (s, "del ");
-
-  s = format (s, "sw_if_index %d ", ntohl (a->ext_itf.sw_if_index));
-  s = format (s, "bd_id %d ", ntohl (a->ext_itf.bd_id));
-  s = format (s, "rd_id %d ", ntohl (a->ext_itf.rd_id));
-  s = format (s, "flags %x ", ntohl (a->ext_itf.flags));
-
-  s = format (s, "\n");
-
-  PRINT_S;
-
-  return handle;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
-
-#endif /* __GBP_API_PRINT_H__ */
diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c
index 253cf5b5ba8..176da24ce16 100644
--- a/src/plugins/lb/api.c
+++ b/src/plugins/lb/api.c
@@ -65,19 +65,6 @@ vl_api_lb_conf_t_handler
  REPLY_MACRO (VL_API_LB_CONF_REPLY);
 }
 
-static void *vl_api_lb_conf_t_print
-(vl_api_lb_conf_t *mp, void * handle)
-{
-  u8 * s;
-  s = format (0, "SCRIPT: lb_conf ");
-  s = format (s, "%U ", format_ip4_address, (ip4_address_t *)&mp->ip4_src_address);
-  s = format (s, "%U ", format_ip6_address, (ip6_address_t *)&mp->ip6_src_address);
-  s = format (s, "%u ", mp->sticky_buckets_per_core);
-  s = format (s, "%u ", mp->flow_timeout);
-  FINISH;
-}
-
-
 static void
 vl_api_lb_add_del_vip_t_handler
 (vl_api_lb_add_del_vip_t * mp)
@@ -142,38 +129,6 @@ vl_api_lb_add_del_vip_t_handler
  REPLY_MACRO (VL_API_LB_ADD_DEL_VIP_REPLY);
 }
 
-static void *vl_api_lb_add_del_vip_t_print
-(vl_api_lb_add_del_vip_t *mp, void * handle)
-{
-  u8 * s;
-  s = format (0, "SCRIPT: lb_add_del_vip ");
-  s = format (s, "%U", format_vl_api_prefix,
-       &mp->pfx);
-
-  s = format (s, "%s ", (mp->encap == LB_API_ENCAP_TYPE_GRE4)? "gre4"
-              : (mp->encap == LB_API_ENCAP_TYPE_GRE6)? "gre6"
-              : (mp->encap == LB_API_ENCAP_TYPE_NAT4)? "nat4"
-              : (mp->encap == LB_API_ENCAP_TYPE_NAT6)? "nat6"
-              : "l3dsr");
-
-  if (mp->encap==LB_API_ENCAP_TYPE_L3DSR)
-    {
-      s = format (s, "dscp %u ", mp->dscp);
-    }
-
-  if ((mp->encap==LB_API_ENCAP_TYPE_NAT4)
-      || (mp->encap==LB_API_ENCAP_TYPE_NAT6))
-    {
-      s = format (s, "type %u ", mp->type);
-      s = format (s, "port %u ", mp->port);
-      s = format (s, "target_port %u ", mp->target_port);
-    }
-
-  s = format (s, "%u ", mp->new_flows_table_length);
-  s = format (s, "%s ", mp->is_del?"del":"add");
-  FINISH;
-}
-
 static void
 vl_api_lb_add_del_as_t_handler
 (vl_api_lb_add_del_as_t * mp)
@@ -206,25 +161,6 @@ done:
  REPLY_MACRO (VL_API_LB_ADD_DEL_AS_REPLY);
 }
 
-static void *vl_api_lb_add_del_as_t_print
-(vl_api_lb_add_del_as_t *mp, void * handle)
-{
-  u8 * s;
-  ip46_address_t address;
-  s = format (0, "SCRIPT: lb_add_del_as ");
-  s = format (s, "%U ", format_vl_api_prefix,
-       &mp->pfx);
-  s = format(s, "%u ", mp->protocol);
-  if (ip_address_decode (&mp->as_address, &address) == IP46_TYPE_IP6)
-  s = format (s, "%U ", format_ip6_address,
-		(ip6_address_t *) & address.ip6);
-  else
-  s = format (s, "%U ", format_ip4_address,
-		(ip6_address_t *) & address.ip4);
-  s = format (s, "%s ", mp->is_del?"del":"add");
-  FINISH;
-}
-
 static void
 vl_api_lb_vip_dump_t_handler
 (vl_api_lb_vip_dump_t * mp)
@@ -407,19 +343,6 @@ static void vl_api_lb_add_del_intf_nat6_t_handler
   REPLY_MACRO (VL_API_LB_ADD_DEL_INTF_NAT6_REPLY);
 }
 
-static void *vl_api_lb_flush_vip_t_print
-(vl_api_lb_flush_vip_t *mp, void * handle)
-{
-  u8 * s;
-  s = format (0, "SCRIPT: lb_add_del_vip ");
-  s = format (s, "%U/%d", format_vl_api_address,
-       &mp->pfx.address, mp->pfx.len);
-  s = format (s, "protocol %u ", mp->protocol);
-  s = format (s, "port %u ", mp->port);
-
-  FINISH;
-}
-
 #include <lb/lb.api.c>
 static clib_error_t * lb_api_init (vlib_main_t * vm)
 {
diff --git a/src/plugins/lb/lb.api b/src/plugins/lb/lb.api
index 564fe232451..4bf30e76b59 100644
--- a/src/plugins/lb/lb.api
+++ b/src/plugins/lb/lb.api
@@ -12,7 +12,7 @@ import "vnet/interface_types.api";
     @param flow_timeout - Time in seconds after which, if no packet is received
            for a given flow, the flow is removed from the established flow table.
 */
-autoreply manual_print define lb_conf
+autoreply  define lb_conf
 {
   u32 client_index;
   u32 context;
@@ -38,7 +38,7 @@ autoreply manual_print define lb_conf
            for this VIP (must be power of 2).
     @param is_del - The VIP should be removed.
 */
-autoreply manual_print define lb_add_del_vip {
+autoreply  define lb_add_del_vip {
   u32 client_index;
   u32 context;
   vl_api_address_with_prefix_t pfx;
@@ -64,7 +64,7 @@ autoreply manual_print define lb_add_del_vip {
     @param is_del - The AS should be removed.
     @param is_flush - The sessions related to this AS should be flushed.
 */
-autoreply manual_print define lb_add_del_as {
+autoreply  define lb_add_del_as {
   u32 client_index;
   u32 context;
   vl_api_address_with_prefix_t pfx;
@@ -83,7 +83,7 @@ autoreply manual_print define lb_add_del_as {
     @param protocol - tcp or udp.
     @param port - destination port.
 */
-autoreply manual_print define lb_flush_vip {
+autoreply  define lb_flush_vip {
   u32 client_index;
   u32 context;
   vl_api_address_with_prefix_t pfx;
diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c
index 94d2458dd79..e65174eaf88 100644
--- a/src/plugins/map/map_api.c
+++ b/src/plugins/map/map_api.c
@@ -153,7 +153,10 @@ vl_api_map_domains_get_t_handler (vl_api_map_domains_get_t * mp)
   i32 rv = 0;
 
   if (pool_elts (mm->domains) == 0)
-    return;
+    {
+      REPLY_MACRO (VL_API_MAP_DOMAINS_GET_REPLY);
+      return;
+    }
 
   /* *INDENT-OFF* */
   REPLY_AND_DETAILS_MACRO (VL_API_MAP_DOMAINS_GET_REPLY, mm->domains,
diff --git a/src/plugins/nat/nat44.api b/src/plugins/nat/nat44.api
index 4bbd254f67a..fd06c10149c 100644
--- a/src/plugins/nat/nat44.api
+++ b/src/plugins/nat/nat44.api
@@ -1047,7 +1047,7 @@ typedef nat44_lb_addr_port {
     @param locals - local network nodes
     @param tag - opaque string tag
 */
-autoreply manual_endian define nat44_add_del_lb_static_mapping {
+autoreply define nat44_add_del_lb_static_mapping {
   u32 client_index;
   u32 context;
   bool is_add;
@@ -1105,7 +1105,7 @@ define nat44_lb_static_mapping_dump {
     @param locals - local network nodes
     @param tag - opaque string tag
 */
-manual_endian define nat44_lb_static_mapping_details {
+define nat44_lb_static_mapping_details {
   u32 context;
   vl_api_ip4_address_t external_addr;
   u16 external_port;
diff --git a/src/plugins/nat/nat44_api.c b/src/plugins/nat/nat44_api.c
index 6e282856943..37c3dbadfc0 100644
--- a/src/plugins/nat/nat44_api.c
+++ b/src/plugins/nat/nat44_api.c
@@ -18,9 +18,6 @@
  * @brief NAT44 plugin API implementation
  */
 
-#define vl_api_nat44_lb_static_mapping_details_t_endian vl_noop_handler
-#define vl_api_nat44_add_del_lb_static_mapping_t_endian vl_noop_handler
-
 #include <vnet/ip/ip_types_api.h>
 #include <vlibmemory/api.h>
 
diff --git a/src/plugins/stn/stn.api b/src/plugins/stn/stn.api
index 613d1804684..fad6299479b 100644
--- a/src/plugins/stn/stn.api
+++ b/src/plugins/stn/stn.api
@@ -30,7 +30,7 @@ import "vnet/ip/ip_types.api";
     @param sw_if_index - Interface index
     @param is_add - 1 if add, 0 if delete
 */
-autoreply manual_print define stn_add_del_rule {
+autoreply define stn_add_del_rule {
   u32 client_index;
   u32 context;
   vl_api_address_t ip_address;
diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c
index a22bbffd2fe..818c4a65c0a 100644
--- a/src/plugins/stn/stn_api.c
+++ b/src/plugins/stn/stn_api.c
@@ -37,24 +37,6 @@
     vec_free (s);                               \
     return handle;
 
-/**
- * @brief API message custom-dump function
- * @param mp vl_api_stn_add_del_rule_t * mp the api message
- * @param handle void * print function handle
- * @returns u8 * output string
- */
-static void *vl_api_stn_add_del_rule_t_print
-  (vl_api_stn_add_del_rule_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: stn_add_del_rule ");
-  s = format (s, "address %U ", format_ip46_address, mp->ip_address);
-  s = format (s, "sw_if_index %d is_add %d", mp->sw_if_index, mp->is_add);
-
-  FINISH;
-}
-
 static void
 vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp)
 {