Generator improvements

- all objects are now sorted alphabetically for more consistent output
- unions now have constructor generated
- log level for warnings was changed to debug
- GetAllMessages renamed to GetRegisteredMessages

Change-Id: I976453004a2fd8b6cb95ca0acfcef56913bf8d38
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>

1 files changed, 554 insertions, 555 deletions

diff --git a/examples/bin_api/acl/acl.ba.go b/examples/bin_api/acl/acl.ba.go
index eff85d4..9b43110 100644
--- a/examples/bin_api/acl/acl.ba.go
+++ b/examples/bin_api/acl/acl.ba.go
@@ -5,10 +5,9 @@
  Package acl is a generated from VPP binary API module 'acl'.
 
  It contains following objects:
-	 36 messages
-	  2 types
 	 18 services
-
+	  2 types
+	 36 messages
 */
 package acl
 
@@ -244,9 +243,9 @@ func (*MacipACLRule) GetCrcString() string {
 
 /* Messages */
 
-// ACLPluginGetVersion represents VPP binary API message 'acl_plugin_get_version':
+// ACLAddReplace represents VPP binary API message 'acl_add_replace':
 //
-//	"acl_plugin_get_version",
+//	"acl_add_replace",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -259,25 +258,49 @@ func (*MacipACLRule) GetCrcString() string {
 //	    "u32",
 //	    "context"
 //	],
+//	[
+//	    "u32",
+//	    "acl_index"
+//	],
+//	[
+//	    "u8",
+//	    "tag",
+//	    64
+//	],
+//	[
+//	    "u32",
+//	    "count"
+//	],
+//	[
+//	    "vl_api_acl_rule_t",
+//	    "r",
+//	    0,
+//	    "count"
+//	],
 //	{
-//	    "crc": "0x51077d14"
+//	    "crc": "0xe839997e"
 //	}
 //
-type ACLPluginGetVersion struct{}
+type ACLAddReplace struct {
+	ACLIndex uint32
+	Tag      []byte `struc:"[64]byte"`
+	Count    uint32 `struc:"sizeof=R"`
+	R        []ACLRule
+}
 
-func (*ACLPluginGetVersion) GetMessageName() string {
-	return "acl_plugin_get_version"
+func (*ACLAddReplace) GetMessageName() string {
+	return "acl_add_replace"
 }
-func (*ACLPluginGetVersion) GetCrcString() string {
-	return "51077d14"
+func (*ACLAddReplace) GetCrcString() string {
+	return "e839997e"
 }
-func (*ACLPluginGetVersion) GetMessageType() api.MessageType {
+func (*ACLAddReplace) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-// ACLPluginGetVersionReply represents VPP binary API message 'acl_plugin_get_version_reply':
+// ACLAddReplaceReply represents VPP binary API message 'acl_add_replace_reply':
 //
-//	"acl_plugin_get_version_reply",
+//	"acl_add_replace_reply",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -288,34 +311,34 @@ func (*ACLPluginGetVersion) GetMessageType() api.MessageType {
 //	],
 //	[
 //	    "u32",
-//	    "major"
+//	    "acl_index"
 //	],
 //	[
-//	    "u32",
-//	    "minor"
+//	    "i32",
+//	    "retval"
 //	],
 //	{
-//	    "crc": "0x9b32cf86"
+//	    "crc": "0xac407b0c"
 //	}
 //
-type ACLPluginGetVersionReply struct {
-	Major uint32
-	Minor uint32
+type ACLAddReplaceReply struct {
+	ACLIndex uint32
+	Retval   int32
 }
 
-func (*ACLPluginGetVersionReply) GetMessageName() string {
-	return "acl_plugin_get_version_reply"
+func (*ACLAddReplaceReply) GetMessageName() string {
+	return "acl_add_replace_reply"
 }
-func (*ACLPluginGetVersionReply) GetCrcString() string {
-	return "9b32cf86"
+func (*ACLAddReplaceReply) GetCrcString() string {
+	return "ac407b0c"
 }
-func (*ACLPluginGetVersionReply) GetMessageType() api.MessageType {
+func (*ACLAddReplaceReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// ACLPluginControlPing represents VPP binary API message 'acl_plugin_control_ping':
+// ACLDel represents VPP binary API message 'acl_del':
 //
-//	"acl_plugin_control_ping",
+//	"acl_del",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -328,25 +351,31 @@ func (*ACLPluginGetVersionReply) GetMessageType() api.MessageType {
 //	    "u32",
 //	    "context"
 //	],
+//	[
+//	    "u32",
+//	    "acl_index"
+//	],
 //	{
-//	    "crc": "0x51077d14"
+//	    "crc": "0xef34fea4"
 //	}
 //
-type ACLPluginControlPing struct{}
+type ACLDel struct {
+	ACLIndex uint32
+}
 
-func (*ACLPluginControlPing) GetMessageName() string {
-	return "acl_plugin_control_ping"
+func (*ACLDel) GetMessageName() string {
+	return "acl_del"
 }
-func (*ACLPluginControlPing) GetCrcString() string {
-	return "51077d14"
+func (*ACLDel) GetCrcString() string {
+	return "ef34fea4"
 }
-func (*ACLPluginControlPing) GetMessageType() api.MessageType {
+func (*ACLDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-// ACLPluginControlPingReply represents VPP binary API message 'acl_plugin_control_ping_reply':
+// ACLDelReply represents VPP binary API message 'acl_del_reply':
 //
-//	"acl_plugin_control_ping_reply",
+//	"acl_del_reply",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -359,101 +388,115 @@ func (*ACLPluginControlPing) GetMessageType() api.MessageType {
 //	    "i32",
 //	    "retval"
 //	],
-//	[
-//	    "u32",
-//	    "client_index"
-//	],
-//	[
-//	    "u32",
-//	    "vpe_pid"
-//	],
 //	{
-//	    "crc": "0xf6b0b8ca"
+//	    "crc": "0xe8d4e804"
 //	}
 //
-type ACLPluginControlPingReply struct {
-	Retval      int32
-	ClientIndex uint32
-	VpePID      uint32
+type ACLDelReply struct {
+	Retval int32
 }
 
-func (*ACLPluginControlPingReply) GetMessageName() string {
-	return "acl_plugin_control_ping_reply"
+func (*ACLDelReply) GetMessageName() string {
+	return "acl_del_reply"
 }
-func (*ACLPluginControlPingReply) GetCrcString() string {
-	return "f6b0b8ca"
+func (*ACLDelReply) GetCrcString() string {
+	return "e8d4e804"
 }
-func (*ACLPluginControlPingReply) GetMessageType() api.MessageType {
+func (*ACLDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// ACLPluginGetConnTableMaxEntries represents VPP binary API message 'acl_plugin_get_conn_table_max_entries':
+// ACLDetails represents VPP binary API message 'acl_details':
 //
-//	"acl_plugin_get_conn_table_max_entries",
+//	"acl_details",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
-//	    "client_index"
+//	    "context"
 //	],
 //	[
 //	    "u32",
-//	    "context"
+//	    "acl_index"
+//	],
+//	[
+//	    "u8",
+//	    "tag",
+//	    64
+//	],
+//	[
+//	    "u32",
+//	    "count"
+//	],
+//	[
+//	    "vl_api_acl_rule_t",
+//	    "r",
+//	    0,
+//	    "count"
 //	],
 //	{
-//	    "crc": "0x51077d14"
+//	    "crc": "0x5bd895be"
 //	}
 //
-type ACLPluginGetConnTableMaxEntries struct{}
+type ACLDetails struct {
+	ACLIndex uint32
+	Tag      []byte `struc:"[64]byte"`
+	Count    uint32 `struc:"sizeof=R"`
+	R        []ACLRule
+}
 
-func (*ACLPluginGetConnTableMaxEntries) GetMessageName() string {
-	return "acl_plugin_get_conn_table_max_entries"
+func (*ACLDetails) GetMessageName() string {
+	return "acl_details"
 }
-func (*ACLPluginGetConnTableMaxEntries) GetCrcString() string {
-	return "51077d14"
+func (*ACLDetails) GetCrcString() string {
+	return "5bd895be"
 }
-func (*ACLPluginGetConnTableMaxEntries) GetMessageType() api.MessageType {
-	return api.RequestMessage
+func (*ACLDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
 }
 
-// ACLPluginGetConnTableMaxEntriesReply represents VPP binary API message 'acl_plugin_get_conn_table_max_entries_reply':
+// ACLDump represents VPP binary API message 'acl_dump':
 //
-//	"acl_plugin_get_conn_table_max_entries_reply",
+//	"acl_dump",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
+//	    "client_index"
+//	],
+//	[
+//	    "u32",
 //	    "context"
 //	],
 //	[
-//	    "u64",
-//	    "conn_table_max_entries"
+//	    "u32",
+//	    "acl_index"
 //	],
 //	{
-//	    "crc": "0x7a096d3d"
+//	    "crc": "0xef34fea4"
 //	}
 //
-type ACLPluginGetConnTableMaxEntriesReply struct {
-	ConnTableMaxEntries uint64
+type ACLDump struct {
+	ACLIndex uint32
 }
 
-func (*ACLPluginGetConnTableMaxEntriesReply) GetMessageName() string {
-	return "acl_plugin_get_conn_table_max_entries_reply"
+func (*ACLDump) GetMessageName() string {
+	return "acl_dump"
 }
-func (*ACLPluginGetConnTableMaxEntriesReply) GetCrcString() string {
-	return "7a096d3d"
+func (*ACLDump) GetCrcString() string {
+	return "ef34fea4"
 }
-func (*ACLPluginGetConnTableMaxEntriesReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
+func (*ACLDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
 }
 
-// ACLAddReplace represents VPP binary API message 'acl_add_replace':
+// ACLInterfaceAddDel represents VPP binary API message 'acl_interface_add_del':
 //
-//	"acl_add_replace",
+//	"acl_interface_add_del",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -467,48 +510,45 @@ func (*ACLPluginGetConnTableMaxEntriesReply) GetMessageType() api.MessageType {
 //	    "context"
 //	],
 //	[
-//	    "u32",
-//	    "acl_index"
+//	    "u8",
+//	    "is_add"
 //	],
 //	[
 //	    "u8",
-//	    "tag",
-//	    64
+//	    "is_input"
 //	],
 //	[
 //	    "u32",
-//	    "count"
+//	    "sw_if_index"
 //	],
 //	[
-//	    "vl_api_acl_rule_t",
-//	    "r",
-//	    0,
-//	    "count"
+//	    "u32",
+//	    "acl_index"
 //	],
 //	{
-//	    "crc": "0xe839997e"
+//	    "crc": "0x0b2aedd1"
 //	}
 //
-type ACLAddReplace struct {
-	ACLIndex uint32
-	Tag      []byte `struc:"[64]byte"`
-	Count    uint32 `struc:"sizeof=R"`
-	R        []ACLRule
+type ACLInterfaceAddDel struct {
+	IsAdd     uint8
+	IsInput   uint8
+	SwIfIndex uint32
+	ACLIndex  uint32
 }
 
-func (*ACLAddReplace) GetMessageName() string {
-	return "acl_add_replace"
+func (*ACLInterfaceAddDel) GetMessageName() string {
+	return "acl_interface_add_del"
 }
-func (*ACLAddReplace) GetCrcString() string {
-	return "e839997e"
+func (*ACLInterfaceAddDel) GetCrcString() string {
+	return "0b2aedd1"
 }
-func (*ACLAddReplace) GetMessageType() api.MessageType {
+func (*ACLInterfaceAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-// ACLAddReplaceReply represents VPP binary API message 'acl_add_replace_reply':
+// ACLInterfaceAddDelReply represents VPP binary API message 'acl_interface_add_del_reply':
 //
-//	"acl_add_replace_reply",
+//	"acl_interface_add_del_reply",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -518,185 +558,199 @@ func (*ACLAddReplace) GetMessageType() api.MessageType {
 //	    "context"
 //	],
 //	[
-//	    "u32",
-//	    "acl_index"
-//	],
-//	[
 //	    "i32",
 //	    "retval"
 //	],
 //	{
-//	    "crc": "0xac407b0c"
+//	    "crc": "0xe8d4e804"
 //	}
 //
-type ACLAddReplaceReply struct {
-	ACLIndex uint32
-	Retval   int32
+type ACLInterfaceAddDelReply struct {
+	Retval int32
 }
 
-func (*ACLAddReplaceReply) GetMessageName() string {
-	return "acl_add_replace_reply"
+func (*ACLInterfaceAddDelReply) GetMessageName() string {
+	return "acl_interface_add_del_reply"
 }
-func (*ACLAddReplaceReply) GetCrcString() string {
-	return "ac407b0c"
+func (*ACLInterfaceAddDelReply) GetCrcString() string {
+	return "e8d4e804"
 }
-func (*ACLAddReplaceReply) GetMessageType() api.MessageType {
+func (*ACLInterfaceAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// ACLDel represents VPP binary API message 'acl_del':
+// ACLInterfaceEtypeWhitelistDetails represents VPP binary API message 'acl_interface_etype_whitelist_details':
 //
-//	"acl_del",
+//	"acl_interface_etype_whitelist_details",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
-//	    "client_index"
+//	    "context"
 //	],
 //	[
 //	    "u32",
-//	    "context"
+//	    "sw_if_index"
 //	],
 //	[
-//	    "u32",
-//	    "acl_index"
+//	    "u8",
+//	    "count"
+//	],
+//	[
+//	    "u8",
+//	    "n_input"
+//	],
+//	[
+//	    "u16",
+//	    "whitelist",
+//	    0,
+//	    "count"
 //	],
 //	{
-//	    "crc": "0xef34fea4"
+//	    "crc": "0x6a5d4e81"
 //	}
 //
-type ACLDel struct {
-	ACLIndex uint32
+type ACLInterfaceEtypeWhitelistDetails struct {
+	SwIfIndex uint32
+	Count     uint8 `struc:"sizeof=Whitelist"`
+	NInput    uint8
+	Whitelist []uint16
 }
 
-func (*ACLDel) GetMessageName() string {
-	return "acl_del"
+func (*ACLInterfaceEtypeWhitelistDetails) GetMessageName() string {
+	return "acl_interface_etype_whitelist_details"
 }
-func (*ACLDel) GetCrcString() string {
-	return "ef34fea4"
+func (*ACLInterfaceEtypeWhitelistDetails) GetCrcString() string {
+	return "6a5d4e81"
 }
-func (*ACLDel) GetMessageType() api.MessageType {
-	return api.RequestMessage
+func (*ACLInterfaceEtypeWhitelistDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
 }
 
-// ACLDelReply represents VPP binary API message 'acl_del_reply':
+// ACLInterfaceEtypeWhitelistDump represents VPP binary API message 'acl_interface_etype_whitelist_dump':
 //
-//	"acl_del_reply",
+//	"acl_interface_etype_whitelist_dump",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
+//	    "client_index"
+//	],
+//	[
+//	    "u32",
 //	    "context"
 //	],
 //	[
-//	    "i32",
-//	    "retval"
+//	    "u32",
+//	    "sw_if_index"
 //	],
 //	{
-//	    "crc": "0xe8d4e804"
+//	    "crc": "0x529cb13f"
 //	}
 //
-type ACLDelReply struct {
-	Retval int32
+type ACLInterfaceEtypeWhitelistDump struct {
+	SwIfIndex uint32
 }
 
-func (*ACLDelReply) GetMessageName() string {
-	return "acl_del_reply"
+func (*ACLInterfaceEtypeWhitelistDump) GetMessageName() string {
+	return "acl_interface_etype_whitelist_dump"
 }
-func (*ACLDelReply) GetCrcString() string {
-	return "e8d4e804"
+func (*ACLInterfaceEtypeWhitelistDump) GetCrcString() string {
+	return "529cb13f"
 }
-func (*ACLDelReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
+func (*ACLInterfaceEtypeWhitelistDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
 }
 
-// ACLInterfaceAddDel represents VPP binary API message 'acl_interface_add_del':
+// ACLInterfaceListDetails represents VPP binary API message 'acl_interface_list_details':
 //
-//	"acl_interface_add_del",
+//	"acl_interface_list_details",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
-//	    "client_index"
+//	    "context"
 //	],
 //	[
 //	    "u32",
-//	    "context"
+//	    "sw_if_index"
 //	],
 //	[
 //	    "u8",
-//	    "is_add"
+//	    "count"
 //	],
 //	[
 //	    "u8",
-//	    "is_input"
-//	],
-//	[
-//	    "u32",
-//	    "sw_if_index"
+//	    "n_input"
 //	],
 //	[
 //	    "u32",
-//	    "acl_index"
+//	    "acls",
+//	    0,
+//	    "count"
 //	],
 //	{
-//	    "crc": "0x0b2aedd1"
+//	    "crc": "0xd5e80809"
 //	}
 //
-type ACLInterfaceAddDel struct {
-	IsAdd     uint8
-	IsInput   uint8
+type ACLInterfaceListDetails struct {
 	SwIfIndex uint32
-	ACLIndex  uint32
+	Count     uint8 `struc:"sizeof=Acls"`
+	NInput    uint8
+	Acls      []uint32
 }
 
-func (*ACLInterfaceAddDel) GetMessageName() string {
-	return "acl_interface_add_del"
+func (*ACLInterfaceListDetails) GetMessageName() string {
+	return "acl_interface_list_details"
 }
-func (*ACLInterfaceAddDel) GetCrcString() string {
-	return "0b2aedd1"
+func (*ACLInterfaceListDetails) GetCrcString() string {
+	return "d5e80809"
 }
-func (*ACLInterfaceAddDel) GetMessageType() api.MessageType {
-	return api.RequestMessage
+func (*ACLInterfaceListDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
 }
 
-// ACLInterfaceAddDelReply represents VPP binary API message 'acl_interface_add_del_reply':
+// ACLInterfaceListDump represents VPP binary API message 'acl_interface_list_dump':
 //
-//	"acl_interface_add_del_reply",
+//	"acl_interface_list_dump",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
+//	    "client_index"
+//	],
+//	[
+//	    "u32",
 //	    "context"
 //	],
 //	[
-//	    "i32",
-//	    "retval"
+//	    "u32",
+//	    "sw_if_index"
 //	],
 //	{
-//	    "crc": "0xe8d4e804"
+//	    "crc": "0x529cb13f"
 //	}
 //
-type ACLInterfaceAddDelReply struct {
-	Retval int32
+type ACLInterfaceListDump struct {
+	SwIfIndex uint32
 }
 
-func (*ACLInterfaceAddDelReply) GetMessageName() string {
-	return "acl_interface_add_del_reply"
+func (*ACLInterfaceListDump) GetMessageName() string {
+	return "acl_interface_list_dump"
 }
-func (*ACLInterfaceAddDelReply) GetCrcString() string {
-	return "e8d4e804"
+func (*ACLInterfaceListDump) GetCrcString() string {
+	return "529cb13f"
 }
-func (*ACLInterfaceAddDelReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
+func (*ACLInterfaceListDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
 }
 
 // ACLInterfaceSetACLList represents VPP binary API message 'acl_interface_set_acl_list':
@@ -786,9 +840,9 @@ func (*ACLInterfaceSetACLListReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// ACLDump represents VPP binary API message 'acl_dump':
+// ACLInterfaceSetEtypeWhitelist represents VPP binary API message 'acl_interface_set_etype_whitelist':
 //
-//	"acl_dump",
+//	"acl_interface_set_etype_whitelist",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -803,80 +857,153 @@ func (*ACLInterfaceSetACLListReply) GetMessageType() api.MessageType {
 //	],
 //	[
 //	    "u32",
-//	    "acl_index"
+//	    "sw_if_index"
+//	],
+//	[
+//	    "u8",
+//	    "count"
+//	],
+//	[
+//	    "u8",
+//	    "n_input"
+//	],
+//	[
+//	    "u16",
+//	    "whitelist",
+//	    0,
+//	    "count"
 //	],
 //	{
-//	    "crc": "0xef34fea4"
+//	    "crc": "0xf515efc5"
 //	}
 //
-type ACLDump struct {
-	ACLIndex uint32
+type ACLInterfaceSetEtypeWhitelist struct {
+	SwIfIndex uint32
+	Count     uint8 `struc:"sizeof=Whitelist"`
+	NInput    uint8
+	Whitelist []uint16
 }
 
-func (*ACLDump) GetMessageName() string {
-	return "acl_dump"
+func (*ACLInterfaceSetEtypeWhitelist) GetMessageName() string {
+	return "acl_interface_set_etype_whitelist"
 }
-func (*ACLDump) GetCrcString() string {
-	return "ef34fea4"
+func (*ACLInterfaceSetEtypeWhitelist) GetCrcString() string {
+	return "f515efc5"
 }
-func (*ACLDump) GetMessageType() api.MessageType {
+func (*ACLInterfaceSetEtypeWhitelist) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-// ACLDetails represents VPP binary API message 'acl_details':
+// ACLInterfaceSetEtypeWhitelistReply represents VPP binary API message 'acl_interface_set_etype_whitelist_reply':
 //
-//	"acl_details",
+//	"acl_interface_set_etype_whitelist_reply",
+//	[
+//	    "u16",
+//	    "_vl_msg_id"
+//	],
+//	[
+//	    "u32",
+//	    "context"
+//	],
+//	[
+//	    "i32",
+//	    "retval"
+//	],
+//	{
+//	    "crc": "0xe8d4e804"
+//	}
+//
+type ACLInterfaceSetEtypeWhitelistReply struct {
+	Retval int32
+}
+
+func (*ACLInterfaceSetEtypeWhitelistReply) GetMessageName() string {
+	return "acl_interface_set_etype_whitelist_reply"
+}
+func (*ACLInterfaceSetEtypeWhitelistReply) GetCrcString() string {
+	return "e8d4e804"
+}
+func (*ACLInterfaceSetEtypeWhitelistReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+// ACLPluginControlPing represents VPP binary API message 'acl_plugin_control_ping':
+//
+//	"acl_plugin_control_ping",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
+//	    "client_index"
+//	],
+//	[
+//	    "u32",
 //	    "context"
 //	],
+//	{
+//	    "crc": "0x51077d14"
+//	}
+//
+type ACLPluginControlPing struct{}
+
+func (*ACLPluginControlPing) GetMessageName() string {
+	return "acl_plugin_control_ping"
+}
+func (*ACLPluginControlPing) GetCrcString() string {
+	return "51077d14"
+}
+func (*ACLPluginControlPing) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+// ACLPluginControlPingReply represents VPP binary API message 'acl_plugin_control_ping_reply':
+//
+//	"acl_plugin_control_ping_reply",
+//	[
+//	    "u16",
+//	    "_vl_msg_id"
+//	],
 //	[
 //	    "u32",
-//	    "acl_index"
+//	    "context"
 //	],
 //	[
-//	    "u8",
-//	    "tag",
-//	    64
+//	    "i32",
+//	    "retval"
 //	],
 //	[
 //	    "u32",
-//	    "count"
+//	    "client_index"
 //	],
 //	[
-//	    "vl_api_acl_rule_t",
-//	    "r",
-//	    0,
-//	    "count"
+//	    "u32",
+//	    "vpe_pid"
 //	],
 //	{
-//	    "crc": "0x5bd895be"
+//	    "crc": "0xf6b0b8ca"
 //	}
 //
-type ACLDetails struct {
-	ACLIndex uint32
-	Tag      []byte `struc:"[64]byte"`
-	Count    uint32 `struc:"sizeof=R"`
-	R        []ACLRule
+type ACLPluginControlPingReply struct {
+	Retval      int32
+	ClientIndex uint32
+	VpePID      uint32
 }
 
-func (*ACLDetails) GetMessageName() string {
-	return "acl_details"
+func (*ACLPluginControlPingReply) GetMessageName() string {
+	return "acl_plugin_control_ping_reply"
 }
-func (*ACLDetails) GetCrcString() string {
-	return "5bd895be"
+func (*ACLPluginControlPingReply) GetCrcString() string {
+	return "f6b0b8ca"
 }
-func (*ACLDetails) GetMessageType() api.MessageType {
+func (*ACLPluginControlPingReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// ACLInterfaceListDump represents VPP binary API message 'acl_interface_list_dump':
+// ACLPluginGetConnTableMaxEntries represents VPP binary API message 'acl_plugin_get_conn_table_max_entries':
 //
-//	"acl_interface_list_dump",
+//	"acl_plugin_get_conn_table_max_entries",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -889,75 +1016,121 @@ func (*ACLDetails) GetMessageType() api.MessageType {
 //	    "u32",
 //	    "context"
 //	],
+//	{
+//	    "crc": "0x51077d14"
+//	}
+//
+type ACLPluginGetConnTableMaxEntries struct{}
+
+func (*ACLPluginGetConnTableMaxEntries) GetMessageName() string {
+	return "acl_plugin_get_conn_table_max_entries"
+}
+func (*ACLPluginGetConnTableMaxEntries) GetCrcString() string {
+	return "51077d14"
+}
+func (*ACLPluginGetConnTableMaxEntries) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+// ACLPluginGetConnTableMaxEntriesReply represents VPP binary API message 'acl_plugin_get_conn_table_max_entries_reply':
+//
+//	"acl_plugin_get_conn_table_max_entries_reply",
+//	[
+//	    "u16",
+//	    "_vl_msg_id"
+//	],
 //	[
 //	    "u32",
-//	    "sw_if_index"
+//	    "context"
+//	],
+//	[
+//	    "u64",
+//	    "conn_table_max_entries"
 //	],
 //	{
-//	    "crc": "0x529cb13f"
+//	    "crc": "0x7a096d3d"
 //	}
 //
-type ACLInterfaceListDump struct {
-	SwIfIndex uint32
+type ACLPluginGetConnTableMaxEntriesReply struct {
+	ConnTableMaxEntries uint64
 }
 
-func (*ACLInterfaceListDump) GetMessageName() string {
-	return "acl_interface_list_dump"
+func (*ACLPluginGetConnTableMaxEntriesReply) GetMessageName() string {
+	return "acl_plugin_get_conn_table_max_entries_reply"
 }
-func (*ACLInterfaceListDump) GetCrcString() string {
-	return "529cb13f"
+func (*ACLPluginGetConnTableMaxEntriesReply) GetCrcString() string {
+	return "7a096d3d"
 }
-func (*ACLInterfaceListDump) GetMessageType() api.MessageType {
-	return api.RequestMessage
+func (*ACLPluginGetConnTableMaxEntriesReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
 }
 
-// ACLInterfaceListDetails represents VPP binary API message 'acl_interface_list_details':
+// ACLPluginGetVersion represents VPP binary API message 'acl_plugin_get_version':
 //
-//	"acl_interface_list_details",
+//	"acl_plugin_get_version",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
-//	    "context"
+//	    "client_index"
 //	],
 //	[
 //	    "u32",
-//	    "sw_if_index"
+//	    "context"
 //	],
+//	{
+//	    "crc": "0x51077d14"
+//	}
+//
+type ACLPluginGetVersion struct{}
+
+func (*ACLPluginGetVersion) GetMessageName() string {
+	return "acl_plugin_get_version"
+}
+func (*ACLPluginGetVersion) GetCrcString() string {
+	return "51077d14"
+}
+func (*ACLPluginGetVersion) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+// ACLPluginGetVersionReply represents VPP binary API message 'acl_plugin_get_version_reply':
+//
+//	"acl_plugin_get_version_reply",
 //	[
-//	    "u8",
-//	    "count"
+//	    "u16",
+//	    "_vl_msg_id"
 //	],
 //	[
-//	    "u8",
-//	    "n_input"
+//	    "u32",
+//	    "context"
 //	],
 //	[
 //	    "u32",
-//	    "acls",
-//	    0,
-//	    "count"
+//	    "major"
+//	],
+//	[
+//	    "u32",
+//	    "minor"
 //	],
 //	{
-//	    "crc": "0xd5e80809"
+//	    "crc": "0x9b32cf86"
 //	}
 //
-type ACLInterfaceListDetails struct {
-	SwIfIndex uint32
-	Count     uint8 `struc:"sizeof=Acls"`
-	NInput    uint8
-	Acls      []uint32
+type ACLPluginGetVersionReply struct {
+	Major uint32
+	Minor uint32
 }
 
-func (*ACLInterfaceListDetails) GetMessageName() string {
-	return "acl_interface_list_details"
+func (*ACLPluginGetVersionReply) GetMessageName() string {
+	return "acl_plugin_get_version_reply"
 }
-func (*ACLInterfaceListDetails) GetCrcString() string {
-	return "d5e80809"
+func (*ACLPluginGetVersionReply) GetCrcString() string {
+	return "9b32cf86"
 }
-func (*ACLInterfaceListDetails) GetMessageType() api.MessageType {
+func (*ACLPluginGetVersionReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
@@ -1011,44 +1184,6 @@ func (*MacipACLAdd) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-// MacipACLAddReply represents VPP binary API message 'macip_acl_add_reply':
-//
-//	"macip_acl_add_reply",
-//	[
-//	    "u16",
-//	    "_vl_msg_id"
-//	],
-//	[
-//	    "u32",
-//	    "context"
-//	],
-//	[
-//	    "u32",
-//	    "acl_index"
-//	],
-//	[
-//	    "i32",
-//	    "retval"
-//	],
-//	{
-//	    "crc": "0xac407b0c"
-//	}
-//
-type MacipACLAddReply struct {
-	ACLIndex uint32
-	Retval   int32
-}
-
-func (*MacipACLAddReply) GetMessageName() string {
-	return "macip_acl_add_reply"
-}
-func (*MacipACLAddReply) GetCrcString() string {
-	return "ac407b0c"
-}
-func (*MacipACLAddReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
-
 // MacipACLAddReplace represents VPP binary API message 'macip_acl_add_replace':
 //
 //	"macip_acl_add_replace",
@@ -1142,6 +1277,44 @@ func (*MacipACLAddReplaceReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
+// MacipACLAddReply represents VPP binary API message 'macip_acl_add_reply':
+//
+//	"macip_acl_add_reply",
+//	[
+//	    "u16",
+//	    "_vl_msg_id"
+//	],
+//	[
+//	    "u32",
+//	    "context"
+//	],
+//	[
+//	    "u32",
+//	    "acl_index"
+//	],
+//	[
+//	    "i32",
+//	    "retval"
+//	],
+//	{
+//	    "crc": "0xac407b0c"
+//	}
+//
+type MacipACLAddReply struct {
+	ACLIndex uint32
+	Retval   int32
+}
+
+func (*MacipACLAddReply) GetMessageName() string {
+	return "macip_acl_add_reply"
+}
+func (*MacipACLAddReply) GetCrcString() string {
+	return "ac407b0c"
+}
+func (*MacipACLAddReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
 // MacipACLDel represents VPP binary API message 'macip_acl_del':
 //
 //	"macip_acl_del",
@@ -1212,83 +1385,54 @@ func (*MacipACLDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// MacipACLInterfaceAddDel represents VPP binary API message 'macip_acl_interface_add_del':
+// MacipACLDetails represents VPP binary API message 'macip_acl_details':
 //
-//	"macip_acl_interface_add_del",
+//	"macip_acl_details",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
-//	    "client_index"
-//	],
-//	[
-//	    "u32",
 //	    "context"
 //	],
 //	[
-//	    "u8",
-//	    "is_add"
-//	],
-//	[
-//	    "u32",
-//	    "sw_if_index"
-//	],
-//	[
 //	    "u32",
 //	    "acl_index"
 //	],
-//	{
-//	    "crc": "0x6a6be97c"
-//	}
-//
-type MacipACLInterfaceAddDel struct {
-	IsAdd     uint8
-	SwIfIndex uint32
-	ACLIndex  uint32
-}
-
-func (*MacipACLInterfaceAddDel) GetMessageName() string {
-	return "macip_acl_interface_add_del"
-}
-func (*MacipACLInterfaceAddDel) GetCrcString() string {
-	return "6a6be97c"
-}
-func (*MacipACLInterfaceAddDel) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
-
-// MacipACLInterfaceAddDelReply represents VPP binary API message 'macip_acl_interface_add_del_reply':
-//
-//	"macip_acl_interface_add_del_reply",
 //	[
-//	    "u16",
-//	    "_vl_msg_id"
+//	    "u8",
+//	    "tag",
+//	    64
 //	],
 //	[
 //	    "u32",
-//	    "context"
+//	    "count"
 //	],
 //	[
-//	    "i32",
-//	    "retval"
+//	    "vl_api_macip_acl_rule_t",
+//	    "r",
+//	    0,
+//	    "count"
 //	],
 //	{
-//	    "crc": "0xe8d4e804"
+//	    "crc": "0xdd2b55ba"
 //	}
 //
-type MacipACLInterfaceAddDelReply struct {
-	Retval int32
+type MacipACLDetails struct {
+	ACLIndex uint32
+	Tag      []byte `struc:"[64]byte"`
+	Count    uint32 `struc:"sizeof=R"`
+	R        []MacipACLRule
 }
 
-func (*MacipACLInterfaceAddDelReply) GetMessageName() string {
-	return "macip_acl_interface_add_del_reply"
+func (*MacipACLDetails) GetMessageName() string {
+	return "macip_acl_details"
 }
-func (*MacipACLInterfaceAddDelReply) GetCrcString() string {
-	return "e8d4e804"
+func (*MacipACLDetails) GetCrcString() string {
+	return "dd2b55ba"
 }
-func (*MacipACLInterfaceAddDelReply) GetMessageType() api.MessageType {
+func (*MacipACLDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
@@ -1329,54 +1473,83 @@ func (*MacipACLDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-// MacipACLDetails represents VPP binary API message 'macip_acl_details':
+// MacipACLInterfaceAddDel represents VPP binary API message 'macip_acl_interface_add_del':
 //
-//	"macip_acl_details",
+//	"macip_acl_interface_add_del",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
+//	    "client_index"
+//	],
+//	[
+//	    "u32",
 //	    "context"
 //	],
 //	[
+//	    "u8",
+//	    "is_add"
+//	],
+//	[
+//	    "u32",
+//	    "sw_if_index"
+//	],
+//	[
 //	    "u32",
 //	    "acl_index"
 //	],
+//	{
+//	    "crc": "0x6a6be97c"
+//	}
+//
+type MacipACLInterfaceAddDel struct {
+	IsAdd     uint8
+	SwIfIndex uint32
+	ACLIndex  uint32
+}
+
+func (*MacipACLInterfaceAddDel) GetMessageName() string {
+	return "macip_acl_interface_add_del"
+}
+func (*MacipACLInterfaceAddDel) GetCrcString() string {
+	return "6a6be97c"
+}
+func (*MacipACLInterfaceAddDel) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+// MacipACLInterfaceAddDelReply represents VPP binary API message 'macip_acl_interface_add_del_reply':
+//
+//	"macip_acl_interface_add_del_reply",
 //	[
-//	    "u8",
-//	    "tag",
-//	    64
+//	    "u16",
+//	    "_vl_msg_id"
 //	],
 //	[
 //	    "u32",
-//	    "count"
+//	    "context"
 //	],
 //	[
-//	    "vl_api_macip_acl_rule_t",
-//	    "r",
-//	    0,
-//	    "count"
+//	    "i32",
+//	    "retval"
 //	],
 //	{
-//	    "crc": "0xdd2b55ba"
+//	    "crc": "0xe8d4e804"
 //	}
 //
-type MacipACLDetails struct {
-	ACLIndex uint32
-	Tag      []byte `struc:"[64]byte"`
-	Count    uint32 `struc:"sizeof=R"`
-	R        []MacipACLRule
+type MacipACLInterfaceAddDelReply struct {
+	Retval int32
 }
 
-func (*MacipACLDetails) GetMessageName() string {
-	return "macip_acl_details"
+func (*MacipACLInterfaceAddDelReply) GetMessageName() string {
+	return "macip_acl_interface_add_del_reply"
 }
-func (*MacipACLDetails) GetCrcString() string {
-	return "dd2b55ba"
+func (*MacipACLInterfaceAddDelReply) GetCrcString() string {
+	return "e8d4e804"
 }
-func (*MacipACLDetails) GetMessageType() api.MessageType {
+func (*MacipACLInterfaceAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
@@ -1451,43 +1624,6 @@ func (*MacipACLInterfaceGetReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// MacipACLInterfaceListDump represents VPP binary API message 'macip_acl_interface_list_dump':
-//
-//	"macip_acl_interface_list_dump",
-//	[
-//	    "u16",
-//	    "_vl_msg_id"
-//	],
-//	[
-//	    "u32",
-//	    "client_index"
-//	],
-//	[
-//	    "u32",
-//	    "context"
-//	],
-//	[
-//	    "u32",
-//	    "sw_if_index"
-//	],
-//	{
-//	    "crc": "0x529cb13f"
-//	}
-//
-type MacipACLInterfaceListDump struct {
-	SwIfIndex uint32
-}
-
-func (*MacipACLInterfaceListDump) GetMessageName() string {
-	return "macip_acl_interface_list_dump"
-}
-func (*MacipACLInterfaceListDump) GetCrcString() string {
-	return "529cb13f"
-}
-func (*MacipACLInterfaceListDump) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
-
 // MacipACLInterfaceListDetails represents VPP binary API message 'macip_acl_interface_list_details':
 //
 //	"macip_acl_interface_list_details",
@@ -1533,96 +1669,9 @@ func (*MacipACLInterfaceListDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
-// ACLInterfaceSetEtypeWhitelist represents VPP binary API message 'acl_interface_set_etype_whitelist':
-//
-//	"acl_interface_set_etype_whitelist",
-//	[
-//	    "u16",
-//	    "_vl_msg_id"
-//	],
-//	[
-//	    "u32",
-//	    "client_index"
-//	],
-//	[
-//	    "u32",
-//	    "context"
-//	],
-//	[
-//	    "u32",
-//	    "sw_if_index"
-//	],
-//	[
-//	    "u8",
-//	    "count"
-//	],
-//	[
-//	    "u8",
-//	    "n_input"
-//	],
-//	[
-//	    "u16",
-//	    "whitelist",
-//	    0,
-//	    "count"
-//	],
-//	{
-//	    "crc": "0xf515efc5"
-//	}
-//
-type ACLInterfaceSetEtypeWhitelist struct {
-	SwIfIndex uint32
-	Count     uint8 `struc:"sizeof=Whitelist"`
-	NInput    uint8
-	Whitelist []uint16
-}
-
-func (*ACLInterfaceSetEtypeWhitelist) GetMessageName() string {
-	return "acl_interface_set_etype_whitelist"
-}
-func (*ACLInterfaceSetEtypeWhitelist) GetCrcString() string {
-	return "f515efc5"
-}
-func (*ACLInterfaceSetEtypeWhitelist) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
-
-// ACLInterfaceSetEtypeWhitelistReply represents VPP binary API message 'acl_interface_set_etype_whitelist_reply':
-//
-//	"acl_interface_set_etype_whitelist_reply",
-//	[
-//	    "u16",
-//	    "_vl_msg_id"
-//	],
-//	[
-//	    "u32",
-//	    "context"
-//	],
-//	[
-//	    "i32",
-//	    "retval"
-//	],
-//	{
-//	    "crc": "0xe8d4e804"
-//	}
-//
-type ACLInterfaceSetEtypeWhitelistReply struct {
-	Retval int32
-}
-
-func (*ACLInterfaceSetEtypeWhitelistReply) GetMessageName() string {
-	return "acl_interface_set_etype_whitelist_reply"
-}
-func (*ACLInterfaceSetEtypeWhitelistReply) GetCrcString() string {
-	return "e8d4e804"
-}
-func (*ACLInterfaceSetEtypeWhitelistReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
-
-// ACLInterfaceEtypeWhitelistDump represents VPP binary API message 'acl_interface_etype_whitelist_dump':
+// MacipACLInterfaceListDump represents VPP binary API message 'macip_acl_interface_list_dump':
 //
-//	"acl_interface_etype_whitelist_dump",
+//	"macip_acl_interface_list_dump",
 //	[
 //	    "u16",
 //	    "_vl_msg_id"
@@ -1643,105 +1692,55 @@ func (*ACLInterfaceSetEtypeWhitelistReply) GetMessageType() api.MessageType {
 //	    "crc": "0x529cb13f"
 //	}
 //
-type ACLInterfaceEtypeWhitelistDump struct {
+type MacipACLInterfaceListDump struct {
 	SwIfIndex uint32
 }
 
-func (*ACLInterfaceEtypeWhitelistDump) GetMessageName() string {
-	return "acl_interface_etype_whitelist_dump"
+func (*MacipACLInterfaceListDump) GetMessageName() string {
+	return "macip_acl_interface_list_dump"
 }
-func (*ACLInterfaceEtypeWhitelistDump) GetCrcString() string {
+func (*MacipACLInterfaceListDump) GetCrcString() string {
 	return "529cb13f"
 }
-func (*ACLInterfaceEtypeWhitelistDump) GetMessageType() api.MessageType {
+func (*MacipACLInterfaceListDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
 
-// ACLInterfaceEtypeWhitelistDetails represents VPP binary API message 'acl_interface_etype_whitelist_details':
-//
-//	"acl_interface_etype_whitelist_details",
-//	[
-//	    "u16",
-//	    "_vl_msg_id"
-//	],
-//	[
-//	    "u32",
-//	    "context"
-//	],
-//	[
-//	    "u32",
-//	    "sw_if_index"
-//	],
-//	[
-//	    "u8",
-//	    "count"
-//	],
-//	[
-//	    "u8",
-//	    "n_input"
-//	],
-//	[
-//	    "u16",
-//	    "whitelist",
-//	    0,
-//	    "count"
-//	],
-//	{
-//	    "crc": "0x6a5d4e81"
-//	}
-//
-type ACLInterfaceEtypeWhitelistDetails struct {
-	SwIfIndex uint32
-	Count     uint8 `struc:"sizeof=Whitelist"`
-	NInput    uint8
-	Whitelist []uint16
-}
-
-func (*ACLInterfaceEtypeWhitelistDetails) GetMessageName() string {
-	return "acl_interface_etype_whitelist_details"
-}
-func (*ACLInterfaceEtypeWhitelistDetails) GetCrcString() string {
-	return "6a5d4e81"
-}
-func (*ACLInterfaceEtypeWhitelistDetails) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
-
 func init() {
-	api.RegisterMessage((*ACLPluginGetVersion)(nil), "acl.ACLPluginGetVersion")
-	api.RegisterMessage((*ACLPluginGetVersionReply)(nil), "acl.ACLPluginGetVersionReply")
-	api.RegisterMessage((*ACLPluginControlPing)(nil), "acl.ACLPluginControlPing")
-	api.RegisterMessage((*ACLPluginControlPingReply)(nil), "acl.ACLPluginControlPingReply")
-	api.RegisterMessage((*ACLPluginGetConnTableMaxEntries)(nil), "acl.ACLPluginGetConnTableMaxEntries")
-	api.RegisterMessage((*ACLPluginGetConnTableMaxEntriesReply)(nil), "acl.ACLPluginGetConnTableMaxEntriesReply")
 	api.RegisterMessage((*ACLAddReplace)(nil), "acl.ACLAddReplace")
 	api.RegisterMessage((*ACLAddReplaceReply)(nil), "acl.ACLAddReplaceReply")
 	api.RegisterMessage((*ACLDel)(nil), "acl.ACLDel")
 	api.RegisterMessage((*ACLDelReply)(nil), "acl.ACLDelReply")
+	api.RegisterMessage((*ACLDetails)(nil), "acl.ACLDetails")
+	api.RegisterMessage((*ACLDump)(nil), "acl.ACLDump")
 	api.RegisterMessage((*ACLInterfaceAddDel)(nil), "acl.ACLInterfaceAddDel")
 	api.RegisterMessage((*ACLInterfaceAddDelReply)(nil), "acl.ACLInterfaceAddDelReply")
+	api.RegisterMessage((*ACLInterfaceEtypeWhitelistDetails)(nil), "acl.ACLInterfaceEtypeWhitelistDetails")
+	api.RegisterMessage((*ACLInterfaceEtypeWhitelistDump)(nil), "acl.ACLInterfaceEtypeWhitelistDump")
+	api.RegisterMessage((*ACLInterfaceListDetails)(nil), "acl.ACLInterfaceListDetails")
+	api.RegisterMessage((*ACLInterfaceListDump)(nil), "acl.ACLInterfaceListDump")
 	api.RegisterMessage((*ACLInterfaceSetACLList)(nil), "acl.ACLInterfaceSetACLList")
 	api.RegisterMessage((*ACLInterfaceSetACLListReply)(nil), "acl.ACLInterfaceSetACLListReply")
-	api.RegisterMessage((*ACLDump)(nil), "acl.ACLDump")
-	api.RegisterMessage((*ACLDetails)(nil), "acl.ACLDetails")
-	api.RegisterMessage((*ACLInterfaceListDump)(nil), "acl.ACLInterfaceListDump")
-	api.RegisterMessage((*ACLInterfaceListDetails)(nil), "acl.ACLInterfaceListDetails")
+	api.RegisterMessage((*ACLInterfaceSetEtypeWhitelist)(nil), "acl.ACLInterfaceSetEtypeWhitelist")
+	api.RegisterMessage((*ACLInterfaceSetEtypeWhitelistReply)(nil), "acl.ACLInterfaceSetEtypeWhitelistReply")
+	api.RegisterMessage((*ACLPluginControlPing)(nil), "acl.ACLPluginControlPing")
+	api.RegisterMessage((*ACLPluginControlPingReply)(nil), "acl.ACLPluginControlPingReply")
+	api.RegisterMessage((*ACLPluginGetConnTableMaxEntries)(nil), "acl.ACLPluginGetConnTableMaxEntries")
+	api.RegisterMessage((*ACLPluginGetConnTableMaxEntriesReply)(nil), "acl.ACLPluginGetConnTableMaxEntriesReply")
+	api.RegisterMessage((*ACLPluginGetVersion)(nil), "acl.ACLPluginGetVersion")
+	api.RegisterMessage((*ACLPluginGetVersionReply)(nil), "acl.ACLPluginGetVersionReply")
 	api.RegisterMessage((*MacipACLAdd)(nil), "acl.MacipACLAdd")
-	api.RegisterMessage((*MacipACLAddReply)(nil), "acl.MacipACLAddReply")
 	api.RegisterMessage((*MacipACLAddReplace)(nil), "acl.MacipACLAddReplace")
 	api.RegisterMessage((*MacipACLAddReplaceReply)(nil), "acl.MacipACLAddReplaceReply")
+	api.RegisterMessage((*MacipACLAddReply)(nil), "acl.MacipACLAddReply")
 	api.RegisterMessage((*MacipACLDel)(nil), "acl.MacipACLDel")
 	api.RegisterMessage((*MacipACLDelReply)(nil), "acl.MacipACLDelReply")
+	api.RegisterMessage((*MacipACLDetails)(nil), "acl.MacipACLDetails")
+	api.RegisterMessage((*MacipACLDump)(nil), "acl.MacipACLDump")
 	api.RegisterMessage((*MacipACLInterfaceAddDel)(nil), "acl.MacipACLInterfaceAddDel")
 	api.RegisterMessage((*MacipACLInterfaceAddDelReply)(nil), "acl.MacipACLInterfaceAddDelReply")
-	api.RegisterMessage((*MacipACLDump)(nil), "acl.MacipACLDump")
-	api.RegisterMessage((*MacipACLDetails)(nil), "acl.MacipACLDetails")
 	api.RegisterMessage((*MacipACLInterfaceGet)(nil), "acl.MacipACLInterfaceGet")
 	api.RegisterMessage((*MacipACLInterfaceGetReply)(nil), "acl.MacipACLInterfaceGetReply")
-	api.RegisterMessage((*MacipACLInterfaceListDump)(nil), "acl.MacipACLInterfaceListDump")
 	api.RegisterMessage((*MacipACLInterfaceListDetails)(nil), "acl.MacipACLInterfaceListDetails")
-	api.RegisterMessage((*ACLInterfaceSetEtypeWhitelist)(nil), "acl.ACLInterfaceSetEtypeWhitelist")
-	api.RegisterMessage((*ACLInterfaceSetEtypeWhitelistReply)(nil), "acl.ACLInterfaceSetEtypeWhitelistReply")
-	api.RegisterMessage((*ACLInterfaceEtypeWhitelistDump)(nil), "acl.ACLInterfaceEtypeWhitelistDump")
-	api.RegisterMessage((*ACLInterfaceEtypeWhitelistDetails)(nil), "acl.ACLInterfaceEtypeWhitelistDetails")
+	api.RegisterMessage((*MacipACLInterfaceListDump)(nil), "acl.MacipACLInterfaceListDump")
 }