aboutsummaryrefslogtreecommitdiffstats
path: root/binapi/nsh
diff options
context:
space:
mode:
Diffstat (limited to 'binapi/nsh')
-rw-r--r--binapi/nsh/nsh.ba.go20
-rw-r--r--binapi/nsh/nsh_rest.ba.go60
-rw-r--r--binapi/nsh/nsh_rpc.ba.go27
3 files changed, 28 insertions, 79 deletions
diff --git a/binapi/nsh/nsh.ba.go b/binapi/nsh/nsh.ba.go
index 5897a90..00a28a0 100644
--- a/binapi/nsh/nsh.ba.go
+++ b/binapi/nsh/nsh.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/nsh.api.json
// Package nsh contains generated bindings for API file nsh.api.
@@ -12,9 +12,9 @@
package nsh
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 = "nsh"
APIVersion = "1.0.0"
- VersionCrc = 0x43be6707
+ VersionCrc = 0xc2f3127d
)
// NshAddDelEntry defines message 'nsh_add_del_entry'.
@@ -161,7 +161,7 @@ type NshAddDelMap struct {
func (m *NshAddDelMap) Reset() { *m = NshAddDelMap{} }
func (*NshAddDelMap) GetMessageName() string { return "nsh_add_del_map" }
-func (*NshAddDelMap) GetCrcString() string { return "898d857d" }
+func (*NshAddDelMap) GetCrcString() string { return "0a0f42b0" }
func (*NshAddDelMap) GetMessageType() api.MessageType {
return api.RequestMessage
}
@@ -370,7 +370,7 @@ type NshMapDetails struct {
func (m *NshMapDetails) Reset() { *m = NshMapDetails{} }
func (*NshMapDetails) GetMessageName() string { return "nsh_map_details" }
-func (*NshMapDetails) GetCrcString() string { return "b34ac8a1" }
+func (*NshMapDetails) GetCrcString() string { return "2fefcf49" }
func (*NshMapDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
}
@@ -451,11 +451,11 @@ func init() { file_nsh_binapi_init() }
func file_nsh_binapi_init() {
api.RegisterMessage((*NshAddDelEntry)(nil), "nsh_add_del_entry_7dea480b")
api.RegisterMessage((*NshAddDelEntryReply)(nil), "nsh_add_del_entry_reply_6296a9eb")
- api.RegisterMessage((*NshAddDelMap)(nil), "nsh_add_del_map_898d857d")
+ api.RegisterMessage((*NshAddDelMap)(nil), "nsh_add_del_map_0a0f42b0")
api.RegisterMessage((*NshAddDelMapReply)(nil), "nsh_add_del_map_reply_b2b127ef")
api.RegisterMessage((*NshEntryDetails)(nil), "nsh_entry_details_046fb556")
api.RegisterMessage((*NshEntryDump)(nil), "nsh_entry_dump_cdaf8ccb")
- api.RegisterMessage((*NshMapDetails)(nil), "nsh_map_details_b34ac8a1")
+ api.RegisterMessage((*NshMapDetails)(nil), "nsh_map_details_2fefcf49")
api.RegisterMessage((*NshMapDump)(nil), "nsh_map_dump_8fc06b82")
}
diff --git a/binapi/nsh/nsh_rest.ba.go b/binapi/nsh/nsh_rest.ba.go
deleted file mode 100644
index 87b29e4..0000000
--- a/binapi/nsh/nsh_rest.ba.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package nsh
-
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
- mux := http.NewServeMux()
- mux.HandleFunc("/nsh_add_del_entry", func(w http.ResponseWriter, req *http.Request) {
- var request = new(NshAddDelEntry)
- 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.NshAddDelEntry(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("/nsh_add_del_map", func(w http.ResponseWriter, req *http.Request) {
- var request = new(NshAddDelMap)
- 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.NshAddDelMap(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/nsh/nsh_rpc.ba.go b/binapi/nsh/nsh_rpc.ba.go
index c91c85f..2761653 100644
--- a/binapi/nsh/nsh_rpc.ba.go
+++ b/binapi/nsh/nsh_rpc.ba.go
@@ -5,12 +5,13 @@ package nsh
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 nsh.
+// RPCService defines RPC service nsh.
type RPCService interface {
NshAddDelEntry(ctx context.Context, in *NshAddDelEntry) (*NshAddDelEntryReply, error)
NshAddDelMap(ctx context.Context, in *NshAddDelMap) (*NshAddDelMapReply, error)
@@ -32,7 +33,7 @@ func (c *serviceClient) NshAddDelEntry(ctx context.Context, in *NshAddDelEntry)
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) NshAddDelMap(ctx context.Context, in *NshAddDelMap) (*NshAddDelMapReply, error) {
@@ -41,7 +42,7 @@ func (c *serviceClient) NshAddDelMap(ctx context.Context, in *NshAddDelMap) (*Ns
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) NshEntryDump(ctx context.Context, in *NshEntryDump) (RPCService_NshEntryDumpClient, error) {
@@ -53,7 +54,7 @@ func (c *serviceClient) NshEntryDump(ctx context.Context, in *NshEntryDump) (RPC
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
@@ -76,7 +77,11 @@ func (c *serviceClient_NshEntryDumpClient) Recv() (*NshEntryDetails, error) {
switch m := msg.(type) {
case *NshEntryDetails:
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)
@@ -92,7 +97,7 @@ func (c *serviceClient) NshMapDump(ctx context.Context, in *NshMapDump) (RPCServ
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
@@ -115,7 +120,11 @@ func (c *serviceClient_NshMapDumpClient) Recv() (*NshMapDetails, error) {
switch m := msg.(type) {
case *NshMapDetails:
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)