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, 26 insertions, 506 deletions

diff --git a/binapi/lisp/lisp.ba.go b/binapi/lisp/lisp.ba.go
index 7be6cca..c6e2246 100644
--- a/binapi/lisp/lisp.ba.go
+++ b/binapi/lisp/lisp.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/lisp.api.json
 
 // Package lisp contains generated bindings for API file lisp.api.
diff --git a/binapi/lisp/lisp_rest.ba.go b/binapi/lisp/lisp_rest.ba.go
deleted file mode 100644
index 024d6f5..0000000
--- a/binapi/lisp/lisp_rest.ba.go
+++ /dev/null
@@ -1,480 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package lisp
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/lisp_add_del_adjacency", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelAdjacency)
-		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.LispAddDelAdjacency(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("/lisp_add_del_local_eid", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelLocalEid)
-		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.LispAddDelLocalEid(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("/lisp_add_del_locator", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelLocator)
-		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.LispAddDelLocator(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("/lisp_add_del_locator_set", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelLocatorSet)
-		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.LispAddDelLocatorSet(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("/lisp_add_del_map_request_itr_rlocs", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelMapRequestItrRlocs)
-		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.LispAddDelMapRequestItrRlocs(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("/lisp_add_del_map_resolver", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelMapResolver)
-		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.LispAddDelMapResolver(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("/lisp_add_del_map_server", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelMapServer)
-		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.LispAddDelMapServer(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("/lisp_add_del_remote_mapping", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAddDelRemoteMapping)
-		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.LispAddDelRemoteMapping(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("/lisp_adjacencies_get", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispAdjacenciesGet)
-		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.LispAdjacenciesGet(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("/lisp_eid_table_add_del_map", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispEidTableAddDelMap)
-		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.LispEidTableAddDelMap(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("/lisp_enable_disable", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispEnableDisable)
-		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.LispEnableDisable(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("/lisp_get_map_request_itr_rlocs", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispGetMapRequestItrRlocs)
-		reply, err := rpc.LispGetMapRequestItrRlocs(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("/lisp_map_register_enable_disable", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispMapRegisterEnableDisable)
-		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.LispMapRegisterEnableDisable(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("/lisp_map_request_mode", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispMapRequestMode)
-		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.LispMapRequestMode(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("/lisp_pitr_set_locator_set", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispPitrSetLocatorSet)
-		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.LispPitrSetLocatorSet(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("/lisp_rloc_probe_enable_disable", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispRlocProbeEnableDisable)
-		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.LispRlocProbeEnableDisable(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("/lisp_use_petr", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(LispUsePetr)
-		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.LispUsePetr(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("/show_lisp_map_register_state", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(ShowLispMapRegisterState)
-		reply, err := rpc.ShowLispMapRegisterState(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("/show_lisp_map_request_mode", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(ShowLispMapRequestMode)
-		reply, err := rpc.ShowLispMapRequestMode(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("/show_lisp_pitr", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(ShowLispPitr)
-		reply, err := rpc.ShowLispPitr(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("/show_lisp_rloc_probe_state", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(ShowLispRlocProbeState)
-		reply, err := rpc.ShowLispRlocProbeState(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("/show_lisp_status", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(ShowLispStatus)
-		reply, err := rpc.ShowLispStatus(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("/show_lisp_use_petr", func(w http.ResponseWriter, req *http.Request) {
-		var request = new(ShowLispUsePetr)
-		reply, err := rpc.ShowLispUsePetr(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/lisp/lisp_rpc.ba.go b/binapi/lisp/lisp_rpc.ba.go
index 58962d4..511de34 100644
--- a/binapi/lisp/lisp_rpc.ba.go
+++ b/binapi/lisp/lisp_rpc.ba.go
@@ -11,7 +11,7 @@ import (
 	vpe "git.fd.io/govpp.git/binapi/vpe"
 )
 
-// RPCService defines RPC service  lisp.
+// RPCService defines RPC service lisp.
 type RPCService interface {
 	LispAddDelAdjacency(ctx context.Context, in *LispAddDelAdjacency) (*LispAddDelAdjacencyReply, error)
 	LispAddDelLocalEid(ctx context.Context, in *LispAddDelLocalEid) (*LispAddDelLocalEidReply, error)
@@ -59,7 +59,7 @@ func (c *serviceClient) LispAddDelAdjacency(ctx context.Context, in *LispAddDelA
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAddDelLocalEid(ctx context.Context, in *LispAddDelLocalEid) (*LispAddDelLocalEidReply, error) {
@@ -68,7 +68,7 @@ func (c *serviceClient) LispAddDelLocalEid(ctx context.Context, in *LispAddDelLo
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAddDelLocator(ctx context.Context, in *LispAddDelLocator) (*LispAddDelLocatorReply, error) {
@@ -77,7 +77,7 @@ func (c *serviceClient) LispAddDelLocator(ctx context.Context, in *LispAddDelLoc
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAddDelLocatorSet(ctx context.Context, in *LispAddDelLocatorSet) (*LispAddDelLocatorSetReply, error) {
@@ -86,7 +86,7 @@ func (c *serviceClient) LispAddDelLocatorSet(ctx context.Context, in *LispAddDel
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAddDelMapRequestItrRlocs(ctx context.Context, in *LispAddDelMapRequestItrRlocs) (*LispAddDelMapRequestItrRlocsReply, error) {
@@ -95,7 +95,7 @@ func (c *serviceClient) LispAddDelMapRequestItrRlocs(ctx context.Context, in *Li
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAddDelMapResolver(ctx context.Context, in *LispAddDelMapResolver) (*LispAddDelMapResolverReply, error) {
@@ -104,7 +104,7 @@ func (c *serviceClient) LispAddDelMapResolver(ctx context.Context, in *LispAddDe
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAddDelMapServer(ctx context.Context, in *LispAddDelMapServer) (*LispAddDelMapServerReply, error) {
@@ -113,7 +113,7 @@ func (c *serviceClient) LispAddDelMapServer(ctx context.Context, in *LispAddDelM
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAddDelRemoteMapping(ctx context.Context, in *LispAddDelRemoteMapping) (*LispAddDelRemoteMappingReply, error) {
@@ -122,7 +122,7 @@ func (c *serviceClient) LispAddDelRemoteMapping(ctx context.Context, in *LispAdd
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispAdjacenciesGet(ctx context.Context, in *LispAdjacenciesGet) (*LispAdjacenciesGetReply, error) {
@@ -131,7 +131,7 @@ func (c *serviceClient) LispAdjacenciesGet(ctx context.Context, in *LispAdjacenc
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispEidTableAddDelMap(ctx context.Context, in *LispEidTableAddDelMap) (*LispEidTableAddDelMapReply, error) {
@@ -140,7 +140,7 @@ func (c *serviceClient) LispEidTableAddDelMap(ctx context.Context, in *LispEidTa
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispEidTableDump(ctx context.Context, in *LispEidTableDump) (RPCService_LispEidTableDumpClient, error) {
@@ -266,7 +266,7 @@ func (c *serviceClient) LispEnableDisable(ctx context.Context, in *LispEnableDis
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispGetMapRequestItrRlocs(ctx context.Context, in *LispGetMapRequestItrRlocs) (*LispGetMapRequestItrRlocsReply, error) {
@@ -275,7 +275,7 @@ func (c *serviceClient) LispGetMapRequestItrRlocs(ctx context.Context, in *LispG
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispLocatorDump(ctx context.Context, in *LispLocatorDump) (RPCService_LispLocatorDumpClient, error) {
@@ -362,7 +362,7 @@ func (c *serviceClient) LispMapRegisterEnableDisable(ctx context.Context, in *Li
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispMapRequestMode(ctx context.Context, in *LispMapRequestMode) (*LispMapRequestModeReply, error) {
@@ -371,7 +371,7 @@ func (c *serviceClient) LispMapRequestMode(ctx context.Context, in *LispMapReque
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispMapResolverDump(ctx context.Context, in *LispMapResolverDump) (RPCService_LispMapResolverDumpClient, error) {
@@ -458,7 +458,7 @@ func (c *serviceClient) LispPitrSetLocatorSet(ctx context.Context, in *LispPitrS
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispRlocProbeEnableDisable(ctx context.Context, in *LispRlocProbeEnableDisable) (*LispRlocProbeEnableDisableReply, error) {
@@ -467,7 +467,7 @@ func (c *serviceClient) LispRlocProbeEnableDisable(ctx context.Context, in *Lisp
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) LispUsePetr(ctx context.Context, in *LispUsePetr) (*LispUsePetrReply, error) {
@@ -476,7 +476,7 @@ func (c *serviceClient) LispUsePetr(ctx context.Context, in *LispUsePetr) (*Lisp
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) ShowLispMapRegisterState(ctx context.Context, in *ShowLispMapRegisterState) (*ShowLispMapRegisterStateReply, error) {
@@ -485,7 +485,7 @@ func (c *serviceClient) ShowLispMapRegisterState(ctx context.Context, in *ShowLi
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) ShowLispMapRequestMode(ctx context.Context, in *ShowLispMapRequestMode) (*ShowLispMapRequestModeReply, error) {
@@ -494,7 +494,7 @@ func (c *serviceClient) ShowLispMapRequestMode(ctx context.Context, in *ShowLisp
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) ShowLispPitr(ctx context.Context, in *ShowLispPitr) (*ShowLispPitrReply, error) {
@@ -503,7 +503,7 @@ func (c *serviceClient) ShowLispPitr(ctx context.Context, in *ShowLispPitr) (*Sh
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) ShowLispRlocProbeState(ctx context.Context, in *ShowLispRlocProbeState) (*ShowLispRlocProbeStateReply, error) {
@@ -512,7 +512,7 @@ func (c *serviceClient) ShowLispRlocProbeState(ctx context.Context, in *ShowLisp
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) ShowLispStatus(ctx context.Context, in *ShowLispStatus) (*ShowLispStatusReply, error) {
@@ -521,7 +521,7 @@ func (c *serviceClient) ShowLispStatus(ctx context.Context, in *ShowLispStatus)
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) ShowLispUsePetr(ctx context.Context, in *ShowLispUsePetr) (*ShowLispUsePetrReply, error) {
@@ -530,5 +530,5 @@ func (c *serviceClient) ShowLispUsePetr(ctx context.Context, in *ShowLispUsePetr
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }