vppapigen: remove support for legacy typedefs

vppapigen has remapped legacy to typedefs behind the scenes
for some time now.

- update .api files to use new style typedefs.
- issue error on 'typeonly define' in .api files
- remove unneeded macros redefining vl_noop_handler

Type: refactor

Change-Id: I7a8c4a6dafacee6a131f95cd0e9b03a8c60dea8b
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

11 files changed, 15 insertions, 71 deletions

diff --git a/src/plugins/abf/abf.api b/src/plugins/abf/abf.api
index 03044ad5a6b..72f4b37ce8e 100644
--- a/src/plugins/abf/abf.api
+++ b/src/plugins/abf/abf.api
@@ -51,7 +51,7 @@ define abf_plugin_get_version_reply
     @param n_paths Number of paths
     @param paths The set of forwarding paths that are being added or removed.
  */
-typeonly define abf_policy
+typedef abf_policy
 {
   u32 policy_id;
   u32 acl_index;
@@ -96,7 +96,7 @@ define abf_policy_dump
               on this interface. lower value is 'better'
     @param is_ipv6 Does this attachment apply to IPv6 packets (or IPv4)
 */
-typeonly define abf_itf_attach
+typedef abf_itf_attach
 {
   u32 policy_id;
   u32 sw_if_index;
diff --git a/src/plugins/acl/acl_types.api b/src/plugins/acl/acl_types.api
index a47c9b3668c..fb58f8851c8 100644
--- a/src/plugins/acl/acl_types.api
+++ b/src/plugins/acl/acl_types.api
@@ -32,7 +32,7 @@
     @param tcp_flags_value - if proto==6, mask to AND the TCP flags in the packet with
 */
 
-typeonly manual_print define acl_rule
+typedef acl_rule
 {
   u8 is_permit;
   u8 is_ipv6;
@@ -77,7 +77,7 @@ typeonly manual_print define acl_rule
     @param src_ip_prefix_len - Source prefix length
 */
 
-typeonly manual_print define macip_acl_rule
+typedef macip_acl_rule
 {
   u8 is_permit;
   u8 is_ipv6;
diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h
index c592f892272..bc0ad92f3f1 100644
--- a/src/plugins/acl/manual_fns.h
+++ b/src/plugins/acl/manual_fns.h
@@ -121,61 +121,6 @@ format_acl_action(u8 *s, u8 action)
 }
 
 static inline void *
-vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "  %s ", a->is_ipv6 ? "ipv6" : "ipv4");
-  s = format_acl_action (s, a->is_permit);
-  s = format (s, " \\\n");
-
-  if (a->is_ipv6)
-    s = format (s, "    src %U/%d dst %U/%d \\\n",
-		format_ip6_address, a->src_ip_addr, a->src_ip_prefix_len,
-		format_ip6_address, a->dst_ip_addr, a->dst_ip_prefix_len);
-  else
-    s = format (s, "    src %U/%d dst %U/%d \\\n",
-		format_ip4_address, a->src_ip_addr, a->src_ip_prefix_len,
-		format_ip4_address, a->dst_ip_addr, a->dst_ip_prefix_len);
-  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;
-
-  s = format (0, "  %s %s \\\n", a->is_ipv6 ? "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);
-
-  if (a->is_ipv6)
-    s = format (s, "    src ip %U/%d, \\",
-		format_ip6_address, a->src_ip_addr, a->src_ip_prefix_len);
-  else
-    s = format (s, "    src ip %U/%d, \\",
-		format_ip4_address, a->src_ip_addr, a->src_ip_prefix_len);
-
-  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;
diff --git a/src/plugins/gbp/gbp.api b/src/plugins/gbp/gbp.api
index 99be9c4f777..60c996583b6 100644
--- a/src/plugins/gbp/gbp.api
+++ b/src/plugins/gbp/gbp.api
@@ -167,7 +167,7 @@ typedef gbp_endpoint_retention
   u32 remote_ep_timeout;
 };
 
-typeonly define gbp_endpoint_group
+typedef gbp_endpoint_group
 {
   u32 vnid;
   u16 sclass;
@@ -202,7 +202,7 @@ define gbp_endpoint_group_details
   vl_api_gbp_endpoint_group_t epg;
 };
 
-typeonly define gbp_recirc
+typedef gbp_recirc
 {
   u32 sw_if_index;
   u16 sclass;
@@ -238,7 +238,7 @@ enum gbp_subnet_type
   GBP_API_SUBNET_ANON_L3_OUT,
 };
 
-typeonly define gbp_subnet
+typedef gbp_subnet
 {
   u32 rd_id;
   u32 sw_if_index;
@@ -399,7 +399,7 @@ enum gbp_ext_itf_flags
   GBP_API_EXT_ITF_F_ANON = 1,
 };
 
-typeonly define gbp_ext_itf
+typedef gbp_ext_itf
 {
   u32 sw_if_index;
   u32 bd_id;
diff --git a/src/plugins/igmp/igmp.api b/src/plugins/igmp/igmp.api
index b061c5e1a35..bc98711dd66 100644
--- a/src/plugins/igmp/igmp.api
+++ b/src/plugins/igmp/igmp.api
@@ -61,7 +61,7 @@ enum filter_mode {
  *   @param saddr - source address
  *   @param gaddr - group address
  */
-typeonly define igmp_group
+typedef igmp_group
 {
   vl_api_filter_mode_t filter;
   u8 n_srcs;
diff --git a/src/plugins/l3xc/l3xc.api b/src/plugins/l3xc/l3xc.api
index 512bedab778..8e37674e964 100644
--- a/src/plugins/l3xc/l3xc.api
+++ b/src/plugins/l3xc/l3xc.api
@@ -50,7 +50,7 @@ define l3xc_plugin_get_version_reply
     @param n_paths Number of paths
     @param paths The set of forwarding paths.
  */
-typeonly define l3xc
+typedef l3xc
 {
   u32 sw_if_index;
   u8 is_ip6;
diff --git a/src/plugins/lb/lb_types.api b/src/plugins/lb/lb_types.api
index 818e51462c5..e01db5dd16c 100644
--- a/src/plugins/lb/lb_types.api
+++ b/src/plugins/lb/lb_types.api
@@ -65,7 +65,7 @@ enum lb_nat_protocol
     @param protocol - tcp or udp.
     @param port - destination port.
 */
-typeonly define lb_vip
+typedef lb_vip
 {
   vl_api_prefix_t pfx;
   vl_api_ip_proto_t protocol;
diff --git a/src/plugins/mactime/mactime.api b/src/plugins/mactime/mactime.api
index 3ba6464ec43..5d5731bc75b 100644
--- a/src/plugins/mactime/mactime.api
+++ b/src/plugins/mactime/mactime.api
@@ -34,7 +34,7 @@ autoreply define mactime_enable_disable
  * times are in double-precision fp seconds since 1/1/1970,
  * which was a Thursday.
  */
-typeonly define time_range
+typedef time_range
 {
   f64 start;                    /**< start of the time range  */
   f64 end;                      /**< end of the time range */
diff --git a/src/plugins/nat/nat.api b/src/plugins/nat/nat.api
index b5057ce1d3c..bd880a6498d 100644
--- a/src/plugins/nat/nat.api
+++ b/src/plugins/nat/nat.api
@@ -893,7 +893,7 @@ define nat44_user_session_details {
     @param probability - probability of the internal node to be randomly matched
     @param vrf_id - VRF id
 */
-typeonly manual_endian define nat44_lb_addr_port {
+typedef nat44_lb_addr_port {
   vl_api_ip4_address_t addr;
   u16 port;
   u8 probability;
diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c
index ff11a82f099..5eaf7672914 100644
--- a/src/plugins/nat/nat_api.c
+++ b/src/plugins/nat/nat_api.c
@@ -33,7 +33,6 @@
 #include <vnet/fib/fib_table.h>
 #include <vnet/ip/ip_types_api.h>
 
-#define vl_api_nat44_lb_addr_port_t_endian vl_noop_handler
 #define vl_api_nat44_add_del_lb_static_mapping_t_endian vl_noop_handler
 #define vl_api_nat44_nat44_lb_static_mapping_details_t_endian vl_noop_handler
 
diff --git a/src/plugins/vmxnet3/vmxnet3.api b/src/plugins/vmxnet3/vmxnet3.api
index 7408836af7b..8c3597bd6a0 100644
--- a/src/plugins/vmxnet3/vmxnet3.api
+++ b/src/plugins/vmxnet3/vmxnet3.api
@@ -80,7 +80,7 @@ autoreply define vmxnet3_delete
     @param tx_consume - tx consume index
 */
 
-typeonly define vmxnet3_tx_list
+typedef vmxnet3_tx_list
 {
   u16 tx_qsize;
   u16 tx_next;
@@ -96,7 +96,7 @@ typeonly define vmxnet3_tx_list
     @param rx_consume - rx consume index
 */
 
-typeonly define vmxnet3_rx_list
+typedef vmxnet3_rx_list
 {
   u16 rx_qsize;
   u16 rx_fill[2];