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 <ofabry@cisco.com>

3 files changed, 469 insertions, 0 deletions

diff --git a/binapi/virtio/virtio.ba.go b/binapi/virtio/virtio.ba.go
new file mode 100644
index 0000000..467cc0f
--- /dev/null
+++ b/binapi/virtio/virtio.ba.go
@@ -0,0 +1,326 @@
+// 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/virtio.api.json
+
+// Package virtio contains generated bindings for API file virtio.api.
+//
+// Contents:
+//   6 messages
+//
+package virtio
+
+import (
+	api "git.fd.io/govpp.git/api"
+	ethernet_types "git.fd.io/govpp.git/binapi/ethernet_types"
+	interface_types "git.fd.io/govpp.git/binapi/interface_types"
+	pci_types "git.fd.io/govpp.git/binapi/pci_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    = "virtio"
+	APIVersion = "2.0.0"
+	VersionCrc = 0x601b1fdc
+)
+
+// SwInterfaceVirtioPciDetails defines message 'sw_interface_virtio_pci_details'.
+type SwInterfaceVirtioPciDetails struct {
+	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
+	PciAddr   pci_types.PciAddress           `binapi:"pci_address,name=pci_addr" json:"pci_addr,omitempty"`
+	MacAddr   ethernet_types.MacAddress      `binapi:"mac_address,name=mac_addr" json:"mac_addr,omitempty"`
+	TxRingSz  uint16                         `binapi:"u16,name=tx_ring_sz" json:"tx_ring_sz,omitempty"`
+	RxRingSz  uint16                         `binapi:"u16,name=rx_ring_sz" json:"rx_ring_sz,omitempty"`
+	Features  uint64                         `binapi:"u64,name=features" json:"features,omitempty"`
+}
+
+func (m *SwInterfaceVirtioPciDetails) Reset()               { *m = SwInterfaceVirtioPciDetails{} }
+func (*SwInterfaceVirtioPciDetails) GetMessageName() string { return "sw_interface_virtio_pci_details" }
+func (*SwInterfaceVirtioPciDetails) GetCrcString() string   { return "16187f3a" }
+func (*SwInterfaceVirtioPciDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *SwInterfaceVirtioPciDetails) Size() int {
+	if m == nil {
+		return 0
+	}
+	var size int
+	size += 4     // m.SwIfIndex
+	size += 2     // m.PciAddr.Domain
+	size += 1     // m.PciAddr.Bus
+	size += 1     // m.PciAddr.Slot
+	size += 1     // m.PciAddr.Function
+	size += 1 * 6 // m.MacAddr
+	size += 2     // m.TxRingSz
+	size += 2     // m.RxRingSz
+	size += 8     // m.Features
+	return size
+}
+func (m *SwInterfaceVirtioPciDetails) 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.EncodeUint16(uint16(m.PciAddr.Domain))
+	buf.EncodeUint8(uint8(m.PciAddr.Bus))
+	buf.EncodeUint8(uint8(m.PciAddr.Slot))
+	buf.EncodeUint8(uint8(m.PciAddr.Function))
+	buf.EncodeBytes(m.MacAddr[:], 6)
+	buf.EncodeUint16(uint16(m.TxRingSz))
+	buf.EncodeUint16(uint16(m.RxRingSz))
+	buf.EncodeUint64(uint64(m.Features))
+	return buf.Bytes(), nil
+}
+func (m *SwInterfaceVirtioPciDetails) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+	m.PciAddr.Domain = buf.DecodeUint16()
+	m.PciAddr.Bus = buf.DecodeUint8()
+	m.PciAddr.Slot = buf.DecodeUint8()
+	m.PciAddr.Function = buf.DecodeUint8()
+	copy(m.MacAddr[:], buf.DecodeBytes(6))
+	m.TxRingSz = buf.DecodeUint16()
+	m.RxRingSz = buf.DecodeUint16()
+	m.Features = buf.DecodeUint64()
+	return nil
+}
+
+// SwInterfaceVirtioPciDump defines message 'sw_interface_virtio_pci_dump'.
+type SwInterfaceVirtioPciDump struct{}
+
+func (m *SwInterfaceVirtioPciDump) Reset()               { *m = SwInterfaceVirtioPciDump{} }
+func (*SwInterfaceVirtioPciDump) GetMessageName() string { return "sw_interface_virtio_pci_dump" }
+func (*SwInterfaceVirtioPciDump) GetCrcString() string   { return "51077d14" }
+func (*SwInterfaceVirtioPciDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *SwInterfaceVirtioPciDump) Size() int {
+	if m == nil {
+		return 0
+	}
+	var size int
+	return size
+}
+func (m *SwInterfaceVirtioPciDump) 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 *SwInterfaceVirtioPciDump) Unmarshal(b []byte) error {
+	return nil
+}
+
+// VirtioPciCreate defines message 'virtio_pci_create'.
+type VirtioPciCreate struct {
+	PciAddr                pci_types.PciAddress      `binapi:"pci_address,name=pci_addr" json:"pci_addr,omitempty"`
+	UseRandomMac           bool                      `binapi:"bool,name=use_random_mac" json:"use_random_mac,omitempty"`
+	MacAddress             ethernet_types.MacAddress `binapi:"mac_address,name=mac_address" json:"mac_address,omitempty"`
+	GsoEnabled             bool                      `binapi:"bool,name=gso_enabled" json:"gso_enabled,omitempty"`
+	ChecksumOffloadEnabled bool                      `binapi:"bool,name=checksum_offload_enabled" json:"checksum_offload_enabled,omitempty"`
+	Features               uint64                    `binapi:"u64,name=features" json:"features,omitempty"`
+}
+
+func (m *VirtioPciCreate) Reset()               { *m = VirtioPciCreate{} }
+func (*VirtioPciCreate) GetMessageName() string { return "virtio_pci_create" }
+func (*VirtioPciCreate) GetCrcString() string   { return "a9f1370c" }
+func (*VirtioPciCreate) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *VirtioPciCreate) Size() int {
+	if m == nil {
+		return 0
+	}
+	var size int
+	size += 2     // m.PciAddr.Domain
+	size += 1     // m.PciAddr.Bus
+	size += 1     // m.PciAddr.Slot
+	size += 1     // m.PciAddr.Function
+	size += 1     // m.UseRandomMac
+	size += 1 * 6 // m.MacAddress
+	size += 1     // m.GsoEnabled
+	size += 1     // m.ChecksumOffloadEnabled
+	size += 8     // m.Features
+	return size
+}
+func (m *VirtioPciCreate) 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.EncodeUint16(uint16(m.PciAddr.Domain))
+	buf.EncodeUint8(uint8(m.PciAddr.Bus))
+	buf.EncodeUint8(uint8(m.PciAddr.Slot))
+	buf.EncodeUint8(uint8(m.PciAddr.Function))
+	buf.EncodeBool(m.UseRandomMac)
+	buf.EncodeBytes(m.MacAddress[:], 6)
+	buf.EncodeBool(m.GsoEnabled)
+	buf.EncodeBool(m.ChecksumOffloadEnabled)
+	buf.EncodeUint64(uint64(m.Features))
+	return buf.Bytes(), nil
+}
+func (m *VirtioPciCreate) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.PciAddr.Domain = buf.DecodeUint16()
+	m.PciAddr.Bus = buf.DecodeUint8()
+	m.PciAddr.Slot = buf.DecodeUint8()
+	m.PciAddr.Function = buf.DecodeUint8()
+	m.UseRandomMac = buf.DecodeBool()
+	copy(m.MacAddress[:], buf.DecodeBytes(6))
+	m.GsoEnabled = buf.DecodeBool()
+	m.ChecksumOffloadEnabled = buf.DecodeBool()
+	m.Features = buf.DecodeUint64()
+	return nil
+}
+
+// VirtioPciCreateReply defines message 'virtio_pci_create_reply'.
+type VirtioPciCreateReply 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 *VirtioPciCreateReply) Reset()               { *m = VirtioPciCreateReply{} }
+func (*VirtioPciCreateReply) GetMessageName() string { return "virtio_pci_create_reply" }
+func (*VirtioPciCreateReply) GetCrcString() string   { return "5383d31f" }
+func (*VirtioPciCreateReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *VirtioPciCreateReply) Size() int {
+	if m == nil {
+		return 0
+	}
+	var size int
+	size += 4 // m.Retval
+	size += 4 // m.SwIfIndex
+	return size
+}
+func (m *VirtioPciCreateReply) 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 *VirtioPciCreateReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = int32(buf.DecodeUint32())
+	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+	return nil
+}
+
+// VirtioPciDelete defines message 'virtio_pci_delete'.
+type VirtioPciDelete struct {
+	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
+}
+
+func (m *VirtioPciDelete) Reset()               { *m = VirtioPciDelete{} }
+func (*VirtioPciDelete) GetMessageName() string { return "virtio_pci_delete" }
+func (*VirtioPciDelete) GetCrcString() string   { return "f9e6675e" }
+func (*VirtioPciDelete) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *VirtioPciDelete) Size() int {
+	if m == nil {
+		return 0
+	}
+	var size int
+	size += 4 // m.SwIfIndex
+	return size
+}
+func (m *VirtioPciDelete) 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 *VirtioPciDelete) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+	return nil
+}
+
+// VirtioPciDeleteReply defines message 'virtio_pci_delete_reply'.
+type VirtioPciDeleteReply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *VirtioPciDeleteReply) Reset()               { *m = VirtioPciDeleteReply{} }
+func (*VirtioPciDeleteReply) GetMessageName() string { return "virtio_pci_delete_reply" }
+func (*VirtioPciDeleteReply) GetCrcString() string   { return "e8d4e804" }
+func (*VirtioPciDeleteReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *VirtioPciDeleteReply) Size() int {
+	if m == nil {
+		return 0
+	}
+	var size int
+	size += 4 // m.Retval
+	return size
+}
+func (m *VirtioPciDeleteReply) 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 *VirtioPciDeleteReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = int32(buf.DecodeUint32())
+	return nil
+}
+
+func init() { file_virtio_binapi_init() }
+func file_virtio_binapi_init() {
+	api.RegisterMessage((*SwInterfaceVirtioPciDetails)(nil), "sw_interface_virtio_pci_details_16187f3a")
+	api.RegisterMessage((*SwInterfaceVirtioPciDump)(nil), "sw_interface_virtio_pci_dump_51077d14")
+	api.RegisterMessage((*VirtioPciCreate)(nil), "virtio_pci_create_a9f1370c")
+	api.RegisterMessage((*VirtioPciCreateReply)(nil), "virtio_pci_create_reply_5383d31f")
+	api.RegisterMessage((*VirtioPciDelete)(nil), "virtio_pci_delete_f9e6675e")
+	api.RegisterMessage((*VirtioPciDeleteReply)(nil), "virtio_pci_delete_reply_e8d4e804")
+}
+
+// Messages returns list of all messages in this module.
+func AllMessages() []api.Message {
+	return []api.Message{
+		(*SwInterfaceVirtioPciDetails)(nil),
+		(*SwInterfaceVirtioPciDump)(nil),
+		(*VirtioPciCreate)(nil),
+		(*VirtioPciCreateReply)(nil),
+		(*VirtioPciDelete)(nil),
+		(*VirtioPciDeleteReply)(nil),
+	}
+}
diff --git a/binapi/virtio/virtio_rest.ba.go b/binapi/virtio/virtio_rest.ba.go
new file mode 100644
index 0000000..bd97059
--- /dev/null
+++ b/binapi/virtio/virtio_rest.ba.go
@@ -0,0 +1,60 @@
+// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
+
+package virtio
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+)
+
+func RESTHandler(rpc RPCService) http.Handler {
+	mux := http.NewServeMux()
+	mux.HandleFunc("/virtio_pci_create", func(w http.ResponseWriter, req *http.Request) {
+		var request = new(VirtioPciCreate)
+		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.VirtioPciCreate(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("/virtio_pci_delete", func(w http.ResponseWriter, req *http.Request) {
+		var request = new(VirtioPciDelete)
+		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.VirtioPciDelete(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/virtio/virtio_rpc.ba.go b/binapi/virtio/virtio_rpc.ba.go
new file mode 100644
index 0000000..785a460
--- /dev/null
+++ b/binapi/virtio/virtio_rpc.ba.go
@@ -0,0 +1,83 @@
+// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
+
+package virtio
+
+import (
+	"context"
+	"fmt"
+	api "git.fd.io/govpp.git/api"
+	vpe "git.fd.io/govpp.git/binapi/vpe"
+	"io"
+)
+
+// RPCService defines RPC service  virtio.
+type RPCService interface {
+	SwInterfaceVirtioPciDump(ctx context.Context, in *SwInterfaceVirtioPciDump) (RPCService_SwInterfaceVirtioPciDumpClient, error)
+	VirtioPciCreate(ctx context.Context, in *VirtioPciCreate) (*VirtioPciCreateReply, error)
+	VirtioPciDelete(ctx context.Context, in *VirtioPciDelete) (*VirtioPciDeleteReply, error)
+}
+
+type serviceClient struct {
+	conn api.Connection
+}
+
+func NewServiceClient(conn api.Connection) RPCService {
+	return &serviceClient{conn}
+}
+
+func (c *serviceClient) SwInterfaceVirtioPciDump(ctx context.Context, in *SwInterfaceVirtioPciDump) (RPCService_SwInterfaceVirtioPciDumpClient, error) {
+	stream, err := c.conn.NewStream(ctx)
+	if err != nil {
+		return nil, err
+	}
+	x := &serviceClient_SwInterfaceVirtioPciDumpClient{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_SwInterfaceVirtioPciDumpClient interface {
+	Recv() (*SwInterfaceVirtioPciDetails, error)
+	api.Stream
+}
+
+type serviceClient_SwInterfaceVirtioPciDumpClient struct {
+	api.Stream
+}
+
+func (c *serviceClient_SwInterfaceVirtioPciDumpClient) Recv() (*SwInterfaceVirtioPciDetails, error) {
+	msg, err := c.Stream.RecvMsg()
+	if err != nil {
+		return nil, err
+	}
+	switch m := msg.(type) {
+	case *SwInterfaceVirtioPciDetails:
+		return m, nil
+	case *vpe.ControlPingReply:
+		return nil, io.EOF
+	default:
+		return nil, fmt.Errorf("unexpected message: %T %v", m, m)
+	}
+}
+
+func (c *serviceClient) VirtioPciCreate(ctx context.Context, in *VirtioPciCreate) (*VirtioPciCreateReply, error) {
+	out := new(VirtioPciCreateReply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *serviceClient) VirtioPciDelete(ctx context.Context, in *VirtioPciDelete) (*VirtioPciDeleteReply, error) {
+	out := new(VirtioPciDeleteReply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}