acl: revert acl: api cleanup

This reverts commit aad1ee149403994194cf37cef4530b042ba7df3a.

Reason for revert: Verify failure. Doesn't build.

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

1 files changed, 19 insertions, 20 deletions

diff --git a/src/plugins/acl/acl.api b/src/plugins/acl/acl.api
index f4f6c9cf4b9..2dedea62123 100644
--- a/src/plugins/acl/acl.api
+++ b/src/plugins/acl/acl.api
@@ -19,10 +19,9 @@
     used to control the ACL plugin
 */
 
-option version = "2.0.0";
+option version = "1.0.1";
 
 import "plugins/acl/acl_types.api";
-import "vnet/interface_types.api";
 
 /** \brief Get the plugin version
     @param client_index - opaque cookie to identify the sender
@@ -107,7 +106,7 @@ manual_print manual_endian define acl_add_replace
   u32 client_index;
   u32 context;
   u32 acl_index; /* ~0 to add, existing ACL# to replace */
-  string tag[64]; /* What gets in here gets out in the corresponding tag field when dumping the ACLs. */
+  u8 tag[64]; /* What gets in here gets out in the corresponding tag field when dumping the ACLs. */
   u32 count;
   vl_api_acl_rule_t r[count];
   option vat_help = "<acl-idx> [<ipv4|ipv6>] <permit|permit+reflect|deny|action N> [src IP/plen] [dst IP/plen] [sport X-Y] [dport X-Y] [proto P] [tcpflags FL MASK], ... , ...";
@@ -155,13 +154,13 @@ autoreply manual_print define acl_interface_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add [default=true];
+  u8 is_add;
 /*
  * is_input = 0 => ACL applied on interface egress
  * is_input = 1 => ACL applied on interface ingress
  */
-  bool is_input;
-  vl_api_interface_index_t sw_if_index;
+  u8 is_input;
+  u32 sw_if_index;
   u32 acl_index;
   option vat_help = "<intfc> | sw_if_index <if-idx> [add|del] [input|output] acl <acl-idx>";
 };
@@ -179,7 +178,7 @@ autoreply manual_print define acl_interface_set_acl_list
 {
   u32 client_index;
   u32 context;
-  vl_api_interface_index_t sw_if_index;
+  u32 sw_if_index;
   u8 count;
   u8 n_input; /* First n_input ACLs are set as a list of input ACLs, the rest are applied as output */
   u32 acls[count];
@@ -217,7 +216,7 @@ manual_endian manual_print define acl_details
 {
   u32 context;
   u32 acl_index;
-  string tag[64]; /* Same blob that was supplied to us when creating the ACL, one hopes. */
+  u8 tag[64]; /* Same blob that was supplied to us when creating the ACL, one hopes. */
   u32 count;
   vl_api_acl_rule_t r[count];
 };
@@ -232,7 +231,7 @@ define acl_interface_list_dump
 {
   u32 client_index;
   u32 context;
-  vl_api_interface_index_t sw_if_index; /* ~0 for all interfaces */
+  u32 sw_if_index; /* ~0 for all interfaces */
   option vat_help = "[<intfc> | sw_if_index <if-idx>]";
 };
 
@@ -247,7 +246,7 @@ define acl_interface_list_dump
 define acl_interface_list_details
 {
   u32 context;
-  vl_api_interface_index_t sw_if_index;
+  u32 sw_if_index;
   u8 count;
   u8 n_input;
   u32 acls[count];
@@ -265,7 +264,7 @@ manual_endian manual_print define macip_acl_add
 {
   u32 client_index;
   u32 context;
-  string tag[64];
+  u8 tag[64];
   u32 count;
   vl_api_macip_acl_rule_t r[count];
   option vat_help = "...";
@@ -298,7 +297,7 @@ manual_endian manual_print define macip_acl_add_replace
   u32 client_index;
   u32 context;
   u32 acl_index; /* ~0 to add, existing MACIP ACL# to replace */
-  string tag[64];
+  u8 tag[64];
   u32 count;
   vl_api_macip_acl_rule_t r[count];
   option vat_help = "<acl-idx> [<ipv4|ipv6>] <permit|deny|action N> [count <count>] [src] ip <ipaddress/[plen]> mac <mac> mask <mac_mask>, ... , ...";
@@ -343,9 +342,9 @@ autoreply manual_print define macip_acl_interface_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add [default=true];
+  u8 is_add;
   /* MACIP ACLs are always input */
-  vl_api_interface_index_t sw_if_index;
+  u32 sw_if_index;
   u32 acl_index;
   option vat_help = "<intfc> | sw_if_index <if-idx> [add|del] acl <acl-idx>";
 };
@@ -376,7 +375,7 @@ manual_endian manual_print define macip_acl_details
 {
   u32 context;
   u32 acl_index;
-  string tag[64];
+  u8 tag[64];
   u32 count;
   vl_api_macip_acl_rule_t r[count];
 };
@@ -415,7 +414,7 @@ define macip_acl_interface_list_dump
 {
   u32 client_index;
   u32 context;
-  vl_api_interface_index_t sw_if_index; /* ~0 for all interfaces */
+  u32 sw_if_index; /* ~0 for all interfaces */
 };
 
 /** \brief Details about a single MACIP ACL contents
@@ -428,7 +427,7 @@ define macip_acl_interface_list_dump
 define macip_acl_interface_list_details
 {
   u32 context;
-  vl_api_interface_index_t sw_if_index;
+  u32 sw_if_index;
   u8 count;
   u32 acls[count];
 };
@@ -446,7 +445,7 @@ autoreply manual_print define acl_interface_set_etype_whitelist
 {
   u32 client_index;
   u32 context;
-  vl_api_interface_index_t sw_if_index;
+  u32 sw_if_index;
   u8 count; /* Total number of ethertypes in the whitelist */
   u8 n_input; /* first n_input ethertypes are input, the rest - output */
   u16 whitelist[count];
@@ -463,7 +462,7 @@ define acl_interface_etype_whitelist_dump
 {
   u32 client_index;
   u32 context;
-  vl_api_interface_index_t sw_if_index; /* ~0 for all interfaces */
+  u32 sw_if_index; /* ~0 for all interfaces */
   option vat_help = "[<intfc> | sw_if_index <if-idx>]";
 };
 
@@ -478,7 +477,7 @@ define acl_interface_etype_whitelist_dump
 define acl_interface_etype_whitelist_details
 {
   u32 context;
-  vl_api_interface_index_t sw_if_index;
+  u32 sw_if_index;
   u8 count;
   u8 n_input; /* first n_input ethertypes are input, the rest - output */
   u16 whitelist[count];