diff options
Diffstat (limited to 'binapi/gre')
-rw-r--r-- | binapi/gre/gre.ba.go | 27 | ||||
-rw-r--r-- | binapi/gre/gre_rest.ba.go | 37 | ||||
-rw-r--r-- | binapi/gre/gre_rpc.ba.go | 17 |
3 files changed, 25 insertions, 56 deletions
diff --git a/binapi/gre/gre.ba.go b/binapi/gre/gre.ba.go index d14c51e..ee09bad 100644 --- a/binapi/gre/gre.ba.go +++ b/binapi/gre/gre.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/gre.api.json // Package gre contains generated bindings for API file gre.api. @@ -14,12 +14,13 @@ package gre import ( - api "git.fd.io/govpp.git/api" - interface_types "git.fd.io/govpp.git/binapi/interface_types" - ip_types "git.fd.io/govpp.git/binapi/ip_types" - tunnel_types "git.fd.io/govpp.git/binapi/tunnel_types" - codec "git.fd.io/govpp.git/codec" "strconv" + + api "go.fd.io/govpp/api" + interface_types "go.fd.io/govpp/binapi/interface_types" + ip_types "go.fd.io/govpp/binapi/ip_types" + tunnel_types "go.fd.io/govpp/binapi/tunnel_types" + codec "go.fd.io/govpp/codec" ) // This is a compile-time assertion to ensure that this generated file @@ -30,8 +31,8 @@ const _ = api.GoVppAPIPackageIsVersion2 const ( APIFile = "gre" - APIVersion = "2.1.0" - VersionCrc = 0xb9021569 + APIVersion = "2.1.1" + VersionCrc = 0x98b44dd1 ) // GreTunnelType defines enum 'gre_tunnel_type'. @@ -85,7 +86,7 @@ type GreTunnelAddDel struct { func (m *GreTunnelAddDel) Reset() { *m = GreTunnelAddDel{} } func (*GreTunnelAddDel) GetMessageName() string { return "gre_tunnel_add_del" } -func (*GreTunnelAddDel) GetCrcString() string { return "6efc9c22" } +func (*GreTunnelAddDel) GetCrcString() string { return "a27d7f17" } func (*GreTunnelAddDel) GetMessageType() api.MessageType { return api.RequestMessage } @@ -188,7 +189,7 @@ type GreTunnelDetails struct { func (m *GreTunnelDetails) Reset() { *m = GreTunnelDetails{} } func (*GreTunnelDetails) GetMessageName() string { return "gre_tunnel_details" } -func (*GreTunnelDetails) GetCrcString() string { return "003bfbf1" } +func (*GreTunnelDetails) GetCrcString() string { return "24435433" } func (*GreTunnelDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -279,9 +280,9 @@ func (m *GreTunnelDump) Unmarshal(b []byte) error { func init() { file_gre_binapi_init() } func file_gre_binapi_init() { - api.RegisterMessage((*GreTunnelAddDel)(nil), "gre_tunnel_add_del_6efc9c22") + api.RegisterMessage((*GreTunnelAddDel)(nil), "gre_tunnel_add_del_a27d7f17") api.RegisterMessage((*GreTunnelAddDelReply)(nil), "gre_tunnel_add_del_reply_5383d31f") - api.RegisterMessage((*GreTunnelDetails)(nil), "gre_tunnel_details_003bfbf1") + api.RegisterMessage((*GreTunnelDetails)(nil), "gre_tunnel_details_24435433") api.RegisterMessage((*GreTunnelDump)(nil), "gre_tunnel_dump_f9e6675e") } diff --git a/binapi/gre/gre_rest.ba.go b/binapi/gre/gre_rest.ba.go deleted file mode 100644 index d344aa8..0000000 --- a/binapi/gre/gre_rest.ba.go +++ /dev/null @@ -1,37 +0,0 @@ -// Code generated by GoVPP's binapi-generator. DO NOT EDIT. - -package gre - -import ( - "encoding/json" - "io/ioutil" - "net/http" -) - -func RESTHandler(rpc RPCService) http.Handler { - mux := http.NewServeMux() - mux.HandleFunc("/gre_tunnel_add_del", func(w http.ResponseWriter, req *http.Request) { - var request = new(GreTunnelAddDel) - 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.GreTunnelAddDel(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/gre/gre_rpc.ba.go b/binapi/gre/gre_rpc.ba.go index f664fb3..8c11524 100644 --- a/binapi/gre/gre_rpc.ba.go +++ b/binapi/gre/gre_rpc.ba.go @@ -5,12 +5,13 @@ package gre 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 gre. +// RPCService defines RPC service gre. type RPCService interface { GreTunnelAddDel(ctx context.Context, in *GreTunnelAddDel) (*GreTunnelAddDelReply, error) GreTunnelDump(ctx context.Context, in *GreTunnelDump) (RPCService_GreTunnelDumpClient, error) @@ -30,7 +31,7 @@ func (c *serviceClient) GreTunnelAddDel(ctx context.Context, in *GreTunnelAddDel if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) GreTunnelDump(ctx context.Context, in *GreTunnelDump) (RPCService_GreTunnelDumpClient, error) { @@ -42,7 +43,7 @@ func (c *serviceClient) GreTunnelDump(ctx context.Context, in *GreTunnelDump) (R 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 @@ -65,7 +66,11 @@ func (c *serviceClient_GreTunnelDumpClient) Recv() (*GreTunnelDetails, error) { switch m := msg.(type) { case *GreTunnelDetails: 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) |