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/arp/arp.ba.go | 364 ++++++++++++++++++++++++++++++++++++++++++++++ binapi/arp/arp_rest.ba.go | 60 ++++++++ binapi/arp/arp_rpc.ba.go | 123 ++++++++++++++++ 3 files changed, 547 insertions(+) create mode 100644 binapi/arp/arp.ba.go create mode 100644 binapi/arp/arp_rest.ba.go create mode 100644 binapi/arp/arp_rpc.ba.go (limited to 'binapi/arp') diff --git a/binapi/arp/arp.ba.go b/binapi/arp/arp.ba.go new file mode 100644 index 0000000..deb5180 --- /dev/null +++ b/binapi/arp/arp.ba.go @@ -0,0 +1,364 @@ +// 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/arp.api.json + +// Package arp contains generated bindings for API file arp.api. +// +// Contents: +// 1 struct +// 8 messages +// +package arp + +import ( + api "git.fd.io/govpp.git/api" + _ "git.fd.io/govpp.git/binapi/ethernet_types" + interface_types "git.fd.io/govpp.git/binapi/interface_types" + ip_types "git.fd.io/govpp.git/binapi/ip_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 = "arp" + APIVersion = "1.0.0" + VersionCrc = 0x79ca86f2 +) + +// ProxyArp defines type 'proxy_arp'. +type ProxyArp struct { + TableID uint32 `binapi:"u32,name=table_id" json:"table_id,omitempty"` + Low ip_types.IP4Address `binapi:"ip4_address,name=low" json:"low,omitempty"` + Hi ip_types.IP4Address `binapi:"ip4_address,name=hi" json:"hi,omitempty"` +} + +// ProxyArpAddDel defines message 'proxy_arp_add_del'. +type ProxyArpAddDel struct { + IsAdd bool `binapi:"bool,name=is_add" json:"is_add,omitempty"` + Proxy ProxyArp `binapi:"proxy_arp,name=proxy" json:"proxy,omitempty"` +} + +func (m *ProxyArpAddDel) Reset() { *m = ProxyArpAddDel{} } +func (*ProxyArpAddDel) GetMessageName() string { return "proxy_arp_add_del" } +func (*ProxyArpAddDel) GetCrcString() string { return "85486cbd" } +func (*ProxyArpAddDel) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *ProxyArpAddDel) Size() int { + if m == nil { + return 0 + } + var size int + size += 1 // m.IsAdd + size += 4 // m.Proxy.TableID + size += 1 * 4 // m.Proxy.Low + size += 1 * 4 // m.Proxy.Hi + return size +} +func (m *ProxyArpAddDel) 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.EncodeBool(m.IsAdd) + buf.EncodeUint32(uint32(m.Proxy.TableID)) + buf.EncodeBytes(m.Proxy.Low[:], 4) + buf.EncodeBytes(m.Proxy.Hi[:], 4) + return buf.Bytes(), nil +} +func (m *ProxyArpAddDel) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.IsAdd = buf.DecodeBool() + m.Proxy.TableID = buf.DecodeUint32() + copy(m.Proxy.Low[:], buf.DecodeBytes(4)) + copy(m.Proxy.Hi[:], buf.DecodeBytes(4)) + return nil +} + +// ProxyArpAddDelReply defines message 'proxy_arp_add_del_reply'. +type ProxyArpAddDelReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *ProxyArpAddDelReply) Reset() { *m = ProxyArpAddDelReply{} } +func (*ProxyArpAddDelReply) GetMessageName() string { return "proxy_arp_add_del_reply" } +func (*ProxyArpAddDelReply) GetCrcString() string { return "e8d4e804" } +func (*ProxyArpAddDelReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *ProxyArpAddDelReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *ProxyArpAddDelReply) 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 *ProxyArpAddDelReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +// ProxyArpDetails defines message 'proxy_arp_details'. +type ProxyArpDetails struct { + Proxy ProxyArp `binapi:"proxy_arp,name=proxy" json:"proxy,omitempty"` +} + +func (m *ProxyArpDetails) Reset() { *m = ProxyArpDetails{} } +func (*ProxyArpDetails) GetMessageName() string { return "proxy_arp_details" } +func (*ProxyArpDetails) GetCrcString() string { return "9228c150" } +func (*ProxyArpDetails) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *ProxyArpDetails) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Proxy.TableID + size += 1 * 4 // m.Proxy.Low + size += 1 * 4 // m.Proxy.Hi + return size +} +func (m *ProxyArpDetails) 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.Proxy.TableID)) + buf.EncodeBytes(m.Proxy.Low[:], 4) + buf.EncodeBytes(m.Proxy.Hi[:], 4) + return buf.Bytes(), nil +} +func (m *ProxyArpDetails) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Proxy.TableID = buf.DecodeUint32() + copy(m.Proxy.Low[:], buf.DecodeBytes(4)) + copy(m.Proxy.Hi[:], buf.DecodeBytes(4)) + return nil +} + +// ProxyArpDump defines message 'proxy_arp_dump'. +type ProxyArpDump struct{} + +func (m *ProxyArpDump) Reset() { *m = ProxyArpDump{} } +func (*ProxyArpDump) GetMessageName() string { return "proxy_arp_dump" } +func (*ProxyArpDump) GetCrcString() string { return "51077d14" } +func (*ProxyArpDump) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *ProxyArpDump) Size() int { + if m == nil { + return 0 + } + var size int + return size +} +func (m *ProxyArpDump) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + return buf.Bytes(), nil +} +func (m *ProxyArpDump) Unmarshal(b []byte) error { + return nil +} + +// ProxyArpIntfcDetails defines message 'proxy_arp_intfc_details'. +type ProxyArpIntfcDetails struct { + SwIfIndex uint32 `binapi:"u32,name=sw_if_index" json:"sw_if_index,omitempty"` +} + +func (m *ProxyArpIntfcDetails) Reset() { *m = ProxyArpIntfcDetails{} } +func (*ProxyArpIntfcDetails) GetMessageName() string { return "proxy_arp_intfc_details" } +func (*ProxyArpIntfcDetails) GetCrcString() string { return "f6458e5f" } +func (*ProxyArpIntfcDetails) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *ProxyArpIntfcDetails) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.SwIfIndex + return size +} +func (m *ProxyArpIntfcDetails) 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 *ProxyArpIntfcDetails) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = buf.DecodeUint32() + return nil +} + +// ProxyArpIntfcDump defines message 'proxy_arp_intfc_dump'. +type ProxyArpIntfcDump struct{} + +func (m *ProxyArpIntfcDump) Reset() { *m = ProxyArpIntfcDump{} } +func (*ProxyArpIntfcDump) GetMessageName() string { return "proxy_arp_intfc_dump" } +func (*ProxyArpIntfcDump) GetCrcString() string { return "51077d14" } +func (*ProxyArpIntfcDump) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *ProxyArpIntfcDump) Size() int { + if m == nil { + return 0 + } + var size int + return size +} +func (m *ProxyArpIntfcDump) Marshal(b []byte) ([]byte, error) { + var buf *codec.Buffer + if b == nil { + buf = codec.NewBuffer(make([]byte, m.Size())) + } else { + buf = codec.NewBuffer(b) + } + return buf.Bytes(), nil +} +func (m *ProxyArpIntfcDump) Unmarshal(b []byte) error { + return nil +} + +// ProxyArpIntfcEnableDisable defines message 'proxy_arp_intfc_enable_disable'. +type ProxyArpIntfcEnableDisable 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"` +} + +func (m *ProxyArpIntfcEnableDisable) Reset() { *m = ProxyArpIntfcEnableDisable{} } +func (*ProxyArpIntfcEnableDisable) GetMessageName() string { return "proxy_arp_intfc_enable_disable" } +func (*ProxyArpIntfcEnableDisable) GetCrcString() string { return "ae6cfcfb" } +func (*ProxyArpIntfcEnableDisable) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *ProxyArpIntfcEnableDisable) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.SwIfIndex + size += 1 // m.Enable + return size +} +func (m *ProxyArpIntfcEnableDisable) 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) + return buf.Bytes(), nil +} +func (m *ProxyArpIntfcEnableDisable) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + m.Enable = buf.DecodeBool() + return nil +} + +// ProxyArpIntfcEnableDisableReply defines message 'proxy_arp_intfc_enable_disable_reply'. +type ProxyArpIntfcEnableDisableReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *ProxyArpIntfcEnableDisableReply) Reset() { *m = ProxyArpIntfcEnableDisableReply{} } +func (*ProxyArpIntfcEnableDisableReply) GetMessageName() string { + return "proxy_arp_intfc_enable_disable_reply" +} +func (*ProxyArpIntfcEnableDisableReply) GetCrcString() string { return "e8d4e804" } +func (*ProxyArpIntfcEnableDisableReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *ProxyArpIntfcEnableDisableReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *ProxyArpIntfcEnableDisableReply) 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 *ProxyArpIntfcEnableDisableReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +func init() { file_arp_binapi_init() } +func file_arp_binapi_init() { + api.RegisterMessage((*ProxyArpAddDel)(nil), "proxy_arp_add_del_85486cbd") + api.RegisterMessage((*ProxyArpAddDelReply)(nil), "proxy_arp_add_del_reply_e8d4e804") + api.RegisterMessage((*ProxyArpDetails)(nil), "proxy_arp_details_9228c150") + api.RegisterMessage((*ProxyArpDump)(nil), "proxy_arp_dump_51077d14") + api.RegisterMessage((*ProxyArpIntfcDetails)(nil), "proxy_arp_intfc_details_f6458e5f") + api.RegisterMessage((*ProxyArpIntfcDump)(nil), "proxy_arp_intfc_dump_51077d14") + api.RegisterMessage((*ProxyArpIntfcEnableDisable)(nil), "proxy_arp_intfc_enable_disable_ae6cfcfb") + api.RegisterMessage((*ProxyArpIntfcEnableDisableReply)(nil), "proxy_arp_intfc_enable_disable_reply_e8d4e804") +} + +// Messages returns list of all messages in this module. +func AllMessages() []api.Message { + return []api.Message{ + (*ProxyArpAddDel)(nil), + (*ProxyArpAddDelReply)(nil), + (*ProxyArpDetails)(nil), + (*ProxyArpDump)(nil), + (*ProxyArpIntfcDetails)(nil), + (*ProxyArpIntfcDump)(nil), + (*ProxyArpIntfcEnableDisable)(nil), + (*ProxyArpIntfcEnableDisableReply)(nil), + } +} diff --git a/binapi/arp/arp_rest.ba.go b/binapi/arp/arp_rest.ba.go new file mode 100644 index 0000000..71a07d9 --- /dev/null +++ b/binapi/arp/arp_rest.ba.go @@ -0,0 +1,60 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package arp + +import ( + "encoding/json" + "io/ioutil" + "net/http" +) + +func RESTHandler(rpc RPCService) http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/proxy_arp_add_del", func(w http.ResponseWriter, req *http.Request) { + var request = new(ProxyArpAddDel) + 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.ProxyArpAddDel(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("/proxy_arp_intfc_enable_disable", func(w http.ResponseWriter, req *http.Request) { + var request = new(ProxyArpIntfcEnableDisable) + 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.ProxyArpIntfcEnableDisable(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/arp/arp_rpc.ba.go b/binapi/arp/arp_rpc.ba.go new file mode 100644 index 0000000..8ccfa75 --- /dev/null +++ b/binapi/arp/arp_rpc.ba.go @@ -0,0 +1,123 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package arp + +import ( + "context" + "fmt" + api "git.fd.io/govpp.git/api" + vpe "git.fd.io/govpp.git/binapi/vpe" + "io" +) + +// RPCService defines RPC service arp. +type RPCService interface { + ProxyArpAddDel(ctx context.Context, in *ProxyArpAddDel) (*ProxyArpAddDelReply, error) + ProxyArpDump(ctx context.Context, in *ProxyArpDump) (RPCService_ProxyArpDumpClient, error) + ProxyArpIntfcDump(ctx context.Context, in *ProxyArpIntfcDump) (RPCService_ProxyArpIntfcDumpClient, error) + ProxyArpIntfcEnableDisable(ctx context.Context, in *ProxyArpIntfcEnableDisable) (*ProxyArpIntfcEnableDisableReply, error) +} + +type serviceClient struct { + conn api.Connection +} + +func NewServiceClient(conn api.Connection) RPCService { + return &serviceClient{conn} +} + +func (c *serviceClient) ProxyArpAddDel(ctx context.Context, in *ProxyArpAddDel) (*ProxyArpAddDelReply, error) { + out := new(ProxyArpAddDelReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *serviceClient) ProxyArpDump(ctx context.Context, in *ProxyArpDump) (RPCService_ProxyArpDumpClient, error) { + stream, err := c.conn.NewStream(ctx) + if err != nil { + return nil, err + } + x := &serviceClient_ProxyArpDumpClient{stream} + if err := x.Stream.SendMsg(in); err != nil { + return nil, err + } + if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + return nil, err + } + return x, nil +} + +type RPCService_ProxyArpDumpClient interface { + Recv() (*ProxyArpDetails, error) + api.Stream +} + +type serviceClient_ProxyArpDumpClient struct { + api.Stream +} + +func (c *serviceClient_ProxyArpDumpClient) Recv() (*ProxyArpDetails, error) { + msg, err := c.Stream.RecvMsg() + if err != nil { + return nil, err + } + switch m := msg.(type) { + case *ProxyArpDetails: + return m, nil + case *vpe.ControlPingReply: + return nil, io.EOF + default: + return nil, fmt.Errorf("unexpected message: %T %v", m, m) + } +} + +func (c *serviceClient) ProxyArpIntfcDump(ctx context.Context, in *ProxyArpIntfcDump) (RPCService_ProxyArpIntfcDumpClient, error) { + stream, err := c.conn.NewStream(ctx) + if err != nil { + return nil, err + } + x := &serviceClient_ProxyArpIntfcDumpClient{stream} + if err := x.Stream.SendMsg(in); err != nil { + return nil, err + } + if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + return nil, err + } + return x, nil +} + +type RPCService_ProxyArpIntfcDumpClient interface { + Recv() (*ProxyArpIntfcDetails, error) + api.Stream +} + +type serviceClient_ProxyArpIntfcDumpClient struct { + api.Stream +} + +func (c *serviceClient_ProxyArpIntfcDumpClient) Recv() (*ProxyArpIntfcDetails, error) { + msg, err := c.Stream.RecvMsg() + if err != nil { + return nil, err + } + switch m := msg.(type) { + case *ProxyArpIntfcDetails: + return m, nil + case *vpe.ControlPingReply: + return nil, io.EOF + default: + return nil, fmt.Errorf("unexpected message: %T %v", m, m) + } +} + +func (c *serviceClient) ProxyArpIntfcEnableDisable(ctx context.Context, in *ProxyArpIntfcEnableDisable) (*ProxyArpIntfcEnableDisableReply, error) { + out := new(ProxyArpIntfcEnableDisableReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} -- cgit 1.2.3-korg