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/feature/feature.ba.go | 128 ++++++++++++++++++++++++++++++++++++++ binapi/feature/feature_rest.ba.go | 37 +++++++++++ binapi/feature/feature_rpc.ba.go | 30 +++++++++ 3 files changed, 195 insertions(+) create mode 100644 binapi/feature/feature.ba.go create mode 100644 binapi/feature/feature_rest.ba.go create mode 100644 binapi/feature/feature_rpc.ba.go (limited to 'binapi/feature') diff --git a/binapi/feature/feature.ba.go b/binapi/feature/feature.ba.go new file mode 100644 index 0000000..4d16ce8 --- /dev/null +++ b/binapi/feature/feature.ba.go @@ -0,0 +1,128 @@ +// 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/core/feature.api.json + +// Package feature contains generated bindings for API file feature.api. +// +// Contents: +// 2 messages +// +package feature + +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 = "feature" + APIVersion = "1.0.2" + VersionCrc = 0x8dd9f8ab +) + +// FeatureEnableDisable defines message 'feature_enable_disable'. +type FeatureEnableDisable struct { + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` + Enable bool `binapi:"bool,name=enable" json:"enable,omitempty"` + ArcName string `binapi:"string[64],name=arc_name" json:"arc_name,omitempty"` + FeatureName string `binapi:"string[64],name=feature_name" json:"feature_name,omitempty"` +} + +func (m *FeatureEnableDisable) Reset() { *m = FeatureEnableDisable{} } +func (*FeatureEnableDisable) GetMessageName() string { return "feature_enable_disable" } +func (*FeatureEnableDisable) GetCrcString() string { return "7531c862" } +func (*FeatureEnableDisable) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *FeatureEnableDisable) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.SwIfIndex + size += 1 // m.Enable + size += 64 // m.ArcName + size += 64 // m.FeatureName + return size +} +func (m *FeatureEnableDisable) 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)) + buf.EncodeBool(m.Enable) + buf.EncodeString(m.ArcName, 64) + buf.EncodeString(m.FeatureName, 64) + return buf.Bytes(), nil +} +func (m *FeatureEnableDisable) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + m.Enable = buf.DecodeBool() + m.ArcName = buf.DecodeString(64) + m.FeatureName = buf.DecodeString(64) + return nil +} + +// FeatureEnableDisableReply defines message 'feature_enable_disable_reply'. +type FeatureEnableDisableReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *FeatureEnableDisableReply) Reset() { *m = FeatureEnableDisableReply{} } +func (*FeatureEnableDisableReply) GetMessageName() string { return "feature_enable_disable_reply" } +func (*FeatureEnableDisableReply) GetCrcString() string { return "e8d4e804" } +func (*FeatureEnableDisableReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *FeatureEnableDisableReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *FeatureEnableDisableReply) 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 *FeatureEnableDisableReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +func init() { file_feature_binapi_init() } +func file_feature_binapi_init() { + api.RegisterMessage((*FeatureEnableDisable)(nil), "feature_enable_disable_7531c862") + api.RegisterMessage((*FeatureEnableDisableReply)(nil), "feature_enable_disable_reply_e8d4e804") +} + +// Messages returns list of all messages in this module. +func AllMessages() []api.Message { + return []api.Message{ + (*FeatureEnableDisable)(nil), + (*FeatureEnableDisableReply)(nil), + } +} diff --git a/binapi/feature/feature_rest.ba.go b/binapi/feature/feature_rest.ba.go new file mode 100644 index 0000000..a1b0604 --- /dev/null +++ b/binapi/feature/feature_rest.ba.go @@ -0,0 +1,37 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package feature + +import ( + "encoding/json" + "io/ioutil" + "net/http" +) + +func RESTHandler(rpc RPCService) http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/feature_enable_disable", func(w http.ResponseWriter, req *http.Request) { + var request = new(FeatureEnableDisable) + 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.FeatureEnableDisable(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/feature/feature_rpc.ba.go b/binapi/feature/feature_rpc.ba.go new file mode 100644 index 0000000..cd91188 --- /dev/null +++ b/binapi/feature/feature_rpc.ba.go @@ -0,0 +1,30 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package feature + +import ( + "context" + api "git.fd.io/govpp.git/api" +) + +// RPCService defines RPC service feature. +type RPCService interface { + FeatureEnableDisable(ctx context.Context, in *FeatureEnableDisable) (*FeatureEnableDisableReply, error) +} + +type serviceClient struct { + conn api.Connection +} + +func NewServiceClient(conn api.Connection) RPCService { + return &serviceClient{conn} +} + +func (c *serviceClient) FeatureEnableDisable(ctx context.Context, in *FeatureEnableDisable) (*FeatureEnableDisableReply, error) { + out := new(FeatureEnableDisableReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} -- cgit 1.2.3-korg