3 files changed, 11 insertions, 70 deletions
diff --git a/binapi/avf/avf.ba.go b/binapi/avf/avf.ba.go
index edfa26e..e677d59 100644
--- a/binapi/avf/avf.ba.go
+++ b/binapi/avf/avf.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/avf.api.json
 
 // Package avf contains generated bindings for API file avf.api.
@@ -12,9 +12,9 @@
 package avf
 
 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"
+	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
@@ -26,7 +26,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "avf"
 	APIVersion = "1.0.0"
-	VersionCrc = 0xbaaa7124
+	VersionCrc = 0x9f5a6a20
 )
 
 // AvfCreate defines message 'avf_create'.
diff --git a/binapi/avf/avf_rest.ba.go b/binapi/avf/avf_rest.ba.go
deleted file mode 100644
index 1a9d7f3..0000000
--- a/binapi/avf/avf_rest.ba.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package avf
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/avf_create", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(AvfCreate)
-		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.AvfCreate(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)
-	})
-	mux.HandleFunc("/avf_delete", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(AvfDelete)
-		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.AvfDelete(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/avf/avf_rpc.ba.go b/binapi/avf/avf_rpc.ba.go
index 90f854e..3e87ffd 100644
--- a/binapi/avf/avf_rpc.ba.go
+++ b/binapi/avf/avf_rpc.ba.go
@@ -4,10 +4,11 @@ package avf
 
 import (
 	"context"
-	api "git.fd.io/govpp.git/api"
+
+	api "go.fd.io/govpp/api"
 )
 
-// RPCService defines RPC service  avf.
+// RPCService defines RPC service avf.
 type RPCService interface {
 	AvfCreate(ctx context.Context, in *AvfCreate) (*AvfCreateReply, error)
 	AvfDelete(ctx context.Context, in *AvfDelete) (*AvfDeleteReply, error)
@@ -27,7 +28,7 @@ func (c *serviceClient) AvfCreate(ctx context.Context, in *AvfCreate) (*AvfCreat
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) AvfDelete(ctx context.Context, in *AvfDelete) (*AvfDeleteReply, error) {
@@ -36,5 +37,5 @@ func (c *serviceClient) AvfDelete(ctx context.Context, in *AvfDelete) (*AvfDelet
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }