3 files changed, 19 insertions, 26 deletions

diff --git a/binapi/lacp/lacp.ba.go b/binapi/lacp/lacp.ba.go
index f1a9457..02e1667 100644
--- a/binapi/lacp/lacp.ba.go
+++ b/binapi/lacp/lacp.ba.go
@@ -1,7 +1,7 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.4.0-dev
-//  VPP:              20.05-release
+//  binapi-generator: v0.6.0-dev
+//  VPP:              22.02-release
 // source: /usr/share/vpp/api/plugins/lacp.api.json
 
 // Package lacp contains generated bindings for API file lacp.api.
@@ -12,10 +12,10 @@
 package lacp
 
 import (
-	api "git.fd.io/govpp.git/api"
-	ethernet_types "git.fd.io/govpp.git/binapi/ethernet_types"
-	interface_types "git.fd.io/govpp.git/binapi/interface_types"
-	codec "git.fd.io/govpp.git/codec"
+	api "go.fd.io/govpp/api"
+	ethernet_types "go.fd.io/govpp/binapi/ethernet_types"
+	interface_types "go.fd.io/govpp/binapi/interface_types"
+	codec "go.fd.io/govpp/codec"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -27,7 +27,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "lacp"
 	APIVersion = "2.0.0"
-	VersionCrc = 0x461bf09e
+	VersionCrc = 0xe1609dab
 )
 
 // SwInterfaceLacpDetails defines message 'sw_interface_lacp_details'.
@@ -55,7 +55,7 @@ type SwInterfaceLacpDetails struct {
 
 func (m *SwInterfaceLacpDetails) Reset()               { *m = SwInterfaceLacpDetails{} }
 func (*SwInterfaceLacpDetails) GetMessageName() string { return "sw_interface_lacp_details" }
-func (*SwInterfaceLacpDetails) GetCrcString() string   { return "745ae0ba" }
+func (*SwInterfaceLacpDetails) GetCrcString() string   { return "d9a83d2f" }
 func (*SwInterfaceLacpDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
@@ -164,7 +164,7 @@ func (m *SwInterfaceLacpDump) Unmarshal(b []byte) error {
 
 func init() { file_lacp_binapi_init() }
 func file_lacp_binapi_init() {
-	api.RegisterMessage((*SwInterfaceLacpDetails)(nil), "sw_interface_lacp_details_745ae0ba")
+	api.RegisterMessage((*SwInterfaceLacpDetails)(nil), "sw_interface_lacp_details_d9a83d2f")
 	api.RegisterMessage((*SwInterfaceLacpDump)(nil), "sw_interface_lacp_dump_51077d14")
 }
 
diff --git a/binapi/lacp/lacp_rest.ba.go b/binapi/lacp/lacp_rest.ba.go
deleted file mode 100644
index 3512a0d..0000000
--- a/binapi/lacp/lacp_rest.ba.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package lacp
-
-import (
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	return http.HandlerFunc(mux.ServeHTTP)
-}
diff --git a/binapi/lacp/lacp_rpc.ba.go b/binapi/lacp/lacp_rpc.ba.go
index 00a00b5..41296ab 100644
--- a/binapi/lacp/lacp_rpc.ba.go
+++ b/binapi/lacp/lacp_rpc.ba.go
@@ -5,12 +5,13 @@ package lacp
 import (
 	"context"
 	"fmt"
-	api "git.fd.io/govpp.git/api"
-	vpe "git.fd.io/govpp.git/binapi/vpe"
 	"io"
+
+	api "go.fd.io/govpp/api"
+	memclnt "go.fd.io/govpp/binapi/memclnt"
 )
 
-// RPCService defines RPC service  lacp.
+// RPCService defines RPC service lacp.
 type RPCService interface {
 	SwInterfaceLacpDump(ctx context.Context, in *SwInterfaceLacpDump) (RPCService_SwInterfaceLacpDumpClient, error)
 }
@@ -32,7 +33,7 @@ func (c *serviceClient) SwInterfaceLacpDump(ctx context.Context, in *SwInterface
 	if err := x.Stream.SendMsg(in); err != nil {
 		return nil, err
 	}
-	if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil {
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
 		return nil, err
 	}
 	return x, nil
@@ -55,7 +56,11 @@ func (c *serviceClient_SwInterfaceLacpDumpClient) Recv() (*SwInterfaceLacpDetail
 	switch m := msg.(type) {
 	case *SwInterfaceLacpDetails:
 		return m, nil
-	case *vpe.ControlPingReply:
+	case *memclnt.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)