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, 8 insertions, 119 deletions

diff --git a/binapi/dslite/dslite.ba.go b/binapi/dslite/dslite.ba.go
index efcf240..0837892 100644
--- a/binapi/dslite/dslite.ba.go
+++ b/binapi/dslite/dslite.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/plugins/dslite.api.json
 
 // Package dslite contains generated bindings for API file dslite.api.
diff --git a/binapi/dslite/dslite_rest.ba.go b/binapi/dslite/dslite_rest.ba.go
deleted file mode 100644
index eba86b0..0000000
--- a/binapi/dslite/dslite_rest.ba.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package dslite
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/dslite_add_del_pool_addr_range", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(DsliteAddDelPoolAddrRange)
-		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.DsliteAddDelPoolAddrRange(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("/dslite_get_aftr_addr", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(DsliteGetAftrAddr)
-		reply, err := rpc.DsliteGetAftrAddr(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("/dslite_get_b4_addr", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(DsliteGetB4Addr)
-		reply, err := rpc.DsliteGetB4Addr(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("/dslite_set_aftr_addr", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(DsliteSetAftrAddr)
-		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.DsliteSetAftrAddr(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("/dslite_set_b4_addr", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(DsliteSetB4Addr)
-		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.DsliteSetB4Addr(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/dslite/dslite_rpc.ba.go b/binapi/dslite/dslite_rpc.ba.go
index 6314fd2..5847cf6 100644
--- a/binapi/dslite/dslite_rpc.ba.go
+++ b/binapi/dslite/dslite_rpc.ba.go
@@ -11,7 +11,7 @@ import (
 	vpe "git.fd.io/govpp.git/binapi/vpe"
 )
 
-// RPCService defines RPC service  dslite.
+// RPCService defines RPC service dslite.
 type RPCService interface {
 	DsliteAddDelPoolAddrRange(ctx context.Context, in *DsliteAddDelPoolAddrRange) (*DsliteAddDelPoolAddrRangeReply, error)
 	DsliteAddressDump(ctx context.Context, in *DsliteAddressDump) (RPCService_DsliteAddressDumpClient, error)
@@ -35,7 +35,7 @@ func (c *serviceClient) DsliteAddDelPoolAddrRange(ctx context.Context, in *Dslit
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) DsliteAddressDump(ctx context.Context, in *DsliteAddressDump) (RPCService_DsliteAddressDumpClient, error) {
@@ -83,7 +83,7 @@ func (c *serviceClient) DsliteGetAftrAddr(ctx context.Context, in *DsliteGetAftr
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) DsliteGetB4Addr(ctx context.Context, in *DsliteGetB4Addr) (*DsliteGetB4AddrReply, error) {
@@ -92,7 +92,7 @@ func (c *serviceClient) DsliteGetB4Addr(ctx context.Context, in *DsliteGetB4Addr
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) DsliteSetAftrAddr(ctx context.Context, in *DsliteSetAftrAddr) (*DsliteSetAftrAddrReply, error) {
@@ -101,7 +101,7 @@ func (c *serviceClient) DsliteSetAftrAddr(ctx context.Context, in *DsliteSetAftr
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) DsliteSetB4Addr(ctx context.Context, in *DsliteSetB4Addr) (*DsliteSetB4AddrReply, error) {
@@ -110,5 +110,5 @@ func (c *serviceClient) DsliteSetB4Addr(ctx context.Context, in *DsliteSetB4Addr
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }