3 files changed, 22 insertions, 53 deletions

diff --git a/binapi/span/span.ba.go b/binapi/span/span.ba.go
index 2dcbc37..8d3512c 100644
--- a/binapi/span/span.ba.go
+++ b/binapi/span/span.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/span.api.json
 
 // Package span contains generated bindings for API file span.api.
@@ -13,10 +13,11 @@
 package span
 
 import (
-	api "git.fd.io/govpp.git/api"
-	interface_types "git.fd.io/govpp.git/binapi/interface_types"
-	codec "git.fd.io/govpp.git/codec"
 	"strconv"
+
+	api "go.fd.io/govpp/api"
+	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
@@ -28,7 +29,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "span"
 	APIVersion = "2.0.0"
-	VersionCrc = 0x9f4dec7c
+	VersionCrc = 0x34ee02b
 )
 
 // SpanState defines enum 'span_state'.
@@ -74,7 +75,7 @@ type SwInterfaceSpanDetails struct {
 
 func (m *SwInterfaceSpanDetails) Reset()               { *m = SwInterfaceSpanDetails{} }
 func (*SwInterfaceSpanDetails) GetMessageName() string { return "sw_interface_span_details" }
-func (*SwInterfaceSpanDetails) GetCrcString() string   { return "055643fc" }
+func (*SwInterfaceSpanDetails) GetCrcString() string   { return "8a20e79f" }
 func (*SwInterfaceSpanDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
@@ -154,7 +155,7 @@ func (m *SwInterfaceSpanEnableDisable) Reset() { *m = SwInterfaceSpanEnableDisab
 func (*SwInterfaceSpanEnableDisable) GetMessageName() string {
 	return "sw_interface_span_enable_disable"
 }
-func (*SwInterfaceSpanEnableDisable) GetCrcString() string { return "acc8fea1" }
+func (*SwInterfaceSpanEnableDisable) GetCrcString() string { return "23ddd96b" }
 func (*SwInterfaceSpanEnableDisable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
@@ -226,9 +227,9 @@ func (m *SwInterfaceSpanEnableDisableReply) Unmarshal(b []byte) error {
 
 func init() { file_span_binapi_init() }
 func file_span_binapi_init() {
-	api.RegisterMessage((*SwInterfaceSpanDetails)(nil), "sw_interface_span_details_055643fc")
+	api.RegisterMessage((*SwInterfaceSpanDetails)(nil), "sw_interface_span_details_8a20e79f")
 	api.RegisterMessage((*SwInterfaceSpanDump)(nil), "sw_interface_span_dump_d6cf0c3d")
-	api.RegisterMessage((*SwInterfaceSpanEnableDisable)(nil), "sw_interface_span_enable_disable_acc8fea1")
+	api.RegisterMessage((*SwInterfaceSpanEnableDisable)(nil), "sw_interface_span_enable_disable_23ddd96b")
 	api.RegisterMessage((*SwInterfaceSpanEnableDisableReply)(nil), "sw_interface_span_enable_disable_reply_e8d4e804")
 }
 
diff --git a/binapi/span/span_rest.ba.go b/binapi/span/span_rest.ba.go
deleted file mode 100644
index 0c2d959..0000000
--- a/binapi/span/span_rest.ba.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package span
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/sw_interface_span_enable_disable", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(SwInterfaceSpanEnableDisable)
-		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.SwInterfaceSpanEnableDisable(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/span/span_rpc.ba.go b/binapi/span/span_rpc.ba.go
index 3f34859..1aff05c 100644
--- a/binapi/span/span_rpc.ba.go
+++ b/binapi/span/span_rpc.ba.go
@@ -5,12 +5,13 @@ package span
 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  span.
+// RPCService defines RPC service span.
 type RPCService interface {
 	SwInterfaceSpanDump(ctx context.Context, in *SwInterfaceSpanDump) (RPCService_SwInterfaceSpanDumpClient, error)
 	SwInterfaceSpanEnableDisable(ctx context.Context, in *SwInterfaceSpanEnableDisable) (*SwInterfaceSpanEnableDisableReply, error)
@@ -33,7 +34,7 @@ func (c *serviceClient) SwInterfaceSpanDump(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
@@ -56,7 +57,11 @@ func (c *serviceClient_SwInterfaceSpanDumpClient) Recv() (*SwInterfaceSpanDetail
 	switch m := msg.(type) {
 	case *SwInterfaceSpanDetails:
 		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) SwInterfaceSpanEnableDisable(ctx context.Context, in *Sw
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }