Update generated binapi to v22.02 & makefile changes

This patch does some small updates to the Makefile.
* `make gen-binapi-from-code` is removed, and moves to
`gen-binapi-local`
* `make build` is patched to build cmd & examples
* `make binapi-generator` to build the api-generator
without other binaries, as they typically require its
output to build.
* `make gen-binapi-local` runs the locally built binapi-generator
to update the local bindings. It expects ${VPP_DIR} to be set and
to point to a local vpp repository checked out with the right version
* `make gen-binapi-internal` runs the locally built binapi-generator
to update the bindings in `internal/testbinapi/binapi2001`

Regarding VPP, notable changes when moving to v22.02 are :
- ControlPing moved from vpe to memclnt
- CliInband went from vpe to vlib

Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Change-Id: Ie5cd2d5ded7ecaffd9abc3ca675df40be272b1fa

2 files changed, 85 insertions, 3 deletions

diff --git a/binapi/memclnt/memclnt.ba.go b/binapi/memclnt/memclnt.ba.go
index b1615bd..4e120b6 100644
--- a/binapi/memclnt/memclnt.ba.go
+++ b/binapi/memclnt/memclnt.ba.go
@@ -1,14 +1,14 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
 //  binapi-generator: v0.5.0-dev
-//  VPP:              21.06-release
+//  VPP:              22.02-release
 // source: /usr/share/vpp/api/core/memclnt.api.json
 
 // Package memclnt contains generated bindings for API file memclnt.api.
 //
 // Contents:
 //   2 structs
-//  22 messages
+//  24 messages
 //
 package memclnt
 
@@ -26,7 +26,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "memclnt"
 	APIVersion = "2.1.0"
-	VersionCrc = 0x8d3dd881
+	VersionCrc = 0x230bb938
 )
 
 // MessageTableEntry defines type 'message_table_entry'.
@@ -136,6 +136,74 @@ func (m *APIVersionsReply) Unmarshal(b []byte) error {
 	return nil
 }
 
+// ControlPing defines message 'control_ping'.
+type ControlPing struct{}
+
+func (m *ControlPing) Reset()               { *m = ControlPing{} }
+func (*ControlPing) GetMessageName() string { return "control_ping" }
+func (*ControlPing) GetCrcString() string   { return "51077d14" }
+func (*ControlPing) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *ControlPing) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	return size
+}
+func (m *ControlPing) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	return buf.Bytes(), nil
+}
+func (m *ControlPing) Unmarshal(b []byte) error {
+	return nil
+}
+
+// ControlPingReply defines message 'control_ping_reply'.
+type ControlPingReply struct {
+	Retval      int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
+	ClientIndex uint32 `binapi:"u32,name=client_index" json:"client_index,omitempty"`
+	VpePID      uint32 `binapi:"u32,name=vpe_pid" json:"vpe_pid,omitempty"`
+}
+
+func (m *ControlPingReply) Reset()               { *m = ControlPingReply{} }
+func (*ControlPingReply) GetMessageName() string { return "control_ping_reply" }
+func (*ControlPingReply) GetCrcString() string   { return "f6b0b8ca" }
+func (*ControlPingReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *ControlPingReply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	size += 4 // m.ClientIndex
+	size += 4 // m.VpePID
+	return size
+}
+func (m *ControlPingReply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	buf.EncodeUint32(m.ClientIndex)
+	buf.EncodeUint32(m.VpePID)
+	return buf.Bytes(), nil
+}
+func (m *ControlPingReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	m.ClientIndex = buf.DecodeUint32()
+	m.VpePID = buf.DecodeUint32()
+	return nil
+}
+
 // GetFirstMsgID defines message 'get_first_msg_id'.
 type GetFirstMsgID struct {
 	Name string `binapi:"string[64],name=name" json:"name,omitempty"`
@@ -920,6 +988,8 @@ func init() { file_memclnt_binapi_init() }
 func file_memclnt_binapi_init() {
 	api.RegisterMessage((*APIVersions)(nil), "api_versions_51077d14")
 	api.RegisterMessage((*APIVersionsReply)(nil), "api_versions_reply_5f0d99d6")
+	api.RegisterMessage((*ControlPing)(nil), "control_ping_51077d14")
+	api.RegisterMessage((*ControlPingReply)(nil), "control_ping_reply_f6b0b8ca")
 	api.RegisterMessage((*GetFirstMsgID)(nil), "get_first_msg_id_ebf79a66")
 	api.RegisterMessage((*GetFirstMsgIDReply)(nil), "get_first_msg_id_reply_7d337472")
 	api.RegisterMessage((*MemclntCreate)(nil), "memclnt_create_9c5e1c2f")
@@ -947,6 +1017,8 @@ func AllMessages() []api.Message {
 	return []api.Message{
 		(*APIVersions)(nil),
 		(*APIVersionsReply)(nil),
+		(*ControlPing)(nil),
+		(*ControlPingReply)(nil),
 		(*GetFirstMsgID)(nil),
 		(*GetFirstMsgIDReply)(nil),
 		(*MemclntCreate)(nil),
diff --git a/binapi/memclnt/memclnt_rpc.ba.go b/binapi/memclnt/memclnt_rpc.ba.go
index 03d32ef..072bdc8 100644
--- a/binapi/memclnt/memclnt_rpc.ba.go
+++ b/binapi/memclnt/memclnt_rpc.ba.go
@@ -11,6 +11,7 @@ import (
 // RPCService defines RPC service memclnt.
 type RPCService interface {
 	APIVersions(ctx context.Context, in *APIVersions) (*APIVersionsReply, error)
+	ControlPing(ctx context.Context, in *ControlPing) (*ControlPingReply, error)
 	GetFirstMsgID(ctx context.Context, in *GetFirstMsgID) (*GetFirstMsgIDReply, error)
 	MemclntCreate(ctx context.Context, in *MemclntCreate) (*MemclntCreateReply, error)
 	MemclntDelete(ctx context.Context, in *MemclntDelete) (*MemclntDeleteReply, error)
@@ -42,6 +43,15 @@ func (c *serviceClient) APIVersions(ctx context.Context, in *APIVersions) (*APIV
 	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
+func (c *serviceClient) ControlPing(ctx context.Context, in *ControlPing) (*ControlPingReply, error) {
+	out := new(ControlPingReply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, api.RetvalToVPPApiError(out.Retval)
+}
+
 func (c *serviceClient) GetFirstMsgID(ctx context.Context, in *GetFirstMsgID) (*GetFirstMsgIDReply, error) {
 	out := new(GetFirstMsgIDReply)
 	err := c.conn.Invoke(ctx, in, out)