Refactor GoVPP

Squashed commit of the following:

commit 348930db31575e9f59b3834d9fec07411f011e05
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 15 11:30:13 2018 +0200

    Use debug level for log about different context

commit 9fc963c559cea67a41b85c6cdadc322fb3b1fc7c
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 15 11:22:03 2018 +0200

    Remove annoying logs and add env vars for debugging

commit fdc9fd624d13feadb602e0d03d58f8a44b7a565f
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 15 11:18:47 2018 +0200

    Fix printing unknown VPPApiError

commit 8f968be36a91de4d4a8ea17593ba314f82aa9583
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Tue Aug 14 17:25:10 2018 +0200

    Refactor entire GoVPP

    - fix some cases with inconsistent VPP messages, causing messages
      to be incorrectly identified as event or request
    - simplify API, remove direct access to internal Go channels
    - add module name with message to registration of messages
    - start watching filesystem only when vpe-api file does not exist
    - simplify code in message codec and remove unneeded parts
    - retrieve IDs of all registered messages after connect to VPP
    - define fallback for control ping in core to avoid duplicate registration
    - add SetLogLevel function to set logger level more easily
    - remove lot of unused code

commit 34dd1b7e10ef0324aa8c4e4cc42375bd6021c6cb
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Mon Aug 13 11:29:54 2018 +0200

    Rename VnetError to VPPApiError

commit c6549d6f77847a1367a12ff47fb716e2955e973a
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Mon Aug 13 10:23:43 2018 +0200

    Fix examples and regenerate binapi

commit 4612e36b416779771f5efab4fc654c2766d2cb1c
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Mon Aug 13 09:51:22 2018 +0200

    Add parsing and generation for services

commit ac9c5280c5aa27e325f327609e2364cc66f3723f
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Fri Aug 10 14:30:15 2018 +0200

    Fix exit status on error and add continue-onerror flag

commit 9b3f4ef9fc7c8c62037fa107085eae18a8725314
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 15:20:56 2018 +0200

    Return VnetError when Retval != 0

commit 8fd21a907b5e628ec4d2026215b83d15da96c297
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 14:59:05 2018 +0200

    Add all missing errors from api_errno.h

commit 08450f288d3046ebaecf40203174ae342a07f1eb
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 14:29:27 2018 +0200

    Update README

commit d8dced0728dd62243539be741868fb7d9b8de4cc
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:59:59 2018 +0200

    Regenerate vpe in core

commit 254da7592cdbf634cf7aa46ae36ce7bb6d4ee555
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:37:00 2018 +0200

    Add VnetError type for Retvals

commit 4475c1087fb53ab4c788e530bc7fef7cfc89d2cd
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:36:07 2018 +0200

    Add registration API

commit 892a3ea5a2c703e2f7c29331663f6a6fa706bff5
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:30:43 2018 +0200

    Generate registration for messages and check all IDs on connect

commit 389ed03b6e7082260281866c3449d72d72347c99
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:32:41 2018 +0200

    Show error for empty adapter (on Darwin/Windows)

commit ef1ea040d656ade64242432dc5f06810ed8dcde6
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:31:37 2018 +0200

    Improve logged info

commit d4adae3b14ed54c8d693060dd857fa9ba5ec8e06
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:27:48 2018 +0200

    Update examples

commit 63921e1346014701a22639a2611129563bb1eb78
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:02:56 2018 +0200

    Generate unions and fix some issues

    - add comments between sections
    - define structs on single line if it has no fields
    - generate unions with setters/getters for each field
    - fix detection of message type

commit 6ab3e3fa590b245898306a6ffaf32c7721eab60c
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 8 15:37:10 2018 +0200

    Refactor binapi-generator

    - split JSON parsing from code generation
    - parse and generate enums
    - parse unions (no generation yet)
    - change output file suffix to '.ba.go'
    - cleanup and simplify code
    - split code into files
    - add flag for debug mode

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

1 files changed, 402 insertions, 138 deletions

diff --git a/examples/bin_api/acl/acl.go b/examples/bin_api/acl/acl.ba.go
index f8bb944..ff80173 100644
--- a/examples/bin_api/acl/acl.go
+++ b/examples/bin_api/acl/acl.ba.go
@@ -1,15 +1,31 @@
-// Code generated by govpp binapi-generator DO NOT EDIT.
-// Package acl represents the VPP binary API of the 'acl' VPP module.
-// Generated from '../../bin_api/acl.api.json'
+// Code generated by GoVPP binapi-generator. DO NOT EDIT.
+// source: acl.api.json
+
+/*
+Package acl is a generated VPP binary API of the 'acl' VPP module.
+
+It is generated from this file:
+	acl.api.json
+
+It contains these VPP binary API objects:
+	34 messages
+	2 types
+	17 services
+*/
 package acl
 
 import "git.fd.io/govpp.git/api"
+import "github.com/lunixbochs/struc"
+import "bytes"
 
-// VlApiVersion contains version of the API.
-const VlAPIVersion = 0x1db2ece9
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = struc.Pack
+var _ = bytes.NewBuffer
 
-// ACLRule represents the VPP binary API data type 'acl_rule'.
-// Generated from '../../bin_api/acl.api.json', line 836:
+/* Types */
+
+// ACLRule represents the VPP binary API type 'acl_rule'.
+// Generated from 'acl.api.json', line 922:
 //
 //            "acl_rule",
 //            [
@@ -72,7 +88,7 @@ const VlAPIVersion = 0x1db2ece9
 //
 type ACLRule struct {
 	IsPermit               uint8
-	IsIpv6                 uint8
+	IsIPv6                 uint8
 	SrcIPAddr              []byte `struc:"[16]byte"`
 	SrcIPPrefixLen         uint8
 	DstIPAddr              []byte `struc:"[16]byte"`
@@ -93,8 +109,8 @@ func (*ACLRule) GetCrcString() string {
 	return "6f99bf4d"
 }
 
-// MacipACLRule represents the VPP binary API data type 'macip_acl_rule'.
-// Generated from '../../bin_api/acl.api.json', line 896:
+// MacipACLRule represents the VPP binary API type 'macip_acl_rule'.
+// Generated from 'acl.api.json', line 982:
 //
 //            "macip_acl_rule",
 //            [
@@ -130,7 +146,7 @@ func (*ACLRule) GetCrcString() string {
 //
 type MacipACLRule struct {
 	IsPermit       uint8
-	IsIpv6         uint8
+	IsIPv6         uint8
 	SrcMac         []byte `struc:"[6]byte"`
 	SrcMacMask     []byte `struc:"[6]byte"`
 	SrcIPAddr      []byte `struc:"[16]byte"`
@@ -144,8 +160,10 @@ func (*MacipACLRule) GetCrcString() string {
 	return "70589f1e"
 }
 
+/* Messages */
+
 // ACLPluginGetVersion represents the VPP binary API message 'acl_plugin_get_version'.
-// Generated from '../../bin_api/acl.api.json', line 87:
+// Generated from 'acl.api.json', line 4:
 //
 //            "acl_plugin_get_version",
 //            [
@@ -164,24 +182,23 @@ func (*MacipACLRule) GetCrcString() string {
 //                "crc": "0x51077d14"
 //            }
 //
-type ACLPluginGetVersion struct {
-}
+type ACLPluginGetVersion struct{}
 
 func (*ACLPluginGetVersion) GetMessageName() string {
 	return "acl_plugin_get_version"
 }
-func (*ACLPluginGetVersion) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLPluginGetVersion) GetCrcString() string {
 	return "51077d14"
 }
+func (*ACLPluginGetVersion) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLPluginGetVersion() api.Message {
 	return &ACLPluginGetVersion{}
 }
 
 // ACLPluginGetVersionReply represents the VPP binary API message 'acl_plugin_get_version_reply'.
-// Generated from '../../bin_api/acl.api.json', line 105:
+// Generated from 'acl.api.json', line 22:
 //
 //            "acl_plugin_get_version_reply",
 //            [
@@ -212,18 +229,18 @@ type ACLPluginGetVersionReply struct {
 func (*ACLPluginGetVersionReply) GetMessageName() string {
 	return "acl_plugin_get_version_reply"
 }
-func (*ACLPluginGetVersionReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLPluginGetVersionReply) GetCrcString() string {
 	return "9b32cf86"
 }
+func (*ACLPluginGetVersionReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLPluginGetVersionReply() api.Message {
 	return &ACLPluginGetVersionReply{}
 }
 
 // ACLPluginControlPing represents the VPP binary API message 'acl_plugin_control_ping'.
-// Generated from '../../bin_api/acl.api.json', line 127:
+// Generated from 'acl.api.json', line 44:
 //
 //            "acl_plugin_control_ping",
 //            [
@@ -242,24 +259,23 @@ func NewACLPluginGetVersionReply() api.Message {
 //                "crc": "0x51077d14"
 //            }
 //
-type ACLPluginControlPing struct {
-}
+type ACLPluginControlPing struct{}
 
 func (*ACLPluginControlPing) GetMessageName() string {
 	return "acl_plugin_control_ping"
 }
-func (*ACLPluginControlPing) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLPluginControlPing) GetCrcString() string {
 	return "51077d14"
 }
+func (*ACLPluginControlPing) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLPluginControlPing() api.Message {
 	return &ACLPluginControlPing{}
 }
 
 // ACLPluginControlPingReply represents the VPP binary API message 'acl_plugin_control_ping_reply'.
-// Generated from '../../bin_api/acl.api.json', line 145:
+// Generated from 'acl.api.json', line 62:
 //
 //            "acl_plugin_control_ping_reply",
 //            [
@@ -289,24 +305,24 @@ func NewACLPluginControlPing() api.Message {
 type ACLPluginControlPingReply struct {
 	Retval      int32
 	ClientIndex uint32
-	VpePid      uint32
+	VpePID      uint32
 }
 
 func (*ACLPluginControlPingReply) GetMessageName() string {
 	return "acl_plugin_control_ping_reply"
 }
-func (*ACLPluginControlPingReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLPluginControlPingReply) GetCrcString() string {
 	return "f6b0b8ca"
 }
+func (*ACLPluginControlPingReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLPluginControlPingReply() api.Message {
 	return &ACLPluginControlPingReply{}
 }
 
 // ACLAddReplace represents the VPP binary API message 'acl_add_replace'.
-// Generated from '../../bin_api/acl.api.json', line 171:
+// Generated from 'acl.api.json', line 88:
 //
 //            "acl_add_replace",
 //            [
@@ -354,18 +370,18 @@ type ACLAddReplace struct {
 func (*ACLAddReplace) GetMessageName() string {
 	return "acl_add_replace"
 }
-func (*ACLAddReplace) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLAddReplace) GetCrcString() string {
 	return "e839997e"
 }
+func (*ACLAddReplace) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLAddReplace() api.Message {
 	return &ACLAddReplace{}
 }
 
 // ACLAddReplaceReply represents the VPP binary API message 'acl_add_replace_reply'.
-// Generated from '../../bin_api/acl.api.json', line 208:
+// Generated from 'acl.api.json', line 125:
 //
 //            "acl_add_replace_reply",
 //            [
@@ -396,18 +412,18 @@ type ACLAddReplaceReply struct {
 func (*ACLAddReplaceReply) GetMessageName() string {
 	return "acl_add_replace_reply"
 }
-func (*ACLAddReplaceReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLAddReplaceReply) GetCrcString() string {
 	return "ac407b0c"
 }
+func (*ACLAddReplaceReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLAddReplaceReply() api.Message {
 	return &ACLAddReplaceReply{}
 }
 
 // ACLDel represents the VPP binary API message 'acl_del'.
-// Generated from '../../bin_api/acl.api.json', line 230:
+// Generated from 'acl.api.json', line 147:
 //
 //            "acl_del",
 //            [
@@ -437,18 +453,18 @@ type ACLDel struct {
 func (*ACLDel) GetMessageName() string {
 	return "acl_del"
 }
-func (*ACLDel) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLDel) GetCrcString() string {
 	return "ef34fea4"
 }
+func (*ACLDel) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLDel() api.Message {
 	return &ACLDel{}
 }
 
 // ACLDelReply represents the VPP binary API message 'acl_del_reply'.
-// Generated from '../../bin_api/acl.api.json', line 252:
+// Generated from 'acl.api.json', line 169:
 //
 //            "acl_del_reply",
 //            [
@@ -474,18 +490,18 @@ type ACLDelReply struct {
 func (*ACLDelReply) GetMessageName() string {
 	return "acl_del_reply"
 }
-func (*ACLDelReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLDelReply) GetCrcString() string {
 	return "e8d4e804"
 }
+func (*ACLDelReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLDelReply() api.Message {
 	return &ACLDelReply{}
 }
 
 // ACLInterfaceAddDel represents the VPP binary API message 'acl_interface_add_del'.
-// Generated from '../../bin_api/acl.api.json', line 270:
+// Generated from 'acl.api.json', line 187:
 //
 //            "acl_interface_add_del",
 //            [
@@ -530,18 +546,18 @@ type ACLInterfaceAddDel struct {
 func (*ACLInterfaceAddDel) GetMessageName() string {
 	return "acl_interface_add_del"
 }
-func (*ACLInterfaceAddDel) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLInterfaceAddDel) GetCrcString() string {
 	return "0b2aedd1"
 }
+func (*ACLInterfaceAddDel) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLInterfaceAddDel() api.Message {
 	return &ACLInterfaceAddDel{}
 }
 
 // ACLInterfaceAddDelReply represents the VPP binary API message 'acl_interface_add_del_reply'.
-// Generated from '../../bin_api/acl.api.json', line 304:
+// Generated from 'acl.api.json', line 221:
 //
 //            "acl_interface_add_del_reply",
 //            [
@@ -567,18 +583,18 @@ type ACLInterfaceAddDelReply struct {
 func (*ACLInterfaceAddDelReply) GetMessageName() string {
 	return "acl_interface_add_del_reply"
 }
-func (*ACLInterfaceAddDelReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLInterfaceAddDelReply) GetCrcString() string {
 	return "e8d4e804"
 }
+func (*ACLInterfaceAddDelReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLInterfaceAddDelReply() api.Message {
 	return &ACLInterfaceAddDelReply{}
 }
 
 // ACLInterfaceSetACLList represents the VPP binary API message 'acl_interface_set_acl_list'.
-// Generated from '../../bin_api/acl.api.json', line 322:
+// Generated from 'acl.api.json', line 239:
 //
 //            "acl_interface_set_acl_list",
 //            [
@@ -625,18 +641,18 @@ type ACLInterfaceSetACLList struct {
 func (*ACLInterfaceSetACLList) GetMessageName() string {
 	return "acl_interface_set_acl_list"
 }
-func (*ACLInterfaceSetACLList) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLInterfaceSetACLList) GetCrcString() string {
 	return "8baece38"
 }
+func (*ACLInterfaceSetACLList) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLInterfaceSetACLList() api.Message {
 	return &ACLInterfaceSetACLList{}
 }
 
 // ACLInterfaceSetACLListReply represents the VPP binary API message 'acl_interface_set_acl_list_reply'.
-// Generated from '../../bin_api/acl.api.json', line 358:
+// Generated from 'acl.api.json', line 275:
 //
 //            "acl_interface_set_acl_list_reply",
 //            [
@@ -662,18 +678,18 @@ type ACLInterfaceSetACLListReply struct {
 func (*ACLInterfaceSetACLListReply) GetMessageName() string {
 	return "acl_interface_set_acl_list_reply"
 }
-func (*ACLInterfaceSetACLListReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLInterfaceSetACLListReply) GetCrcString() string {
 	return "e8d4e804"
 }
+func (*ACLInterfaceSetACLListReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLInterfaceSetACLListReply() api.Message {
 	return &ACLInterfaceSetACLListReply{}
 }
 
 // ACLDump represents the VPP binary API message 'acl_dump'.
-// Generated from '../../bin_api/acl.api.json', line 376:
+// Generated from 'acl.api.json', line 293:
 //
 //            "acl_dump",
 //            [
@@ -703,18 +719,18 @@ type ACLDump struct {
 func (*ACLDump) GetMessageName() string {
 	return "acl_dump"
 }
-func (*ACLDump) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLDump) GetCrcString() string {
 	return "ef34fea4"
 }
+func (*ACLDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLDump() api.Message {
 	return &ACLDump{}
 }
 
 // ACLDetails represents the VPP binary API message 'acl_details'.
-// Generated from '../../bin_api/acl.api.json', line 398:
+// Generated from 'acl.api.json', line 315:
 //
 //            "acl_details",
 //            [
@@ -758,18 +774,18 @@ type ACLDetails struct {
 func (*ACLDetails) GetMessageName() string {
 	return "acl_details"
 }
-func (*ACLDetails) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLDetails) GetCrcString() string {
 	return "5bd895be"
 }
+func (*ACLDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLDetails() api.Message {
 	return &ACLDetails{}
 }
 
 // ACLInterfaceListDump represents the VPP binary API message 'acl_interface_list_dump'.
-// Generated from '../../bin_api/acl.api.json', line 431:
+// Generated from 'acl.api.json', line 348:
 //
 //            "acl_interface_list_dump",
 //            [
@@ -799,18 +815,18 @@ type ACLInterfaceListDump struct {
 func (*ACLInterfaceListDump) GetMessageName() string {
 	return "acl_interface_list_dump"
 }
-func (*ACLInterfaceListDump) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*ACLInterfaceListDump) GetCrcString() string {
 	return "529cb13f"
 }
+func (*ACLInterfaceListDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewACLInterfaceListDump() api.Message {
 	return &ACLInterfaceListDump{}
 }
 
 // ACLInterfaceListDetails represents the VPP binary API message 'acl_interface_list_details'.
-// Generated from '../../bin_api/acl.api.json', line 453:
+// Generated from 'acl.api.json', line 370:
 //
 //            "acl_interface_list_details",
 //            [
@@ -853,18 +869,18 @@ type ACLInterfaceListDetails struct {
 func (*ACLInterfaceListDetails) GetMessageName() string {
 	return "acl_interface_list_details"
 }
-func (*ACLInterfaceListDetails) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*ACLInterfaceListDetails) GetCrcString() string {
 	return "d5e80809"
 }
+func (*ACLInterfaceListDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewACLInterfaceListDetails() api.Message {
 	return &ACLInterfaceListDetails{}
 }
 
 // MacipACLAdd represents the VPP binary API message 'macip_acl_add'.
-// Generated from '../../bin_api/acl.api.json', line 485:
+// Generated from 'acl.api.json', line 402:
 //
 //            "macip_acl_add",
 //            [
@@ -907,18 +923,18 @@ type MacipACLAdd struct {
 func (*MacipACLAdd) GetMessageName() string {
 	return "macip_acl_add"
 }
-func (*MacipACLAdd) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*MacipACLAdd) GetCrcString() string {
 	return "b3d3d65a"
 }
+func (*MacipACLAdd) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewMacipACLAdd() api.Message {
 	return &MacipACLAdd{}
 }
 
 // MacipACLAddReply represents the VPP binary API message 'macip_acl_add_reply'.
-// Generated from '../../bin_api/acl.api.json', line 518:
+// Generated from 'acl.api.json', line 435:
 //
 //            "macip_acl_add_reply",
 //            [
@@ -949,18 +965,18 @@ type MacipACLAddReply struct {
 func (*MacipACLAddReply) GetMessageName() string {
 	return "macip_acl_add_reply"
 }
-func (*MacipACLAddReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*MacipACLAddReply) GetCrcString() string {
 	return "ac407b0c"
 }
+func (*MacipACLAddReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewMacipACLAddReply() api.Message {
 	return &MacipACLAddReply{}
 }
 
 // MacipACLAddReplace represents the VPP binary API message 'macip_acl_add_replace'.
-// Generated from '../../bin_api/acl.api.json', line 540:
+// Generated from 'acl.api.json', line 457:
 //
 //            "macip_acl_add_replace",
 //            [
@@ -1008,18 +1024,18 @@ type MacipACLAddReplace struct {
 func (*MacipACLAddReplace) GetMessageName() string {
 	return "macip_acl_add_replace"
 }
-func (*MacipACLAddReplace) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*MacipACLAddReplace) GetCrcString() string {
 	return "a0e8c01b"
 }
+func (*MacipACLAddReplace) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewMacipACLAddReplace() api.Message {
 	return &MacipACLAddReplace{}
 }
 
 // MacipACLAddReplaceReply represents the VPP binary API message 'macip_acl_add_replace_reply'.
-// Generated from '../../bin_api/acl.api.json', line 577:
+// Generated from 'acl.api.json', line 494:
 //
 //            "macip_acl_add_replace_reply",
 //            [
@@ -1050,18 +1066,18 @@ type MacipACLAddReplaceReply struct {
 func (*MacipACLAddReplaceReply) GetMessageName() string {
 	return "macip_acl_add_replace_reply"
 }
-func (*MacipACLAddReplaceReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*MacipACLAddReplaceReply) GetCrcString() string {
 	return "ac407b0c"
 }
+func (*MacipACLAddReplaceReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewMacipACLAddReplaceReply() api.Message {
 	return &MacipACLAddReplaceReply{}
 }
 
 // MacipACLDel represents the VPP binary API message 'macip_acl_del'.
-// Generated from '../../bin_api/acl.api.json', line 599:
+// Generated from 'acl.api.json', line 516:
 //
 //            "macip_acl_del",
 //            [
@@ -1091,18 +1107,18 @@ type MacipACLDel struct {
 func (*MacipACLDel) GetMessageName() string {
 	return "macip_acl_del"
 }
-func (*MacipACLDel) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*MacipACLDel) GetCrcString() string {
 	return "ef34fea4"
 }
+func (*MacipACLDel) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewMacipACLDel() api.Message {
 	return &MacipACLDel{}
 }
 
 // MacipACLDelReply represents the VPP binary API message 'macip_acl_del_reply'.
-// Generated from '../../bin_api/acl.api.json', line 621:
+// Generated from 'acl.api.json', line 538:
 //
 //            "macip_acl_del_reply",
 //            [
@@ -1128,18 +1144,18 @@ type MacipACLDelReply struct {
 func (*MacipACLDelReply) GetMessageName() string {
 	return "macip_acl_del_reply"
 }
-func (*MacipACLDelReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*MacipACLDelReply) GetCrcString() string {
 	return "e8d4e804"
 }
+func (*MacipACLDelReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewMacipACLDelReply() api.Message {
 	return &MacipACLDelReply{}
 }
 
 // MacipACLInterfaceAddDel represents the VPP binary API message 'macip_acl_interface_add_del'.
-// Generated from '../../bin_api/acl.api.json', line 639:
+// Generated from 'acl.api.json', line 556:
 //
 //            "macip_acl_interface_add_del",
 //            [
@@ -1179,18 +1195,18 @@ type MacipACLInterfaceAddDel struct {
 func (*MacipACLInterfaceAddDel) GetMessageName() string {
 	return "macip_acl_interface_add_del"
 }
-func (*MacipACLInterfaceAddDel) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*MacipACLInterfaceAddDel) GetCrcString() string {
 	return "6a6be97c"
 }
+func (*MacipACLInterfaceAddDel) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewMacipACLInterfaceAddDel() api.Message {
 	return &MacipACLInterfaceAddDel{}
 }
 
 // MacipACLInterfaceAddDelReply represents the VPP binary API message 'macip_acl_interface_add_del_reply'.
-// Generated from '../../bin_api/acl.api.json', line 669:
+// Generated from 'acl.api.json', line 586:
 //
 //            "macip_acl_interface_add_del_reply",
 //            [
@@ -1216,18 +1232,18 @@ type MacipACLInterfaceAddDelReply struct {
 func (*MacipACLInterfaceAddDelReply) GetMessageName() string {
 	return "macip_acl_interface_add_del_reply"
 }
-func (*MacipACLInterfaceAddDelReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*MacipACLInterfaceAddDelReply) GetCrcString() string {
 	return "e8d4e804"
 }
+func (*MacipACLInterfaceAddDelReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewMacipACLInterfaceAddDelReply() api.Message {
 	return &MacipACLInterfaceAddDelReply{}
 }
 
 // MacipACLDump represents the VPP binary API message 'macip_acl_dump'.
-// Generated from '../../bin_api/acl.api.json', line 687:
+// Generated from 'acl.api.json', line 604:
 //
 //            "macip_acl_dump",
 //            [
@@ -1257,18 +1273,18 @@ type MacipACLDump struct {
 func (*MacipACLDump) GetMessageName() string {
 	return "macip_acl_dump"
 }
-func (*MacipACLDump) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*MacipACLDump) GetCrcString() string {
 	return "ef34fea4"
 }
+func (*MacipACLDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewMacipACLDump() api.Message {
 	return &MacipACLDump{}
 }
 
 // MacipACLDetails represents the VPP binary API message 'macip_acl_details'.
-// Generated from '../../bin_api/acl.api.json', line 709:
+// Generated from 'acl.api.json', line 626:
 //
 //            "macip_acl_details",
 //            [
@@ -1312,18 +1328,18 @@ type MacipACLDetails struct {
 func (*MacipACLDetails) GetMessageName() string {
 	return "macip_acl_details"
 }
-func (*MacipACLDetails) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*MacipACLDetails) GetCrcString() string {
 	return "dd2b55ba"
 }
+func (*MacipACLDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewMacipACLDetails() api.Message {
 	return &MacipACLDetails{}
 }
 
 // MacipACLInterfaceGet represents the VPP binary API message 'macip_acl_interface_get'.
-// Generated from '../../bin_api/acl.api.json', line 742:
+// Generated from 'acl.api.json', line 659:
 //
 //            "macip_acl_interface_get",
 //            [
@@ -1342,24 +1358,23 @@ func NewMacipACLDetails() api.Message {
 //                "crc": "0x51077d14"
 //            }
 //
-type MacipACLInterfaceGet struct {
-}
+type MacipACLInterfaceGet struct{}
 
 func (*MacipACLInterfaceGet) GetMessageName() string {
 	return "macip_acl_interface_get"
 }
-func (*MacipACLInterfaceGet) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*MacipACLInterfaceGet) GetCrcString() string {
 	return "51077d14"
 }
+func (*MacipACLInterfaceGet) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewMacipACLInterfaceGet() api.Message {
 	return &MacipACLInterfaceGet{}
 }
 
 // MacipACLInterfaceGetReply represents the VPP binary API message 'macip_acl_interface_get_reply'.
-// Generated from '../../bin_api/acl.api.json', line 760:
+// Generated from 'acl.api.json', line 677:
 //
 //            "macip_acl_interface_get_reply",
 //            [
@@ -1392,18 +1407,18 @@ type MacipACLInterfaceGetReply struct {
 func (*MacipACLInterfaceGetReply) GetMessageName() string {
 	return "macip_acl_interface_get_reply"
 }
-func (*MacipACLInterfaceGetReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*MacipACLInterfaceGetReply) GetCrcString() string {
 	return "accf9b05"
 }
+func (*MacipACLInterfaceGetReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewMacipACLInterfaceGetReply() api.Message {
 	return &MacipACLInterfaceGetReply{}
 }
 
 // MacipACLInterfaceListDump represents the VPP binary API message 'macip_acl_interface_list_dump'.
-// Generated from '../../bin_api/acl.api.json', line 784:
+// Generated from 'acl.api.json', line 701:
 //
 //            "macip_acl_interface_list_dump",
 //            [
@@ -1433,18 +1448,18 @@ type MacipACLInterfaceListDump struct {
 func (*MacipACLInterfaceListDump) GetMessageName() string {
 	return "macip_acl_interface_list_dump"
 }
-func (*MacipACLInterfaceListDump) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
 func (*MacipACLInterfaceListDump) GetCrcString() string {
 	return "529cb13f"
 }
+func (*MacipACLInterfaceListDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
 func NewMacipACLInterfaceListDump() api.Message {
 	return &MacipACLInterfaceListDump{}
 }
 
 // MacipACLInterfaceListDetails represents the VPP binary API message 'macip_acl_interface_list_details'.
-// Generated from '../../bin_api/acl.api.json', line 806:
+// Generated from 'acl.api.json', line 723:
 //
 //            "macip_acl_interface_list_details",
 //            [
@@ -1482,12 +1497,261 @@ type MacipACLInterfaceListDetails struct {
 func (*MacipACLInterfaceListDetails) GetMessageName() string {
 	return "macip_acl_interface_list_details"
 }
-func (*MacipACLInterfaceListDetails) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
 func (*MacipACLInterfaceListDetails) GetCrcString() string {
 	return "29783fa0"
 }
+func (*MacipACLInterfaceListDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
 func NewMacipACLInterfaceListDetails() api.Message {
 	return &MacipACLInterfaceListDetails{}
 }
+
+// ACLInterfaceSetEtypeWhitelist represents the VPP binary API message 'acl_interface_set_etype_whitelist'.
+// Generated from 'acl.api.json', line 751:
+//
+//            "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
+}
+func NewACLInterfaceSetEtypeWhitelist() api.Message {
+	return &ACLInterfaceSetEtypeWhitelist{}
+}
+
+// ACLInterfaceSetEtypeWhitelistReply represents the VPP binary API message 'acl_interface_set_etype_whitelist_reply'.
+// Generated from 'acl.api.json', line 787:
+//
+//            "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
+}
+func NewACLInterfaceSetEtypeWhitelistReply() api.Message {
+	return &ACLInterfaceSetEtypeWhitelistReply{}
+}
+
+// ACLInterfaceEtypeWhitelistDump represents the VPP binary API message 'acl_interface_etype_whitelist_dump'.
+// Generated from 'acl.api.json', line 805:
+//
+//            "acl_interface_etype_whitelist_dump",
+//            [
+//                "u16",
+//                "_vl_msg_id"
+//            ],
+//            [
+//                "u32",
+//                "client_index"
+//            ],
+//            [
+//                "u32",
+//                "context"
+//            ],
+//            [
+//                "u32",
+//                "sw_if_index"
+//            ],
+//            {
+//                "crc": "0x529cb13f"
+//            }
+//
+type ACLInterfaceEtypeWhitelistDump struct {
+	SwIfIndex uint32
+}
+
+func (*ACLInterfaceEtypeWhitelistDump) GetMessageName() string {
+	return "acl_interface_etype_whitelist_dump"
+}
+func (*ACLInterfaceEtypeWhitelistDump) GetCrcString() string {
+	return "529cb13f"
+}
+func (*ACLInterfaceEtypeWhitelistDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+func NewACLInterfaceEtypeWhitelistDump() api.Message {
+	return &ACLInterfaceEtypeWhitelistDump{}
+}
+
+// ACLInterfaceEtypeWhitelistDetails represents the VPP binary API message 'acl_interface_etype_whitelist_details'.
+// Generated from 'acl.api.json', line 827:
+//
+//            "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 NewACLInterfaceEtypeWhitelistDetails() api.Message {
+	return &ACLInterfaceEtypeWhitelistDetails{}
+}
+
+/* Services */
+
+type Services interface {
+	DumpACL(*ACLDump) (*ACLDetails, error)
+	DumpACLInterfaceEtypeWhitelist(*ACLInterfaceEtypeWhitelistDump) (*ACLInterfaceEtypeWhitelistDetails, error)
+	DumpACLInterfaceList(*ACLInterfaceListDump) (*ACLInterfaceListDetails, error)
+	DumpMacipACL(*MacipACLDump) (*MacipACLDetails, error)
+	DumpMacipACLInterfaceList(*MacipACLInterfaceListDump) (*MacipACLInterfaceListDetails, error)
+	ACLAddReplace(*ACLAddReplace) (*ACLAddReplaceReply, error)
+	ACLDel(*ACLDel) (*ACLDelReply, error)
+	ACLInterfaceAddDel(*ACLInterfaceAddDel) (*ACLInterfaceAddDelReply, error)
+	ACLInterfaceSetACLList(*ACLInterfaceSetACLList) (*ACLInterfaceSetACLListReply, error)
+	ACLInterfaceSetEtypeWhitelist(*ACLInterfaceSetEtypeWhitelist) (*ACLInterfaceSetEtypeWhitelistReply, error)
+	ACLPluginControlPing(*ACLPluginControlPing) (*ACLPluginControlPingReply, error)
+	ACLPluginGetVersion(*ACLPluginGetVersion) (*ACLPluginGetVersionReply, error)
+	MacipACLAdd(*MacipACLAdd) (*MacipACLAddReply, error)
+	MacipACLAddReplace(*MacipACLAddReplace) (*MacipACLAddReplaceReply, error)
+	MacipACLDel(*MacipACLDel) (*MacipACLDelReply, error)
+	MacipACLInterfaceAddDel(*MacipACLInterfaceAddDel) (*MacipACLInterfaceAddDelReply, error)
+	MacipACLInterfaceGet(*MacipACLInterfaceGet) (*MacipACLInterfaceGetReply, error)
+}
+
+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((*ACLAddReplace)(nil), "acl.ACLAddReplace")
+	api.RegisterMessage((*ACLAddReplaceReply)(nil), "acl.ACLAddReplaceReply")
+	api.RegisterMessage((*ACLDel)(nil), "acl.ACLDel")
+	api.RegisterMessage((*ACLDelReply)(nil), "acl.ACLDelReply")
+	api.RegisterMessage((*ACLInterfaceAddDel)(nil), "acl.ACLInterfaceAddDel")
+	api.RegisterMessage((*ACLInterfaceAddDelReply)(nil), "acl.ACLInterfaceAddDelReply")
+	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((*MacipACLAdd)(nil), "acl.MacipACLAdd")
+	api.RegisterMessage((*MacipACLAddReply)(nil), "acl.MacipACLAddReply")
+	api.RegisterMessage((*MacipACLAddReplace)(nil), "acl.MacipACLAddReplace")
+	api.RegisterMessage((*MacipACLAddReplaceReply)(nil), "acl.MacipACLAddReplaceReply")
+	api.RegisterMessage((*MacipACLDel)(nil), "acl.MacipACLDel")
+	api.RegisterMessage((*MacipACLDelReply)(nil), "acl.MacipACLDelReply")
+	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")
+}