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/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go | 222 +++++++++++++++++++++ .../dhcp6_pd_client_cp_rest.ba.go | 60 ++++++ .../dhcp6_pd_client_cp_rpc.ba.go | 40 ++++ 3 files changed, 322 insertions(+) create mode 100644 binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go create mode 100644 binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rest.ba.go create mode 100644 binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rpc.ba.go (limited to 'binapi/dhcp6_pd_client_cp') diff --git a/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go new file mode 100644 index 0000000..73e7fad --- /dev/null +++ b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp.ba.go @@ -0,0 +1,222 @@ +// 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/dhcp6_pd_client_cp.api.json + +// Package dhcp6_pd_client_cp contains generated bindings for API file dhcp6_pd_client_cp.api. +// +// Contents: +// 4 messages +// +package dhcp6_pd_client_cp + +import ( + api "git.fd.io/govpp.git/api" + 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 = "dhcp6_pd_client_cp" + APIVersion = "2.0.0" + VersionCrc = 0x96f41948 +) + +// DHCP6PdClientEnableDisable defines message 'dhcp6_pd_client_enable_disable'. +type DHCP6PdClientEnableDisable struct { + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` + PrefixGroup string `binapi:"string[64],name=prefix_group" json:"prefix_group,omitempty"` + Enable bool `binapi:"bool,name=enable" json:"enable,omitempty"` +} + +func (m *DHCP6PdClientEnableDisable) Reset() { *m = DHCP6PdClientEnableDisable{} } +func (*DHCP6PdClientEnableDisable) GetMessageName() string { return "dhcp6_pd_client_enable_disable" } +func (*DHCP6PdClientEnableDisable) GetCrcString() string { return "a75a0772" } +func (*DHCP6PdClientEnableDisable) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *DHCP6PdClientEnableDisable) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.SwIfIndex + size += 64 // m.PrefixGroup + size += 1 // m.Enable + return size +} +func (m *DHCP6PdClientEnableDisable) 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.EncodeString(m.PrefixGroup, 64) + buf.EncodeBool(m.Enable) + return buf.Bytes(), nil +} +func (m *DHCP6PdClientEnableDisable) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + m.PrefixGroup = buf.DecodeString(64) + m.Enable = buf.DecodeBool() + return nil +} + +// DHCP6PdClientEnableDisableReply defines message 'dhcp6_pd_client_enable_disable_reply'. +type DHCP6PdClientEnableDisableReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *DHCP6PdClientEnableDisableReply) Reset() { *m = DHCP6PdClientEnableDisableReply{} } +func (*DHCP6PdClientEnableDisableReply) GetMessageName() string { + return "dhcp6_pd_client_enable_disable_reply" +} +func (*DHCP6PdClientEnableDisableReply) GetCrcString() string { return "e8d4e804" } +func (*DHCP6PdClientEnableDisableReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *DHCP6PdClientEnableDisableReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *DHCP6PdClientEnableDisableReply) 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 *DHCP6PdClientEnableDisableReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +// IP6AddDelAddressUsingPrefix defines message 'ip6_add_del_address_using_prefix'. +type IP6AddDelAddressUsingPrefix struct { + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` + PrefixGroup string `binapi:"string[64],name=prefix_group" json:"prefix_group,omitempty"` + AddressWithPrefix ip_types.IP6AddressWithPrefix `binapi:"ip6_address_with_prefix,name=address_with_prefix" json:"address_with_prefix,omitempty"` + IsAdd bool `binapi:"bool,name=is_add" json:"is_add,omitempty"` +} + +func (m *IP6AddDelAddressUsingPrefix) Reset() { *m = IP6AddDelAddressUsingPrefix{} } +func (*IP6AddDelAddressUsingPrefix) GetMessageName() string { + return "ip6_add_del_address_using_prefix" +} +func (*IP6AddDelAddressUsingPrefix) GetCrcString() string { return "9b3d11e0" } +func (*IP6AddDelAddressUsingPrefix) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *IP6AddDelAddressUsingPrefix) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.SwIfIndex + size += 64 // m.PrefixGroup + size += 1 * 16 // m.AddressWithPrefix.Address + size += 1 // m.AddressWithPrefix.Len + size += 1 // m.IsAdd + return size +} +func (m *IP6AddDelAddressUsingPrefix) 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.EncodeString(m.PrefixGroup, 64) + buf.EncodeBytes(m.AddressWithPrefix.Address[:], 16) + buf.EncodeUint8(uint8(m.AddressWithPrefix.Len)) + buf.EncodeBool(m.IsAdd) + return buf.Bytes(), nil +} +func (m *IP6AddDelAddressUsingPrefix) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + m.PrefixGroup = buf.DecodeString(64) + copy(m.AddressWithPrefix.Address[:], buf.DecodeBytes(16)) + m.AddressWithPrefix.Len = buf.DecodeUint8() + m.IsAdd = buf.DecodeBool() + return nil +} + +// IP6AddDelAddressUsingPrefixReply defines message 'ip6_add_del_address_using_prefix_reply'. +type IP6AddDelAddressUsingPrefixReply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` +} + +func (m *IP6AddDelAddressUsingPrefixReply) Reset() { *m = IP6AddDelAddressUsingPrefixReply{} } +func (*IP6AddDelAddressUsingPrefixReply) GetMessageName() string { + return "ip6_add_del_address_using_prefix_reply" +} +func (*IP6AddDelAddressUsingPrefixReply) GetCrcString() string { return "e8d4e804" } +func (*IP6AddDelAddressUsingPrefixReply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *IP6AddDelAddressUsingPrefixReply) Size() int { + if m == nil { + return 0 + } + var size int + size += 4 // m.Retval + return size +} +func (m *IP6AddDelAddressUsingPrefixReply) 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 *IP6AddDelAddressUsingPrefixReply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = int32(buf.DecodeUint32()) + return nil +} + +func init() { file_dhcp6_pd_client_cp_binapi_init() } +func file_dhcp6_pd_client_cp_binapi_init() { + api.RegisterMessage((*DHCP6PdClientEnableDisable)(nil), "dhcp6_pd_client_enable_disable_a75a0772") + api.RegisterMessage((*DHCP6PdClientEnableDisableReply)(nil), "dhcp6_pd_client_enable_disable_reply_e8d4e804") + api.RegisterMessage((*IP6AddDelAddressUsingPrefix)(nil), "ip6_add_del_address_using_prefix_9b3d11e0") + api.RegisterMessage((*IP6AddDelAddressUsingPrefixReply)(nil), "ip6_add_del_address_using_prefix_reply_e8d4e804") +} + +// Messages returns list of all messages in this module. +func AllMessages() []api.Message { + return []api.Message{ + (*DHCP6PdClientEnableDisable)(nil), + (*DHCP6PdClientEnableDisableReply)(nil), + (*IP6AddDelAddressUsingPrefix)(nil), + (*IP6AddDelAddressUsingPrefixReply)(nil), + } +} diff --git a/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rest.ba.go b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rest.ba.go new file mode 100644 index 0000000..fa76aa8 --- /dev/null +++ b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rest.ba.go @@ -0,0 +1,60 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package dhcp6_pd_client_cp + +import ( + "encoding/json" + "io/ioutil" + "net/http" +) + +func RESTHandler(rpc RPCService) http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/dhcp6_pd_client_enable_disable", func(w http.ResponseWriter, req *http.Request) { + var request = new(DHCP6PdClientEnableDisable) + 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.DHCP6PdClientEnableDisable(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("/ip6_add_del_address_using_prefix", func(w http.ResponseWriter, req *http.Request) { + var request = new(IP6AddDelAddressUsingPrefix) + 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.IP6AddDelAddressUsingPrefix(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/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rpc.ba.go b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rpc.ba.go new file mode 100644 index 0000000..7199e5a --- /dev/null +++ b/binapi/dhcp6_pd_client_cp/dhcp6_pd_client_cp_rpc.ba.go @@ -0,0 +1,40 @@ +// Code generated by GoVPP's binapi-generator. DO NOT EDIT. + +package dhcp6_pd_client_cp + +import ( + "context" + api "git.fd.io/govpp.git/api" +) + +// RPCService defines RPC service dhcp6_pd_client_cp. +type RPCService interface { + DHCP6PdClientEnableDisable(ctx context.Context, in *DHCP6PdClientEnableDisable) (*DHCP6PdClientEnableDisableReply, error) + IP6AddDelAddressUsingPrefix(ctx context.Context, in *IP6AddDelAddressUsingPrefix) (*IP6AddDelAddressUsingPrefixReply, error) +} + +type serviceClient struct { + conn api.Connection +} + +func NewServiceClient(conn api.Connection) RPCService { + return &serviceClient{conn} +} + +func (c *serviceClient) DHCP6PdClientEnableDisable(ctx context.Context, in *DHCP6PdClientEnableDisable) (*DHCP6PdClientEnableDisableReply, error) { + out := new(DHCP6PdClientEnableDisableReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *serviceClient) IP6AddDelAddressUsingPrefix(ctx context.Context, in *IP6AddDelAddressUsingPrefix) (*IP6AddDelAddressUsingPrefixReply, error) { + out := new(IP6AddDelAddressUsingPrefixReply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, nil +} -- cgit 1.2.3-korg