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/avf/avf.ba.go | 212 ++++++++++++++++++++++++++++++++++++++++++++++ binapi/avf/avf_rest.ba.go | 60 +++++++++++++ binapi/avf/avf_rpc.ba.go | 40 +++++++++ 3 files changed, 312 insertions(+) create mode 100644 binapi/avf/avf.ba.go create mode 100644 binapi/avf/avf_rest.ba.go create mode 100644 binapi/avf/avf_rpc.ba.go (limited to 'binapi/avf') diff --git a/binapi/avf/avf.ba.go b/binapi/avf/avf.ba.go new file mode 100644 index 0000000..436223b --- /dev/null +++ b/binapi/avf/avf.ba.go @@ -0,0 +1,212 @@ +// 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/avf.api.json + +// Package avf contains generated bindings for API file avf.api. +// +// Contents: +// 4 messages +// +package avf + +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" +) + +// 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 = "avf" + APIVersion = "1.0.0" + VersionCrc = 0xbaaa7124 +) + +// AvfCreate defines message 'avf_create'. +type AvfCreate struct { + PciAddr uint32 `binapi:"u32,name=pci_addr" json:"pci_addr,omitempty"` + EnableElog int32 `binapi:"i32,name=enable_elog" json:"enable_elog,omitempty"` + RxqNum uint16 `binapi:"u16,name=rxq_num" json:"rxq_num,omitempty"` + RxqSize uint16 `binapi:"u16,name=rxq_size" json:"rxq_size,omitempty"` + TxqSize uint16 `binapi:"u16,name=txq_size" json:"txq_size,omitempty"` +} + +func (m *AvfCreate) Reset() { *m = AvfCreate{} } +func (*AvfCreate) GetMessageName() string { return "avf_create" } +func (*AvfCreate) GetCrcString() string { return "daab8ae2" } +func (*AvfCreate) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *AvfCreate) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.PciAddr + size += 4 // m.EnableElog + size += 2 // m.RxqNum + size += 2 // m.RxqSize + size += 2 // m.TxqSize + return size +} +func (m *AvfCreate) 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.PciAddr)) + buf.EncodeUint32(uint32(m.EnableElog)) + buf.EncodeUint16(uint16(m.RxqNum)) + buf.EncodeUint16(uint16(m.RxqSize)) + buf.EncodeUint16(uint16(m.TxqSize)) + return buf.Bytes(), nil +} +func (m *AvfCreate) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.PciAddr = buf.DecodeUint32() + m.EnableElog = int32(buf.DecodeUint32()) + m.RxqNum = buf.DecodeUint16() + m.RxqSize = buf.DecodeUint16() + m.TxqSize = buf.DecodeUint16() + return nil +} + +// AvfCreateReply defines message 'avf_create_reply'. +type AvfCreateReply 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 *AvfCreateReply) Reset() { *m = AvfCreateReply{} } +func (*AvfCreateReply) GetMessageName() string { return "avf_create_reply" } +func (*AvfCreateReply) GetCrcString() string { return "5383d31f" } +func (*AvfCreateReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *AvfCreateReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + size += 4 // m.SwIfIndex + return size +} +func (m *AvfCreateReply) 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 *AvfCreateReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + return nil +} + +// AvfDelete defines message 'avf_delete'. +type AvfDelete struct { + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` +} + +func (m *AvfDelete) Reset() { *m = AvfDelete{} } +func (*AvfDelete) GetMessageName() string { return "avf_delete" } +func (*AvfDelete) GetCrcString() string { return "f9e6675e" } +func (*AvfDelete) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *AvfDelete) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.SwIfIndex + return size +} +func (m *AvfDelete) 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 *AvfDelete) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + return nil +} + +// AvfDeleteReply defines message 'avf_delete_reply'. +type AvfDeleteReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *AvfDeleteReply) Reset() { *m = AvfDeleteReply{} } +func (*AvfDeleteReply) GetMessageName() string { return "avf_delete_reply" } +func (*AvfDeleteReply) GetCrcString() string { return "e8d4e804" } +func (*AvfDeleteReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *AvfDeleteReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *AvfDeleteReply) 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 *AvfDeleteReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +func init() { file_avf_binapi_init() } +func file_avf_binapi_init() { + api.RegisterMessage((*AvfCreate)(nil), "avf_create_daab8ae2") + api.RegisterMessage((*AvfCreateReply)(nil), "avf_create_reply_5383d31f") + api.RegisterMessage((*AvfDelete)(nil), "avf_delete_f9e6675e") + api.RegisterMessage((*AvfDeleteReply)(nil), "avf_delete_reply_e8d4e804") +} + +// Messages returns list of all messages in this module. +func AllMessages() []api.Message { + return []api.Message{ + (*AvfCreate)(nil), + (*AvfCreateReply)(nil), + (*AvfDelete)(nil), + (*AvfDeleteReply)(nil), + } +} diff --git a/binapi/avf/avf_rest.ba.go b/binapi/avf/avf_rest.ba.go new file mode 100644 index 0000000..1a9d7f3 --- /dev/null +++ b/binapi/avf/avf_rest.ba.go @@ -0,0 +1,60 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package avf + +import ( + "encoding/json" + "io/ioutil" + "net/http" +) + +func RESTHandler(rpc RPCService) http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/avf_create", func(w http.ResponseWriter, req *http.Request) { + var request = new(AvfCreate) + 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.AvfCreate(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("/avf_delete", func(w http.ResponseWriter, req *http.Request) { + var request = new(AvfDelete) + 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.AvfDelete(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/avf/avf_rpc.ba.go b/binapi/avf/avf_rpc.ba.go new file mode 100644 index 0000000..90f854e --- /dev/null +++ b/binapi/avf/avf_rpc.ba.go @@ -0,0 +1,40 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package avf + +import ( + "context" + api "git.fd.io/govpp.git/api" +) + +// RPCService defines RPC service avf. +type RPCService interface { + AvfCreate(ctx context.Context, in *AvfCreate) (*AvfCreateReply, error) + AvfDelete(ctx context.Context, in *AvfDelete) (*AvfDeleteReply, error) +} + +type serviceClient struct { + conn api.Connection +} + +func NewServiceClient(conn api.Connection) RPCService { + return &serviceClient{conn} +} + +func (c *serviceClient) AvfCreate(ctx context.Context, in *AvfCreate) (*AvfCreateReply, error) { + out := new(AvfCreateReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *serviceClient) AvfDelete(ctx context.Context, in *AvfDelete) (*AvfDeleteReply, error) { + out := new(AvfDeleteReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} -- cgit 1.2.3-korg