Check retval value and convert to error in generated RPC client code

Change-Id: I816b4802cb5fc46239f6db0480fa4cf3645fe2f0
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>

3 files changed, 9 insertions, 143 deletions

diff --git a/binapi/ip_neighbor/ip_neighbor.ba.go b/binapi/ip_neighbor/ip_neighbor.ba.go
index 3215f5d..ec5b5ed 100644
--- a/binapi/ip_neighbor/ip_neighbor.ba.go
+++ b/binapi/ip_neighbor/ip_neighbor.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.4.0
+//  VPP:              20.05.1-release
 // source: /usr/share/vpp/api/core/ip_neighbor.api.json
 
 // Package ip_neighbor contains generated bindings for API file ip_neighbor.api.
diff --git a/binapi/ip_neighbor/ip_neighbor_rest.ba.go b/binapi/ip_neighbor/ip_neighbor_rest.ba.go
deleted file mode 100644
index 7db4694..0000000
--- a/binapi/ip_neighbor/ip_neighbor_rest.ba.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package ip_neighbor
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/ip_neighbor_add_del", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(IPNeighborAddDel)
-		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.IPNeighborAddDel(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("/ip_neighbor_config", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(IPNeighborConfig)
-		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.IPNeighborConfig(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("/ip_neighbor_flush", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(IPNeighborFlush)
-		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.IPNeighborFlush(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("/ip_neighbor_replace_begin", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(IPNeighborReplaceBegin)
-		reply, err := rpc.IPNeighborReplaceBegin(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("/ip_neighbor_replace_end", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(IPNeighborReplaceEnd)
-		reply, err := rpc.IPNeighborReplaceEnd(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("/want_ip_neighbor_events", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(WantIPNeighborEvents)
-		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.WantIPNeighborEvents(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/ip_neighbor/ip_neighbor_rpc.ba.go b/binapi/ip_neighbor/ip_neighbor_rpc.ba.go
index 1d34965..94b2060 100644
--- a/binapi/ip_neighbor/ip_neighbor_rpc.ba.go
+++ b/binapi/ip_neighbor/ip_neighbor_rpc.ba.go
@@ -11,7 +11,7 @@ import (
 	vpe "git.fd.io/govpp.git/binapi/vpe"
 )
 
-// RPCService defines RPC service  ip_neighbor.
+// RPCService defines RPC service ip_neighbor.
 type RPCService interface {
 	IPNeighborAddDel(ctx context.Context, in *IPNeighborAddDel) (*IPNeighborAddDelReply, error)
 	IPNeighborConfig(ctx context.Context, in *IPNeighborConfig) (*IPNeighborConfigReply, error)
@@ -36,7 +36,7 @@ func (c *serviceClient) IPNeighborAddDel(ctx context.Context, in *IPNeighborAddD
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) IPNeighborConfig(ctx context.Context, in *IPNeighborConfig) (*IPNeighborConfigReply, error) {
@@ -45,7 +45,7 @@ func (c *serviceClient) IPNeighborConfig(ctx context.Context, in *IPNeighborConf
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) IPNeighborDump(ctx context.Context, in *IPNeighborDump) (RPCService_IPNeighborDumpClient, error) {
@@ -93,7 +93,7 @@ func (c *serviceClient) IPNeighborFlush(ctx context.Context, in *IPNeighborFlush
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) IPNeighborReplaceBegin(ctx context.Context, in *IPNeighborReplaceBegin) (*IPNeighborReplaceBeginReply, error) {
@@ -102,7 +102,7 @@ func (c *serviceClient) IPNeighborReplaceBegin(ctx context.Context, in *IPNeighb
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) IPNeighborReplaceEnd(ctx context.Context, in *IPNeighborReplaceEnd) (*IPNeighborReplaceEndReply, error) {
@@ -111,7 +111,7 @@ func (c *serviceClient) IPNeighborReplaceEnd(ctx context.Context, in *IPNeighbor
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) WantIPNeighborEvents(ctx context.Context, in *WantIPNeighborEvents) (*WantIPNeighborEventsReply, error) {
@@ -120,5 +120,5 @@ func (c *serviceClient) WantIPNeighborEvents(ctx context.Context, in *WantIPNeig
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }