3 files changed, 22 insertions, 54 deletions

diff --git a/binapi/teib/teib.ba.go b/binapi/teib/teib.ba.go
index d37f391..af6dcaf 100644
--- a/binapi/teib/teib.ba.go
+++ b/binapi/teib/teib.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/core/teib.api.json
 
 // Package teib contains generated bindings for API file teib.api.
@@ -13,10 +13,10 @@
 package teib
 
 import (
-	api "git.fd.io/govpp.git/api"
-	interface_types "git.fd.io/govpp.git/binapi/interface_types"
-	ip_types "git.fd.io/govpp.git/binapi/ip_types"
-	codec "git.fd.io/govpp.git/codec"
+	api "go.fd.io/govpp/api"
+	interface_types "go.fd.io/govpp/binapi/interface_types"
+	ip_types "go.fd.io/govpp/binapi/ip_types"
+	codec "go.fd.io/govpp/codec"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -28,7 +28,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "teib"
 	APIVersion = "1.0.0"
-	VersionCrc = 0xaac93c17
+	VersionCrc = 0x14ded985
 )
 
 // TeibEntry defines type 'teib_entry'.
@@ -46,7 +46,7 @@ type TeibDetails struct {
 
 func (m *TeibDetails) Reset()               { *m = TeibDetails{} }
 func (*TeibDetails) GetMessageName() string { return "teib_details" }
-func (*TeibDetails) GetCrcString() string   { return "e3b6a503" }
+func (*TeibDetails) GetCrcString() string   { return "981ee1a1" }
 func (*TeibDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
@@ -122,7 +122,7 @@ type TeibEntryAddDel struct {
 
 func (m *TeibEntryAddDel) Reset()               { *m = TeibEntryAddDel{} }
 func (*TeibEntryAddDel) GetMessageName() string { return "teib_entry_add_del" }
-func (*TeibEntryAddDel) GetCrcString() string   { return "5aa0a538" }
+func (*TeibEntryAddDel) GetCrcString() string   { return "8016cfd2" }
 func (*TeibEntryAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
@@ -201,9 +201,9 @@ func (m *TeibEntryAddDelReply) Unmarshal(b []byte) error {
 
 func init() { file_teib_binapi_init() }
 func file_teib_binapi_init() {
-	api.RegisterMessage((*TeibDetails)(nil), "teib_details_e3b6a503")
+	api.RegisterMessage((*TeibDetails)(nil), "teib_details_981ee1a1")
 	api.RegisterMessage((*TeibDump)(nil), "teib_dump_51077d14")
-	api.RegisterMessage((*TeibEntryAddDel)(nil), "teib_entry_add_del_5aa0a538")
+	api.RegisterMessage((*TeibEntryAddDel)(nil), "teib_entry_add_del_8016cfd2")
 	api.RegisterMessage((*TeibEntryAddDelReply)(nil), "teib_entry_add_del_reply_e8d4e804")
 }
 
diff --git a/binapi/teib/teib_rest.ba.go b/binapi/teib/teib_rest.ba.go
deleted file mode 100644
index fb8bc17..0000000
--- a/binapi/teib/teib_rest.ba.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package teib
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/teib_entry_add_del", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(TeibEntryAddDel)
-		b, err := ioutil.ReadAll(req.Body)
-		if err != nil {
-			http.Error(w, "read body failed", http.StatusBadRequest)
-			return
-		}
-		if err := json.Unmarshal(b, request); err != nil {
-			http.Error(w, "unmarshal data failed", http.StatusBadRequest)
-			return
-		}
-		reply, err := rpc.TeibEntryAddDel(req.Context(), request)
-		if err != nil {
-			http.Error(w, "request failed: "+err.Error(), http.StatusInternalServerError)
-			return
-		}
-		rep, err := json.MarshalIndent(reply, "", "  ")
-		if err != nil {
-			http.Error(w, "marshal failed: "+err.Error(), http.StatusInternalServerError)
-			return
-		}
-		w.Write(rep)
-	})
-	return http.HandlerFunc(mux.ServeHTTP)
-}
diff --git a/binapi/teib/teib_rpc.ba.go b/binapi/teib/teib_rpc.ba.go
index 4803c2d..b02876b 100644
--- a/binapi/teib/teib_rpc.ba.go
+++ b/binapi/teib/teib_rpc.ba.go
@@ -5,12 +5,13 @@ package teib
 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  teib.
+// RPCService defines RPC service teib.
 type RPCService interface {
 	TeibDump(ctx context.Context, in *TeibDump) (RPCService_TeibDumpClient, error)
 	TeibEntryAddDel(ctx context.Context, in *TeibEntryAddDel) (*TeibEntryAddDelReply, error)
@@ -33,7 +34,7 @@ func (c *serviceClient) TeibDump(ctx context.Context, in *TeibDump) (RPCService_
 	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
@@ -56,7 +57,11 @@ func (c *serviceClient_TeibDumpClient) Recv() (*TeibDetails, error) {
 	switch m := msg.(type) {
 	case *TeibDetails:
 		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)
@@ -69,5 +74,5 @@ func (c *serviceClient) TeibEntryAddDel(ctx context.Context, in *TeibEntryAddDel
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }