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/http_static/http_static.ba.go | 135 ++++++++++++++++++++++++++++++ binapi/http_static/http_static_rest.ba.go | 37 ++++++++ binapi/http_static/http_static_rpc.ba.go | 30 +++++++ 3 files changed, 202 insertions(+) create mode 100644 binapi/http_static/http_static.ba.go create mode 100644 binapi/http_static/http_static_rest.ba.go create mode 100644 binapi/http_static/http_static_rpc.ba.go (limited to 'binapi/http_static') diff --git a/binapi/http_static/http_static.ba.go b/binapi/http_static/http_static.ba.go new file mode 100644 index 0000000..c1338ed --- /dev/null +++ b/binapi/http_static/http_static.ba.go @@ -0,0 +1,135 @@ +// 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/http_static.api.json + +// Package http_static contains generated bindings for API file http_static.api. +// +// Contents: +// 2 messages +// +package http_static + +import ( + api "git.fd.io/govpp.git/api" + 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 = "http_static" + APIVersion = "2.1.0" + VersionCrc = 0xd29e72e9 +) + +// HTTPStaticEnable defines message 'http_static_enable'. +type HTTPStaticEnable struct { + FifoSize uint32 `binapi:"u32,name=fifo_size" json:"fifo_size,omitempty"` + CacheSizeLimit uint32 `binapi:"u32,name=cache_size_limit" json:"cache_size_limit,omitempty"` + PreallocFifos uint32 `binapi:"u32,name=prealloc_fifos" json:"prealloc_fifos,omitempty"` + PrivateSegmentSize uint32 `binapi:"u32,name=private_segment_size" json:"private_segment_size,omitempty"` + WwwRoot string `binapi:"string[256],name=www_root" json:"www_root,omitempty"` + URI string `binapi:"string[256],name=uri" json:"uri,omitempty"` +} + +func (m *HTTPStaticEnable) Reset() { *m = HTTPStaticEnable{} } +func (*HTTPStaticEnable) GetMessageName() string { return "http_static_enable" } +func (*HTTPStaticEnable) GetCrcString() string { return "075f8292" } +func (*HTTPStaticEnable) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *HTTPStaticEnable) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.FifoSize + size += 4 // m.CacheSizeLimit + size += 4 // m.PreallocFifos + size += 4 // m.PrivateSegmentSize + size += 256 // m.WwwRoot + size += 256 // m.URI + return size +} +func (m *HTTPStaticEnable) 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.FifoSize)) + buf.EncodeUint32(uint32(m.CacheSizeLimit)) + buf.EncodeUint32(uint32(m.PreallocFifos)) + buf.EncodeUint32(uint32(m.PrivateSegmentSize)) + buf.EncodeString(m.WwwRoot, 256) + buf.EncodeString(m.URI, 256) + return buf.Bytes(), nil +} +func (m *HTTPStaticEnable) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.FifoSize = buf.DecodeUint32() + m.CacheSizeLimit = buf.DecodeUint32() + m.PreallocFifos = buf.DecodeUint32() + m.PrivateSegmentSize = buf.DecodeUint32() + m.WwwRoot = buf.DecodeString(256) + m.URI = buf.DecodeString(256) + return nil +} + +// HTTPStaticEnableReply defines message 'http_static_enable_reply'. +type HTTPStaticEnableReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *HTTPStaticEnableReply) Reset() { *m = HTTPStaticEnableReply{} } +func (*HTTPStaticEnableReply) GetMessageName() string { return "http_static_enable_reply" } +func (*HTTPStaticEnableReply) GetCrcString() string { return "e8d4e804" } +func (*HTTPStaticEnableReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *HTTPStaticEnableReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *HTTPStaticEnableReply) 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 *HTTPStaticEnableReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +func init() { file_http_static_binapi_init() } +func file_http_static_binapi_init() { + api.RegisterMessage((*HTTPStaticEnable)(nil), "http_static_enable_075f8292") + api.RegisterMessage((*HTTPStaticEnableReply)(nil), "http_static_enable_reply_e8d4e804") +} + +// Messages returns list of all messages in this module. +func AllMessages() []api.Message { + return []api.Message{ + (*HTTPStaticEnable)(nil), + (*HTTPStaticEnableReply)(nil), + } +} diff --git a/binapi/http_static/http_static_rest.ba.go b/binapi/http_static/http_static_rest.ba.go new file mode 100644 index 0000000..f488f5a --- /dev/null +++ b/binapi/http_static/http_static_rest.ba.go @@ -0,0 +1,37 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package http_static + +import ( + "encoding/json" + "io/ioutil" + "net/http" +) + +func RESTHandler(rpc RPCService) http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/http_static_enable", func(w http.ResponseWriter, req *http.Request) { + var request = new(HTTPStaticEnable) + 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.HTTPStaticEnable(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/http_static/http_static_rpc.ba.go b/binapi/http_static/http_static_rpc.ba.go new file mode 100644 index 0000000..415313d --- /dev/null +++ b/binapi/http_static/http_static_rpc.ba.go @@ -0,0 +1,30 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package http_static + +import ( + "context" + api "git.fd.io/govpp.git/api" +) + +// RPCService defines RPC service http_static. +type RPCService interface { + HTTPStaticEnable(ctx context.Context, in *HTTPStaticEnable) (*HTTPStaticEnableReply, error) +} + +type serviceClient struct { + conn api.Connection +} + +func NewServiceClient(conn api.Connection) RPCService { + return &serviceClient{conn} +} + +func (c *serviceClient) HTTPStaticEnable(ctx context.Context, in *HTTPStaticEnable) (*HTTPStaticEnableReply, error) { + out := new(HTTPStaticEnableReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} -- cgit 1.2.3-korg