From d1f24d37bd447b64e402298bb8eb2479681facf9 Mon Sep 17 00:00:00 2001 From: Ondrej Fabry Date: Fri, 17 Jul 2020 10:36:28 +0200 Subject: Improve binapi generator - simplified Size/Marshal/Unmarshal methods - replace struc in unions with custom marshal/unmarshal - fix imports in generated files - fix mock adapter - generate rpc service using low-level stream API (dumps generate control ping or stream msg..) - move examples/binapi to binapi and generate all API for latest release - add binapigen.Plugin for developing custom generator plugins - optionally generate HTTP handlers (REST API) for RPC services - add govpp program for browsing VPP API Change-Id: I092e9ed2b0c17972b3476463c3d4b14dd76ed42b Signed-off-by: Ondrej Fabry --- binapi/rdma/rdma.ba.go | 248 ++++++++++++++++++++++++++++++++++++++++++++ binapi/rdma/rdma_rest.ba.go | 60 +++++++++++ binapi/rdma/rdma_rpc.ba.go | 40 +++++++ 3 files changed, 348 insertions(+) create mode 100644 binapi/rdma/rdma.ba.go create mode 100644 binapi/rdma/rdma_rest.ba.go create mode 100644 binapi/rdma/rdma_rpc.ba.go (limited to 'binapi/rdma') diff --git a/binapi/rdma/rdma.ba.go b/binapi/rdma/rdma.ba.go new file mode 100644 index 0000000..43ab597 --- /dev/null +++ b/binapi/rdma/rdma.ba.go @@ -0,0 +1,248 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. +// versions: +// binapi-generator: v0.4.0-dev +// VPP: 20.05-release +// source: /usr/share/vpp/api/plugins/rdma.api.json + +// Package rdma contains generated bindings for API file rdma.api. +// +// Contents: +// 1 enum +// 4 messages +// +package rdma + +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" + "strconv" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the GoVPP api package it is being compiled against. +// A compilation error at this line likely means your copy of the +// GoVPP api package needs to be updated. +const _ = api.GoVppAPIPackageIsVersion2 + +const ( + APIFile = "rdma" + APIVersion = "1.0.0" + VersionCrc = 0x8b33158c +) + +// RdmaMode defines enum 'rdma_mode'. +type RdmaMode uint32 + +const ( + RDMA_API_MODE_AUTO RdmaMode = 0 + RDMA_API_MODE_IBV RdmaMode = 1 + RDMA_API_MODE_DV RdmaMode = 2 +) + +var ( + RdmaMode_name = map[uint32]string{ + 0: "RDMA_API_MODE_AUTO", + 1: "RDMA_API_MODE_IBV", + 2: "RDMA_API_MODE_DV", + } + RdmaMode_value = map[string]uint32{ + "RDMA_API_MODE_AUTO": 0, + "RDMA_API_MODE_IBV": 1, + "RDMA_API_MODE_DV": 2, + } +) + +func (x RdmaMode) String() string { + s, ok := RdmaMode_name[uint32(x)] + if ok { + return s + } + return "RdmaMode(" + strconv.Itoa(int(x)) + ")" +} + +// RdmaCreate defines message 'rdma_create'. +type RdmaCreate struct { + HostIf string `binapi:"string[64],name=host_if" json:"host_if,omitempty"` + Name string `binapi:"string[64],name=name" json:"name,omitempty"` + RxqNum uint16 `binapi:"u16,name=rxq_num,default=%!s(float64=1)" json:"rxq_num,omitempty"` + RxqSize uint16 `binapi:"u16,name=rxq_size,default=%!s(float64=1024)" json:"rxq_size,omitempty"` + TxqSize uint16 `binapi:"u16,name=txq_size,default=%!s(float64=1024)" json:"txq_size,omitempty"` + Mode RdmaMode `binapi:"rdma_mode,name=mode,default=%!s(float64=0)" json:"mode,omitempty"` +} + +func (m *RdmaCreate) Reset() { *m = RdmaCreate{} } +func (*RdmaCreate) GetMessageName() string { return "rdma_create" } +func (*RdmaCreate) GetCrcString() string { return "076fe418" } +func (*RdmaCreate) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *RdmaCreate) Size() int { + if m == nil { + return 0 + } + var size int + size += 64 // m.HostIf + size += 64 // m.Name + size += 2 // m.RxqNum + size += 2 // m.RxqSize + size += 2 // m.TxqSize + size += 4 // m.Mode + return size +} +func (m *RdmaCreate) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + buf.EncodeString(m.HostIf, 64) + buf.EncodeString(m.Name, 64) + buf.EncodeUint16(uint16(m.RxqNum)) + buf.EncodeUint16(uint16(m.RxqSize)) + buf.EncodeUint16(uint16(m.TxqSize)) + buf.EncodeUint32(uint32(m.Mode)) + return buf.Bytes(), nil +} +func (m *RdmaCreate) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.HostIf = buf.DecodeString(64) + m.Name = buf.DecodeString(64) + m.RxqNum = buf.DecodeUint16() + m.RxqSize = buf.DecodeUint16() + m.TxqSize = buf.DecodeUint16() + m.Mode = RdmaMode(buf.DecodeUint32()) + return nil +} + +// RdmaCreateReply defines message 'rdma_create_reply'. +type RdmaCreateReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` +} + +func (m *RdmaCreateReply) Reset() { *m = RdmaCreateReply{} } +func (*RdmaCreateReply) GetMessageName() string { return "rdma_create_reply" } +func (*RdmaCreateReply) GetCrcString() string { return "5383d31f" } +func (*RdmaCreateReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *RdmaCreateReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + size += 4 // m.SwIfIndex + return size +} +func (m *RdmaCreateReply) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + buf.EncodeUint32(uint32(m.Retval)) + buf.EncodeUint32(uint32(m.SwIfIndex)) + return buf.Bytes(), nil +} +func (m *RdmaCreateReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + return nil +} + +// RdmaDelete defines message 'rdma_delete'. +type RdmaDelete struct { + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` +} + +func (m *RdmaDelete) Reset() { *m = RdmaDelete{} } +func (*RdmaDelete) GetMessageName() string { return "rdma_delete" } +func (*RdmaDelete) GetCrcString() string { return "f9e6675e" } +func (*RdmaDelete) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *RdmaDelete) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.SwIfIndex + return size +} +func (m *RdmaDelete) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + buf.EncodeUint32(uint32(m.SwIfIndex)) + return buf.Bytes(), nil +} +func (m *RdmaDelete) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + return nil +} + +// RdmaDeleteReply defines message 'rdma_delete_reply'. +type RdmaDeleteReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *RdmaDeleteReply) Reset() { *m = RdmaDeleteReply{} } +func (*RdmaDeleteReply) GetMessageName() string { return "rdma_delete_reply" } +func (*RdmaDeleteReply) GetCrcString() string { return "e8d4e804" } +func (*RdmaDeleteReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *RdmaDeleteReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *RdmaDeleteReply) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + buf.EncodeUint32(uint32(m.Retval)) + return buf.Bytes(), nil +} +func (m *RdmaDeleteReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +func init() { file_rdma_binapi_init() } +func file_rdma_binapi_init() { + api.RegisterMessage((*RdmaCreate)(nil), "rdma_create_076fe418") + api.RegisterMessage((*RdmaCreateReply)(nil), "rdma_create_reply_5383d31f") + api.RegisterMessage((*RdmaDelete)(nil), "rdma_delete_f9e6675e") + api.RegisterMessage((*RdmaDeleteReply)(nil), "rdma_delete_reply_e8d4e804") +} + +// Messages returns list of all messages in this module. +func AllMessages() []api.Message { + return []api.Message{ + (*RdmaCreate)(nil), + (*RdmaCreateReply)(nil), + (*RdmaDelete)(nil), + (*RdmaDeleteReply)(nil), + } +} diff --git a/binapi/rdma/rdma_rest.ba.go b/binapi/rdma/rdma_rest.ba.go new file mode 100644 index 0000000..83346d9 --- /dev/null +++ b/binapi/rdma/rdma_rest.ba.go @@ -0,0 +1,60 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package rdma + +import ( + "encoding/json" + "io/ioutil" + "net/http" +) + +func RESTHandler(rpc RPCService) http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/rdma_create", func(w http.ResponseWriter, req *http.Request) { + var request = new(RdmaCreate) + 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.RdmaCreate(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("/rdma_delete", func(w http.ResponseWriter, req *http.Request) { + var request = new(RdmaDelete) + 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.RdmaDelete(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/rdma/rdma_rpc.ba.go b/binapi/rdma/rdma_rpc.ba.go new file mode 100644 index 0000000..850f04a --- /dev/null +++ b/binapi/rdma/rdma_rpc.ba.go @@ -0,0 +1,40 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package rdma + +import ( + "context" + api "git.fd.io/govpp.git/api" +) + +// RPCService defines RPC service rdma. +type RPCService interface { + RdmaCreate(ctx context.Context, in *RdmaCreate) (*RdmaCreateReply, error) + RdmaDelete(ctx context.Context, in *RdmaDelete) (*RdmaDeleteReply, error) +} + +type serviceClient struct { + conn api.Connection +} + +func NewServiceClient(conn api.Connection) RPCService { + return &serviceClient{conn} +} + +func (c *serviceClient) RdmaCreate(ctx context.Context, in *RdmaCreate) (*RdmaCreateReply, error) { + out := new(RdmaCreateReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *serviceClient) RdmaDelete(ctx context.Context, in *RdmaDelete) (*RdmaDeleteReply, error) { + out := new(RdmaDeleteReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} -- cgit 1.2.3-korg