"autoreply" flag: autogenerate standard xxx_reply_t messages

Change-Id: I72298aaae7d172082ece3a8edea4217c11b28d79
Signed-off-by: Dave Barach <dave@barachs.net>

12 files changed, 37 insertions, 374 deletions

diff --git a/src/plugins/acl/acl.api b/src/plugins/acl/acl.api
index d981338d38c..3b334113f1d 100644
--- a/src/plugins/acl/acl.api
+++ b/src/plugins/acl/acl.api
@@ -161,24 +161,13 @@ define acl_add_replace_reply
     @param acl_index - ACL index to delete
 */
 
-manual_print define acl_del
+autoreply manual_print define acl_del
 {
   u32 client_index;
   u32 context;
   u32 acl_index;
 };
 
-/** \brief Reply to delete the ACL
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define acl_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /* acl_interface_add_del(_reply) to be deprecated in lieu of acl_interface_set_acl_list */
 /** \brief Use acl_interface_set_acl_list instead
     Append/remove an ACL index to/from the list of ACLs checked for an interface
@@ -190,7 +179,7 @@ define acl_del_reply
     @param acl_index - index of ACL for the operation
 */
 
-manual_print define acl_interface_add_del
+autoreply manual_print define acl_interface_add_del
 {
   u32 client_index;
   u32 context;
@@ -204,17 +193,6 @@ manual_print define acl_interface_add_del
   u32 acl_index;
 };
 
-/** \brief Reply to alter the ACL list
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define acl_interface_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set the vector of input/output ACLs checked for an interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -224,7 +202,7 @@ define acl_interface_add_del_reply
     @param acls - vector of ACL indices
 */
 
-manual_print define acl_interface_set_acl_list
+autoreply manual_print define acl_interface_set_acl_list
 {
   u32 client_index;
   u32 context;
@@ -239,12 +217,6 @@ manual_print define acl_interface_set_acl_list
     @param retval 0 - no error
 */
 
-define acl_interface_set_acl_list_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump the specific ACL contents or all of the ACLs' contents
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -341,24 +313,13 @@ define macip_acl_add_reply
     @param acl_index - MACIP ACL index to delete
 */
 
-manual_print define macip_acl_del
+autoreply manual_print define macip_acl_del
 {
   u32 client_index;
   u32 context;
   u32 acl_index;
 };
 
-/** \brief Reply to delete the MACIP ACL
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define macip_acl_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add or delete a MACIP ACL to/from interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -367,7 +328,7 @@ define macip_acl_del_reply
     @param acl_index - MACIP ACL index
 */
 
-manual_print define macip_acl_interface_add_del
+autoreply manual_print define macip_acl_interface_add_del
 {
   u32 client_index;
   u32 context;
@@ -377,17 +338,6 @@ manual_print define macip_acl_interface_add_del
   u32 acl_index;
 };
 
-/** \brief Reply to apply/unapply  the MACIP ACL
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define macip_acl_interface_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump one or all defined MACIP ACLs
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/plugins/dpdk/api/dpdk.api b/src/plugins/dpdk/api/dpdk.api
index 21215d456a3..d43f8a36c4a 100644
--- a/src/plugins/dpdk/api/dpdk.api
+++ b/src/plugins/dpdk/api/dpdk.api
@@ -21,7 +21,7 @@
     @param pipe - pipe ID within its subport
     @param profile - pipe profile ID
 */
-define sw_interface_set_dpdk_hqos_pipe {
+autoreply define sw_interface_set_dpdk_hqos_pipe {
     u32 client_index;
     u32 context;
     u32 sw_if_index;
@@ -30,15 +30,6 @@ define sw_interface_set_dpdk_hqos_pipe {
     u32 profile;
 };
 
-/** \brief DPDK interface HQoS pipe profile set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-*/
-define sw_interface_set_dpdk_hqos_pipe_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief DPDK interface HQoS subport parameters set request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -49,7 +40,7 @@ define sw_interface_set_dpdk_hqos_pipe_reply {
     @param tc_rate - subport traffic class 0 .. 3 rates (measured in bytes/second)
     @param tc_period - enforcement period for rates (measured in milliseconds)
 */
-define sw_interface_set_dpdk_hqos_subport {
+autoreply define sw_interface_set_dpdk_hqos_subport {
     u32 client_index;
     u32 context;
     u32 sw_if_index;
@@ -60,15 +51,6 @@ define sw_interface_set_dpdk_hqos_subport {
     u32 tc_period;
 };
 
-/** \brief DPDK interface HQoS subport parameters set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-*/
-define sw_interface_set_dpdk_hqos_subport_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief DPDK interface HQoS tctbl entry set request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -77,7 +59,7 @@ define sw_interface_set_dpdk_hqos_subport_reply {
     @param tc - traffic class (0 .. 3)
     @param queue - traffic class queue (0 .. 3)
 */
-define sw_interface_set_dpdk_hqos_tctbl {
+autoreply define sw_interface_set_dpdk_hqos_tctbl {
     u32 client_index;
     u32 context;
     u32 sw_if_index;
@@ -86,18 +68,9 @@ define sw_interface_set_dpdk_hqos_tctbl {
     u32 queue;
 };
 
-/** \brief DPDK interface HQoS tctbl entry set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-*/
-define sw_interface_set_dpdk_hqos_tctbl_reply {
-    u32 context;
-    i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
  * End:
  */
- 
\ No newline at end of file
+ 
diff --git a/src/plugins/flowperpkt/flowperpkt.api b/src/plugins/flowperpkt/flowperpkt.api
index 1cf62c5401d..3ff92dca05f 100644
--- a/src/plugins/flowperpkt/flowperpkt.api
+++ b/src/plugins/flowperpkt/flowperpkt.api
@@ -12,7 +12,7 @@
     @param is_ipv6 - if non-zero the address is ipv6, else ipv4
     @param sw_if_index - index of the interface
 */
-manual_print define flowperpkt_tx_interface_add_del
+autoreply manual_print define flowperpkt_tx_interface_add_del
 {
   /* Client identifier, set from api_main.my_client_index */
   u32 client_index;
@@ -28,20 +28,7 @@ manual_print define flowperpkt_tx_interface_add_del
   u32 sw_if_index;
 };
 
-/** \brief Reply to enable/disable per-packet IPFIX recording messages
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define flowperpkt_tx_interface_add_del_reply
-{
-  /* From the request */
-  u32 context;
-
-  /* Return value, zero means all OK */
-  i32 retval;
-};
-
-define flowperpkt_params
+autoreply define flowperpkt_params
 {
   u32 client_index;
   u32 context;
@@ -51,9 +38,3 @@ define flowperpkt_params
   u32 active_timer;  /* ~0 is off, 0 is default */
   u32 passive_timer; /* ~0 is off, 0 is default */
 };
-
-define flowperpkt_params_reply
-{
-  u32 context;
-  i32 retval;
-};
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
index 7b17c3f7a32..caa97e6ec7d 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
@@ -16,7 +16,7 @@
 
 /* Define a simple binary API to control the feature */
 
-define vxlan_gpe_ioam_export_enable_disable {
+autoreply define vxlan_gpe_ioam_export_enable_disable {
     /* Client identifier, set from api_main.my_client_index */
     u32 client_index;
 
@@ -32,11 +32,3 @@ define vxlan_gpe_ioam_export_enable_disable {
 
     /* Src ip address */
 };
-
-define vxlan_gpe_ioam_export_enable_disable_reply {
-    /* From the request */
-    u32 context;
-
-    /* Return value, zero means all OK */
-    i32 retval;
-};
\ No newline at end of file
diff --git a/src/plugins/ioam/export/ioam_export.api b/src/plugins/ioam/export/ioam_export.api
index f22d9fc8ebe..bb830561309 100644
--- a/src/plugins/ioam/export/ioam_export.api
+++ b/src/plugins/ioam/export/ioam_export.api
@@ -16,7 +16,7 @@
 
 /* Define a simple binary API to control the feature */
 
-define ioam_export_ip6_enable_disable {
+autoreply define ioam_export_ip6_enable_disable {
     /* Client identifier, set from api_main.my_client_index */
     u32 client_index;
 
@@ -32,11 +32,3 @@ define ioam_export_ip6_enable_disable {
 
     /* Src ip address */
 };
-
-define ioam_export_ip6_enable_disable_reply {
-    /* From the request */
-    u32 context;
-
-    /* Return value, zero means all OK */
-    i32 retval;
-};
diff --git a/src/plugins/ioam/ip6/ioam_cache.api b/src/plugins/ioam/ip6/ioam_cache.api
index de50d57d4ee..dd9c0186556 100644
--- a/src/plugins/ioam/ip6/ioam_cache.api
+++ b/src/plugins/ioam/ip6/ioam_cache.api
@@ -16,7 +16,7 @@
 
 /*  API to control ioam caching */
 
-define ioam_cache_ip6_enable_disable {
+autoreply define ioam_cache_ip6_enable_disable {
     /* Client identifier, set from api_main.my_client_index */
     u32 client_index;
 
@@ -27,11 +27,3 @@ define ioam_cache_ip6_enable_disable {
     u8 is_disable;
 
 };
-
-define ioam_cache_ip6_enable_disable_reply {
-    /* From the request */
-    u32 context;
-
-    /* Return value, zero means all OK */
-    i32 retval;
-};
diff --git a/src/plugins/ioam/lib-pot/pot.api b/src/plugins/ioam/lib-pot/pot.api
index fa2fc126b7e..c377cde0dfe 100644
--- a/src/plugins/ioam/lib-pot/pot.api
+++ b/src/plugins/ioam/lib-pot/pot.api
@@ -27,7 +27,7 @@
     @param list_name_len - length of the name of this profile list
     @param list_name - name of this profile list
 */
-define pot_profile_add {
+autoreply define pot_profile_add {
   u32 client_index;
   u32 context;
   u8 id;
@@ -42,22 +42,12 @@ define pot_profile_add {
   u8 list_name[0];
 };
 
-/** \brief Proof of Transit profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define pot_profile_add_reply {
-    u32 context;
-    i32 retval;
-};
-
-
 /** \brief Proof of Transit(POT): Activate POT profile in the list
     @param id - id of the profile 
     @param list_name_len - length of the name of this profile list
     @param list_name - name of this profile list
 */
-define pot_profile_activate {
+autoreply define pot_profile_activate {
   u32 client_index;
   u32 context;
   u8 id;
@@ -65,37 +55,19 @@ define pot_profile_activate {
   u8 list_name[0];
 };
 
-/** \brief Proof of Transit profile activate response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request 
-*/
-define pot_profile_activate_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Delete POT Profile 
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param list_name_len - length of the name of the profile list
     @param list_name - name of profile list to delete
 */
-define pot_profile_del {
+autoreply define pot_profile_del {
   u32 client_index;
   u32 context;
   u8 list_name_len;
   u8 list_name[0];
 };
 
-/** \brief Proof of Transit profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define pot_profile_del_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief Show POT Profiles
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/plugins/ioam/lib-trace/trace.api b/src/plugins/ioam/lib-trace/trace.api
index cb9583256f6..2f45c6e28fd 100644
--- a/src/plugins/ioam/lib-trace/trace.api
+++ b/src/plugins/ioam/lib-trace/trace.api
@@ -22,7 +22,7 @@
     @param trace_tsp- Timestamp resolution
     @param app_data - Application specific opaque
 */
-define trace_profile_add {
+autoreply define trace_profile_add {
   u32 client_index;
   u32 context;
   u8 trace_type;
@@ -32,37 +32,15 @@ define trace_profile_add {
   u32 app_data;
 };
 
-/** \brief Trace profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define trace_profile_add_reply {
-    u32 context;
-    i32 retval;
-};
-
-
-
 /** \brief Delete trace Profile
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
 */
-define trace_profile_del {
+autoreply define trace_profile_del {
   u32 client_index;
   u32 context;
 };
 
-/** \brief Trace profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define trace_profile_del_reply {
-    u32 context;
-    i32 retval;
-};
-
-
-
 /** \brief Show trace Profile
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api b/src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
index 056529a4e8a..a6761f07e40 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
@@ -24,7 +24,7 @@
     @param trace_enable - iOAM Trace enabled or not flag
 
 */
-define vxlan_gpe_ioam_enable {
+autoreply define vxlan_gpe_ioam_enable {
   u32 client_index;
   u32 context;
   u16 id;
@@ -33,38 +33,18 @@ define vxlan_gpe_ioam_enable {
   u8 trace_enable;
 };
 
-/** \brief iOAM Over VxLAN-GPE - Set iOAM transport for VXLAN-GPE reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define vxlan_gpe_ioam_enable_reply {
-    u32 context;
-    i32 retval;
-};
-
-
 /** \brief iOAM for VxLAN-GPE disable
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param id - profile id
 */
-define vxlan_gpe_ioam_disable
+autoreply define vxlan_gpe_ioam_disable
 {
   u32 client_index;
   u32 context;
   u16 id;
 };
 
-/** \brief vxlan_gpe_ioam disable response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define vxlan_gpe_ioam_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Enable iOAM for a VNI (VXLAN-GPE)
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -73,7 +53,7 @@ define vxlan_gpe_ioam_disable_reply
     @param remote - IPv4/6 Address of the remote VTEP
 
 */
-define vxlan_gpe_ioam_vni_enable {
+autoreply define vxlan_gpe_ioam_vni_enable {
   u32 client_index;
   u32 context;
   u32 vni;
@@ -82,18 +62,6 @@ define vxlan_gpe_ioam_vni_enable {
   u8  is_ipv6;
 };
 
-/** \brief Reply to enable iOAM for a VNI (VXLAN-GPE)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_vni_enable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Disable iOAM for a VNI (VXLAN-GPE)
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -102,7 +70,7 @@ define vxlan_gpe_ioam_vni_enable_reply {
     @param remote - IPv4/6 Address of the remote VTEP
 
 */
-define vxlan_gpe_ioam_vni_disable {
+autoreply define vxlan_gpe_ioam_vni_disable {
   u32 client_index;
   u32 context;
   u32 vni;
@@ -111,19 +79,6 @@ define vxlan_gpe_ioam_vni_disable {
   u8  is_ipv6;
 };
 
-/** \brief Reply to disable iOAM for a VNI (VXLAN-GPE)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_vni_disable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
-
 /** \brief Enable iOAM for a VXLAN-GPE transit
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -131,7 +86,7 @@ define vxlan_gpe_ioam_vni_disable_reply {
     @param outer_fib_index- FIB index
 
 */
-define vxlan_gpe_ioam_transit_enable {
+autoreply define vxlan_gpe_ioam_transit_enable {
   u32 client_index;
   u32 context;
   u32 outer_fib_index;
@@ -139,18 +94,6 @@ define vxlan_gpe_ioam_transit_enable {
   u8  is_ipv6;
 };
 
-/** \brief Reply to enable iOAM for VXLAN-GPE transit
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_transit_enable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Disable iOAM for VXLAN-GPE transit
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -158,7 +101,7 @@ define vxlan_gpe_ioam_transit_enable_reply {
     @param outer_fib_index- FIB index
 
 */
-define vxlan_gpe_ioam_transit_disable {
+autoreply define vxlan_gpe_ioam_transit_disable {
   u32 client_index;
   u32 context;
   u32 outer_fib_index;
@@ -166,16 +109,3 @@ define vxlan_gpe_ioam_transit_disable {
   u8  is_ipv6;
 };
 
-/** \brief Reply to disable iOAM for VXLAN-GPE transit
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_transit_disable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
-
diff --git a/src/plugins/lb/lb.api b/src/plugins/lb/lb.api
index 39ee3c8f98b..32cc669b518 100644
--- a/src/plugins/lb/lb.api
+++ b/src/plugins/lb/lb.api
@@ -8,7 +8,7 @@
     @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.
 */
-define lb_conf
+autoreply define lb_conf
 {
   u32 client_index;
   u32 context;
@@ -18,11 +18,6 @@ define lb_conf
   u32 flow_timeout;
 };
 
-define lb_conf_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add a virtual address (or prefix)
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -33,7 +28,7 @@ define lb_conf_reply {
            for this VIP (must be power of 2).
     @param is_del - The VIP should be removed.
 */
-define lb_add_del_vip {
+autoreply define lb_add_del_vip {
   u32 client_index;
   u32 context;
   u8 ip_prefix[16];
@@ -43,11 +38,6 @@ define lb_add_del_vip {
   u8 is_del;
 };
 
-define lb_add_del_vip_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add an application server for a given VIP
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -56,7 +46,7 @@ define lb_add_del_vip_reply {
     @param as_address - The application server address (IPv4 in lower order 32 bits).
     @param is_del - The AS should be removed.
 */
-define lb_add_del_as {
+autoreply define lb_add_del_as {
   u32 client_index;
   u32 context;
   u8 vip_ip_prefix[16];
@@ -64,8 +54,3 @@ define lb_add_del_as {
   u8 as_address[16];
   u8 is_del;
 };
-
-define lb_add_del_as_reply {
-  u32 context;
-  i32 retval;
-};
diff --git a/src/plugins/memif/memif.api b/src/plugins/memif/memif.api
index 6f946421411..95e016c39f2 100644
--- a/src/plugins/memif/memif.api
+++ b/src/plugins/memif/memif.api
@@ -57,7 +57,7 @@ define memif_create_reply
     @param context - sender context, to match reply w/ request
     @param sw_if_index - software index of the interface to delete
 */
-define memif_delete
+autoreply define memif_delete
 {
   u32 client_index;
   u32 context;
@@ -65,16 +65,6 @@ define memif_delete
   u32 sw_if_index;
 };
 
-/** \brief Delete host-interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define memif_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Memory interface details structure
     @param context - sender context, to match reply w/ request (memif_dump)
     @param sw_if_index - index of the interface
diff --git a/src/plugins/snat/snat.api b/src/plugins/snat/snat.api
index 9689f5f9dfc..573b6753711 100644
--- a/src/plugins/snat/snat.api
+++ b/src/plugins/snat/snat.api
@@ -29,7 +29,7 @@
     @param vrf_id - VRF id of tenant, ~0 means independent of VRF
     @param is_add - 1 if add, 0 if delete
 */
-define snat_add_address_range {
+autoreply define snat_add_address_range {
   u32 client_index;
   u32 context;
   u8 is_ip4;
@@ -39,15 +39,6 @@ define snat_add_address_range {
   u8 is_add;
 };
 
-/** \brief Add S-NAT address range reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_add_address_range_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump S-NAT addresses
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -77,7 +68,7 @@ define snat_address_details {
     @param is_inside - 1 if inside, 0 if outside
     @param sw_if_index - software index of the interface
 */
-define snat_interface_add_del_feature {
+autoreply define snat_interface_add_del_feature {
   u32 client_index;
   u32 context;
   u8 is_add;
@@ -85,15 +76,6 @@ define snat_interface_add_del_feature {
   u32 sw_if_index;
 };
 
-/** \brief Enable/disable S-NAT feature on the interface reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_interface_add_del_feature_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump interfaces with S-NAT feature
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -130,7 +112,7 @@ define snat_interface_details {
                                   used)
     @param vfr_id - VRF ID
 */
-define snat_add_static_mapping {
+autoreply define snat_add_static_mapping {
   u32 client_index;
   u32 context;
   u8 is_add;
@@ -145,15 +127,6 @@ define snat_add_static_mapping {
   u32 vrf_id;
 };
 
-/** \brief Add/delete S-NAT static mapping reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_add_static_mapping_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump S-NAT static mappings
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -257,21 +230,12 @@ define snat_show_config_reply
     @param context - sender context, to match reply w/ request
     @param worker_mask - S-NAT workers mask
 */
-define snat_set_workers {
+autoreply define snat_set_workers {
   u32 client_index;
   u32 context;
   u64 worker_mask;
 };
 
-/** \brief Set S-NAT workers reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_set_workers_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump S-NAT workers
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -300,7 +264,7 @@ define snat_worker_details {
     @param is_add - 1 if add, 0 if delete
     @param sw_if_index - software index of the interface
 */
-define snat_add_del_interface_addr {
+autoreply define snat_add_del_interface_addr {
   u32 client_index;
   u32 context;
   u8 is_add;
@@ -308,15 +272,6 @@ define snat_add_del_interface_addr {
   u32 sw_if_index;
 };
 
-/** \brief Add/delete S-NAT pool address from specific interfce reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_add_del_interface_addr_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump S-NAT pool addresses interfaces
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -342,7 +297,7 @@ define snat_interface_addr_details {
     @param src_port - source port number
     @param enable - 1 if enable, 0 if disable
 */
-define snat_ipfix_enable_disable {
+autoreply define snat_ipfix_enable_disable {
   u32 client_index;
   u32 context;
   u32 domain_id;
@@ -350,15 +305,6 @@ define snat_ipfix_enable_disable {
   u8 enable;
 };
 
-/** \brief Enable/disable S-NAT IPFIX logging reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_ipfix_enable_disable_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump S-NAT users
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -437,7 +383,7 @@ define snat_user_session_details {
     @param out_addr - outside IP address
     @param out_addr - outside IP address prefix length
 */
-define snat_add_det_map {
+autoreply define snat_add_det_map {
   u32 client_index;
   u32 context;
   u8 is_add;
@@ -449,15 +395,6 @@ define snat_add_det_map {
   u8 out_plen;
 };
 
-/** \brief Add/delete S-NAT deterministic mapping reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_add_det_map_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get outside address and port range from inside address
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -556,7 +493,7 @@ define snat_det_map_details {
     @param tcp_transitory - TCP transitory timeout (default 240sec)
     @param icmp - ICMP timeout (default 60sec)
 */
-define snat_det_set_timeouts {
+autoreply define snat_det_set_timeouts {
   u32 client_index;
   u32 context;
   u32 udp;
@@ -565,15 +502,6 @@ define snat_det_set_timeouts {
   u32 icmp;
 };
 
-/** \brief Set values of timeouts for deterministic NAT reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_det_set_timeouts_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get values of timeouts for deterministic NAT (seconds)
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request