diff options
Diffstat (limited to 'binapi/pipe')
-rw-r--r-- | binapi/pipe/pipe.ba.go | 20 | ||||
-rw-r--r-- | binapi/pipe/pipe_rest.ba.go | 60 | ||||
-rw-r--r-- | binapi/pipe/pipe_rpc.ba.go | 19 |
3 files changed, 22 insertions, 77 deletions
diff --git a/binapi/pipe/pipe.ba.go b/binapi/pipe/pipe.ba.go index 6123059..e48a0c2 100644 --- a/binapi/pipe/pipe.ba.go +++ b/binapi/pipe/pipe.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/core/pipe.api.json // Package pipe contains generated bindings for API file pipe.api. @@ -12,9 +12,9 @@ package pipe 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 = "pipe" APIVersion = "1.0.1" - VersionCrc = 0xd22736c9 + VersionCrc = 0xc159134a ) // PipeCreate defines message 'pipe_create'. @@ -75,7 +75,7 @@ type PipeCreateReply struct { func (m *PipeCreateReply) Reset() { *m = PipeCreateReply{} } func (*PipeCreateReply) GetMessageName() string { return "pipe_create_reply" } -func (*PipeCreateReply) GetCrcString() string { return "d4c2c2b3" } +func (*PipeCreateReply) GetCrcString() string { return "b7ce310c" } func (*PipeCreateReply) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -188,7 +188,7 @@ type PipeDetails struct { func (m *PipeDetails) Reset() { *m = PipeDetails{} } func (*PipeDetails) GetMessageName() string { return "pipe_details" } -func (*PipeDetails) GetCrcString() string { return "43ac107a" } +func (*PipeDetails) GetCrcString() string { return "c52b799d" } func (*PipeDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -256,10 +256,10 @@ func (m *PipeDump) Unmarshal(b []byte) error { func init() { file_pipe_binapi_init() } func file_pipe_binapi_init() { api.RegisterMessage((*PipeCreate)(nil), "pipe_create_bb263bd3") - api.RegisterMessage((*PipeCreateReply)(nil), "pipe_create_reply_d4c2c2b3") + api.RegisterMessage((*PipeCreateReply)(nil), "pipe_create_reply_b7ce310c") api.RegisterMessage((*PipeDelete)(nil), "pipe_delete_f9e6675e") api.RegisterMessage((*PipeDeleteReply)(nil), "pipe_delete_reply_e8d4e804") - api.RegisterMessage((*PipeDetails)(nil), "pipe_details_43ac107a") + api.RegisterMessage((*PipeDetails)(nil), "pipe_details_c52b799d") api.RegisterMessage((*PipeDump)(nil), "pipe_dump_51077d14") } diff --git a/binapi/pipe/pipe_rest.ba.go b/binapi/pipe/pipe_rest.ba.go deleted file mode 100644 index 8a2b900..0000000 --- a/binapi/pipe/pipe_rest.ba.go +++ /dev/null @@ -1,60 +0,0 @@ -// Code generated by GoVPP's binapi-generator. DO NOT EDIT. - -package pipe - -import ( - "encoding/json" - "io/ioutil" - "net/http" -) - -func RESTHandler(rpc RPCService) http.Handler { - mux := http.NewServeMux() - mux.HandleFunc("/pipe_create", func(w http.ResponseWriter, req *http.Request) { - var request = new(PipeCreate) - 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.PipeCreate(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("/pipe_delete", func(w http.ResponseWriter, req *http.Request) { - var request = new(PipeDelete) - 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.PipeDelete(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/pipe/pipe_rpc.ba.go b/binapi/pipe/pipe_rpc.ba.go index 3350ace..a3fd0d8 100644 --- a/binapi/pipe/pipe_rpc.ba.go +++ b/binapi/pipe/pipe_rpc.ba.go @@ -5,12 +5,13 @@ package pipe 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 pipe. +// RPCService defines RPC service pipe. type RPCService interface { PipeCreate(ctx context.Context, in *PipeCreate) (*PipeCreateReply, error) PipeDelete(ctx context.Context, in *PipeDelete) (*PipeDeleteReply, error) @@ -31,7 +32,7 @@ func (c *serviceClient) PipeCreate(ctx context.Context, in *PipeCreate) (*PipeCr if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) PipeDelete(ctx context.Context, in *PipeDelete) (*PipeDeleteReply, error) { @@ -40,7 +41,7 @@ func (c *serviceClient) PipeDelete(ctx context.Context, in *PipeDelete) (*PipeDe if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) PipeDump(ctx context.Context, in *PipeDump) (RPCService_PipeDumpClient, error) { @@ -52,7 +53,7 @@ func (c *serviceClient) PipeDump(ctx context.Context, in *PipeDump) (RPCService_ 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 @@ -75,7 +76,11 @@ func (c *serviceClient_PipeDumpClient) Recv() (*PipeDetails, error) { switch m := msg.(type) { case *PipeDetails: 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) |