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, 60 insertions, 20 deletions

diff --git a/internal/testbinapi/binapi2001/bfd/bfd.ba.go b/internal/testbinapi/binapi2001/bfd/bfd.ba.go
index 236c511..f83cc33 100644
--- a/internal/testbinapi/binapi2001/bfd/bfd.ba.go
+++ b/internal/testbinapi/binapi2001/bfd/bfd.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.4.0-dev
+//  binapi-generator: v0.5.0-dev
 //  VPP:              20.01
 // source: .vppapi/core/bfd.api.json
 
@@ -17,11 +17,12 @@ package bfd
 
 import (
 	"fmt"
-	api "git.fd.io/govpp.git/api"
-	codec "git.fd.io/govpp.git/codec"
 	"net"
 	"strconv"
 	"strings"
+
+	api "git.fd.io/govpp.git/api"
+	codec "git.fd.io/govpp.git/codec"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -531,12 +532,15 @@ func ParseAddressWithPrefix(s string) (AddressWithPrefix, error) {
 	}
 	return AddressWithPrefix(prefix), nil
 }
+
 func (x AddressWithPrefix) String() string {
 	return Prefix(x).String()
 }
+
 func (x *AddressWithPrefix) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *AddressWithPrefix) UnmarshalText(text []byte) error {
 	prefix, err := ParseAddressWithPrefix(string(text))
 	if err != nil {
@@ -565,12 +569,15 @@ func ParseIP4Address(s string) (IP4Address, error) {
 func (x IP4Address) ToIP() net.IP {
 	return net.IP(x[:]).To4()
 }
+
 func (x IP4Address) String() string {
 	return x.ToIP().String()
 }
+
 func (x *IP4Address) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *IP4Address) UnmarshalText(text []byte) error {
 	ipaddr, err := ParseIP4Address(string(text))
 	if err != nil {
@@ -599,12 +606,15 @@ func ParseIP6Address(s string) (IP6Address, error) {
 func (x IP6Address) ToIP() net.IP {
 	return net.IP(x[:]).To16()
 }
+
 func (x IP6Address) String() string {
 	return x.ToIP().String()
 }
+
 func (x *IP6Address) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *IP6Address) UnmarshalText(text []byte) error {
 	ipaddr, err := ParseIP6Address(string(text))
 	if err != nil {
@@ -628,6 +638,10 @@ func ParseAddress(s string) (Address, error) {
 	if ip == nil {
 		return Address{}, fmt.Errorf("invalid address: %s", s)
 	}
+	return AddressFromIP(ip), nil
+}
+
+func AddressFromIP(ip net.IP) Address {
 	var addr Address
 	if ip.To4() == nil {
 		addr.Af = ADDRESS_IP6
@@ -640,8 +654,9 @@ func ParseAddress(s string) (Address, error) {
 		copy(ip4[:], ip.To4())
 		addr.Un.SetIP4(ip4)
 	}
-	return addr, nil
+	return addr
 }
+
 func (x Address) ToIP() net.IP {
 	if x.Af == ADDRESS_IP6 {
 		ip6 := x.Un.GetIP6()
@@ -651,12 +666,15 @@ func (x Address) ToIP() net.IP {
 		return net.IP(ip4[:]).To4()
 	}
 }
+
 func (x Address) String() string {
 	return x.ToIP().String()
 }
+
 func (x *Address) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *Address) UnmarshalText(text []byte) error {
 	addr, err := ParseAddress(string(text))
 	if err != nil {
@@ -699,18 +717,22 @@ func ParseIP4Prefix(s string) (prefix IP4Prefix, err error) {
 	}
 	return prefix, nil
 }
+
 func (x IP4Prefix) ToIPNet() *net.IPNet {
 	mask := net.CIDRMask(int(x.Len), 32)
 	ipnet := &net.IPNet{IP: x.Address.ToIP(), Mask: mask}
 	return ipnet
 }
+
 func (x IP4Prefix) String() string {
 	ip := x.Address.String()
 	return ip + "/" + strconv.Itoa(int(x.Len))
 }
+
 func (x *IP4Prefix) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *IP4Prefix) UnmarshalText(text []byte) error {
 	prefix, err := ParseIP4Prefix(string(text))
 	if err != nil {
@@ -753,18 +775,22 @@ func ParseIP6Prefix(s string) (prefix IP6Prefix, err error) {
 	}
 	return prefix, nil
 }
+
 func (x IP6Prefix) ToIPNet() *net.IPNet {
 	mask := net.CIDRMask(int(x.Len), 128)
 	ipnet := &net.IPNet{IP: x.Address.ToIP(), Mask: mask}
 	return ipnet
 }
+
 func (x IP6Prefix) String() string {
 	ip := x.Address.String()
 	return ip + "/" + strconv.Itoa(int(x.Len))
 }
+
 func (x *IP6Prefix) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *IP6Prefix) UnmarshalText(text []byte) error {
 	prefix, err := ParseIP6Prefix(string(text))
 	if err != nil {
@@ -815,6 +841,7 @@ func ParsePrefix(ip string) (prefix Prefix, err error) {
 	}
 	return prefix, nil
 }
+
 func (x Prefix) ToIPNet() *net.IPNet {
 	var mask net.IPMask
 	if x.Address.Af == ADDRESS_IP4 {
@@ -825,13 +852,16 @@ func (x Prefix) ToIPNet() *net.IPNet {
 	ipnet := &net.IPNet{IP: x.Address.ToIP(), Mask: mask}
 	return ipnet
 }
+
 func (x Prefix) String() string {
 	ip := x.Address.String()
 	return ip + "/" + strconv.Itoa(int(x.Len))
 }
+
 func (x *Prefix) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *Prefix) UnmarshalText(text []byte) error {
 	prefix, err := ParsePrefix(string(text))
 	if err != nil {
@@ -849,8 +879,9 @@ type PrefixMatcher struct {
 
 // AddressUnion defines union 'address_union'.
 type AddressUnion struct {
-	// IP4 *IP4Address
-	// IP6 *IP6Address
+	// AddressUnion can be one of:
+	// - IP4 *IP4Address
+	// - IP6 *IP6Address
 	XXX_UnionData [16]byte
 }
 
diff --git a/internal/testbinapi/binapi2001/bfd/bfd_rpc.ba.go b/internal/testbinapi/binapi2001/bfd/bfd_rpc.ba.go
index 214b2a3..a9a9472 100644
--- a/internal/testbinapi/binapi2001/bfd/bfd_rpc.ba.go
+++ b/internal/testbinapi/binapi2001/bfd/bfd_rpc.ba.go
@@ -5,12 +5,13 @@ package bfd
 import (
 	"context"
 	"fmt"
+	"io"
+
 	api "git.fd.io/govpp.git/api"
 	vpe "git.fd.io/govpp.git/internal/testbinapi/binapi2001/vpe"
-	"io"
 )
 
-// RPCService defines RPC service  bfd.
+// RPCService defines RPC service bfd.
 type RPCService interface {
 	BfdAuthDelKey(ctx context.Context, in *BfdAuthDelKey) (*BfdAuthDelKeyReply, error)
 	BfdAuthKeysDump(ctx context.Context, in *BfdAuthKeysDump) (RPCService_BfdAuthKeysDumpClient, error)
@@ -42,7 +43,7 @@ func (c *serviceClient) BfdAuthDelKey(ctx context.Context, in *BfdAuthDelKey) (*
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdAuthKeysDump(ctx context.Context, in *BfdAuthKeysDump) (RPCService_BfdAuthKeysDumpClient, error) {
@@ -78,6 +79,10 @@ func (c *serviceClient_BfdAuthKeysDumpClient) Recv() (*BfdAuthKeysDetails, error
 	case *BfdAuthKeysDetails:
 		return m, nil
 	case *vpe.ControlPingReply:
+		err = c.Stream.Close()
+		if err != nil {
+			return nil, err
+		}
 		return nil, io.EOF
 	default:
 		return nil, fmt.Errorf("unexpected message: %T %v", m, m)
@@ -90,7 +95,7 @@ func (c *serviceClient) BfdAuthSetKey(ctx context.Context, in *BfdAuthSetKey) (*
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPAdd(ctx context.Context, in *BfdUDPAdd) (*BfdUDPAddReply, error) {
@@ -99,7 +104,7 @@ func (c *serviceClient) BfdUDPAdd(ctx context.Context, in *BfdUDPAdd) (*BfdUDPAd
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPAuthActivate(ctx context.Context, in *BfdUDPAuthActivate) (*BfdUDPAuthActivateReply, error) {
@@ -108,7 +113,7 @@ func (c *serviceClient) BfdUDPAuthActivate(ctx context.Context, in *BfdUDPAuthAc
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPAuthDeactivate(ctx context.Context, in *BfdUDPAuthDeactivate) (*BfdUDPAuthDeactivateReply, error) {
@@ -117,7 +122,7 @@ func (c *serviceClient) BfdUDPAuthDeactivate(ctx context.Context, in *BfdUDPAuth
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPDel(ctx context.Context, in *BfdUDPDel) (*BfdUDPDelReply, error) {
@@ -126,7 +131,7 @@ func (c *serviceClient) BfdUDPDel(ctx context.Context, in *BfdUDPDel) (*BfdUDPDe
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPDelEchoSource(ctx context.Context, in *BfdUDPDelEchoSource) (*BfdUDPDelEchoSourceReply, error) {
@@ -135,7 +140,7 @@ func (c *serviceClient) BfdUDPDelEchoSource(ctx context.Context, in *BfdUDPDelEc
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPGetEchoSource(ctx context.Context, in *BfdUDPGetEchoSource) (*BfdUDPGetEchoSourceReply, error) {
@@ -144,7 +149,7 @@ func (c *serviceClient) BfdUDPGetEchoSource(ctx context.Context, in *BfdUDPGetEc
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPMod(ctx context.Context, in *BfdUDPMod) (*BfdUDPModReply, error) {
@@ -153,7 +158,7 @@ func (c *serviceClient) BfdUDPMod(ctx context.Context, in *BfdUDPMod) (*BfdUDPMo
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPSessionDump(ctx context.Context, in *BfdUDPSessionDump) (RPCService_BfdUDPSessionDumpClient, error) {
@@ -189,6 +194,10 @@ func (c *serviceClient_BfdUDPSessionDumpClient) Recv() (*BfdUDPSessionDetails, e
 	case *BfdUDPSessionDetails:
 		return m, nil
 	case *vpe.ControlPingReply:
+		err = c.Stream.Close()
+		if err != nil {
+			return nil, err
+		}
 		return nil, io.EOF
 	default:
 		return nil, fmt.Errorf("unexpected message: %T %v", m, m)
@@ -201,7 +210,7 @@ func (c *serviceClient) BfdUDPSessionSetFlags(ctx context.Context, in *BfdUDPSes
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) BfdUDPSetEchoSource(ctx context.Context, in *BfdUDPSetEchoSource) (*BfdUDPSetEchoSourceReply, error) {
@@ -210,7 +219,7 @@ func (c *serviceClient) BfdUDPSetEchoSource(ctx context.Context, in *BfdUDPSetEc
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) WantBfdEvents(ctx context.Context, in *WantBfdEvents) (*WantBfdEventsReply, error) {
@@ -219,5 +228,5 @@ func (c *serviceClient) WantBfdEvents(ctx context.Context, in *WantBfdEvents) (*
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }