From 4102c72bce694babd94a481b1201d33895a6f9c5 Mon Sep 17 00:00:00 2001 From: Nathan Skrzypczak 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 Change-Id: Ie5cd2d5ded7ecaffd9abc3ca675df40be272b1fa --- binapi/nat64/nat64.ba.go | 2 +- binapi/nat64/nat64_rpc.ba.go | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'binapi/nat64') diff --git a/binapi/nat64/nat64.ba.go b/binapi/nat64/nat64.ba.go index 9591dc7..f6bc3ce 100644 --- a/binapi/nat64/nat64.ba.go +++ b/binapi/nat64/nat64.ba.go @@ -1,7 +1,7 @@ // Code generated by GoVPP's binapi-generator. DO NOT EDIT. // versions: // binapi-generator: v0.5.0-dev -// VPP: 21.06-release +// VPP: 22.02-release // source: /usr/share/vpp/api/plugins/nat64.api.json // Package nat64 contains generated bindings for API file nat64.api. diff --git a/binapi/nat64/nat64_rpc.ba.go b/binapi/nat64/nat64_rpc.ba.go index baa2ec9..a8fb05e 100644 --- a/binapi/nat64/nat64_rpc.ba.go +++ b/binapi/nat64/nat64_rpc.ba.go @@ -8,7 +8,7 @@ import ( "io" api "git.fd.io/govpp.git/api" - vpe "git.fd.io/govpp.git/binapi/vpe" + memclnt "git.fd.io/govpp.git/binapi/memclnt" ) // RPCService defines RPC service nat64. @@ -90,7 +90,7 @@ func (c *serviceClient) Nat64BibDump(ctx context.Context, in *Nat64BibDump) (RPC if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -113,7 +113,7 @@ func (c *serviceClient_Nat64BibDumpClient) Recv() (*Nat64BibDetails, error) { switch m := msg.(type) { case *Nat64BibDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -142,7 +142,7 @@ func (c *serviceClient) Nat64InterfaceDump(ctx context.Context, in *Nat64Interfa if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -165,7 +165,7 @@ func (c *serviceClient_Nat64InterfaceDumpClient) Recv() (*Nat64InterfaceDetails, switch m := msg.(type) { case *Nat64InterfaceDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -194,7 +194,7 @@ func (c *serviceClient) Nat64PoolAddrDump(ctx context.Context, in *Nat64PoolAddr if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -217,7 +217,7 @@ func (c *serviceClient_Nat64PoolAddrDumpClient) Recv() (*Nat64PoolAddrDetails, e switch m := msg.(type) { case *Nat64PoolAddrDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -237,7 +237,7 @@ func (c *serviceClient) Nat64PrefixDump(ctx context.Context, in *Nat64PrefixDump if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -260,7 +260,7 @@ func (c *serviceClient_Nat64PrefixDumpClient) Recv() (*Nat64PrefixDetails, error switch m := msg.(type) { case *Nat64PrefixDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -289,7 +289,7 @@ func (c *serviceClient) Nat64StDump(ctx context.Context, in *Nat64StDump) (RPCSe if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -312,7 +312,7 @@ func (c *serviceClient_Nat64StDumpClient) Recv() (*Nat64StDetails, error) { switch m := msg.(type) { case *Nat64StDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err -- cgit 1.2.3-korg