From 4102c72bce694babd94a481b1201d33895a6f9c5 Mon Sep 17 00:00:00 2001
From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Date: Wed, 27 Apr 2022 18:39:03 +0200
Subject: Update generated binapi to v22.02 & makefile changes

This patch does some small updates to the Makefile.
* `make gen-binapi-from-code` is removed, and moves to
`gen-binapi-local`
* `make build` is patched to build cmd & examples
* `make binapi-generator` to build the api-generator
without other binaries, as they typically require its
output to build.
* `make gen-binapi-local` runs the locally built binapi-generator
to update the local bindings. It expects ${VPP_DIR} to be set and
to point to a local vpp repository checked out with the right version
* `make gen-binapi-internal` runs the locally built binapi-generator
to update the bindings in `internal/testbinapi/binapi2001`

Regarding VPP, notable changes when moving to v22.02 are :
- ControlPing moved from vpe to memclnt
- CliInband went from vpe to vlib

Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Change-Id: Ie5cd2d5ded7ecaffd9abc3ca675df40be272b1fa
---
 binapi/l2e/l2e.ba.go | 116 ---------------------------------------------------
 1 file changed, 116 deletions(-)
 delete mode 100644 binapi/l2e/l2e.ba.go

(limited to 'binapi/l2e/l2e.ba.go')

diff --git a/binapi/l2e/l2e.ba.go b/binapi/l2e/l2e.ba.go
deleted file mode 100644
index 12a429b..0000000
--- a/binapi/l2e/l2e.ba.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-// versions:
-//  binapi-generator: v0.5.0-dev
-//  VPP:              21.06-release
-// source: /usr/share/vpp/api/plugins/l2e.api.json
-
-// Package l2e contains generated bindings for API file l2e.api.
-//
-// Contents:
-//   2 messages
-//
-package l2e
-
-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    = "l2e"
-	APIVersion = "1.0.0"
-	VersionCrc = 0x6e8abdfb
-)
-
-// L2Emulation defines message 'l2_emulation'.
-// InProgress: the message form may change in the future versions
-type L2Emulation 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 *L2Emulation) Reset()               { *m = L2Emulation{} }
-func (*L2Emulation) GetMessageName() string { return "l2_emulation" }
-func (*L2Emulation) GetCrcString() string   { return "ae6cfcfb" }
-func (*L2Emulation) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
-
-func (m *L2Emulation) Size() (size int) {
-	if m == nil {
-		return 0
-	}
-	size += 4 // m.SwIfIndex
-	size += 1 // m.Enable
-	return size
-}
-func (m *L2Emulation) Marshal(b []byte) ([]byte, error) {
-	if b == nil {
-		b = make([]byte, m.Size())
-	}
-	buf := codec.NewBuffer(b)
-	buf.EncodeUint32(uint32(m.SwIfIndex))
-	buf.EncodeBool(m.Enable)
-	return buf.Bytes(), nil
-}
-func (m *L2Emulation) Unmarshal(b []byte) error {
-	buf := codec.NewBuffer(b)
-	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
-	m.Enable = buf.DecodeBool()
-	return nil
-}
-
-// L2EmulationReply defines message 'l2_emulation_reply'.
-// InProgress: the message form may change in the future versions
-type L2EmulationReply struct {
-	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
-}
-
-func (m *L2EmulationReply) Reset()               { *m = L2EmulationReply{} }
-func (*L2EmulationReply) GetMessageName() string { return "l2_emulation_reply" }
-func (*L2EmulationReply) GetCrcString() string   { return "e8d4e804" }
-func (*L2EmulationReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
-
-func (m *L2EmulationReply) Size() (size int) {
-	if m == nil {
-		return 0
-	}
-	size += 4 // m.Retval
-	return size
-}
-func (m *L2EmulationReply) Marshal(b []byte) ([]byte, error) {
-	if b == nil {
-		b = make([]byte, m.Size())
-	}
-	buf := codec.NewBuffer(b)
-	buf.EncodeInt32(m.Retval)
-	return buf.Bytes(), nil
-}
-func (m *L2EmulationReply) Unmarshal(b []byte) error {
-	buf := codec.NewBuffer(b)
-	m.Retval = buf.DecodeInt32()
-	return nil
-}
-
-func init() { file_l2e_binapi_init() }
-func file_l2e_binapi_init() {
-	api.RegisterMessage((*L2Emulation)(nil), "l2_emulation_ae6cfcfb")
-	api.RegisterMessage((*L2EmulationReply)(nil), "l2_emulation_reply_e8d4e804")
-}
-
-// Messages returns list of all messages in this module.
-func AllMessages() []api.Message {
-	return []api.Message{
-		(*L2Emulation)(nil),
-		(*L2EmulationReply)(nil),
-	}
-}
-- 
cgit 1.2.3-korg