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/det44/det44_rpc.ba.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'binapi/det44/det44_rpc.ba.go') diff --git a/binapi/det44/det44_rpc.ba.go b/binapi/det44/det44_rpc.ba.go index e943932..89f6bd6 100644 --- a/binapi/det44/det44_rpc.ba.go +++ b/binapi/det44/det44_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 det44. @@ -105,7 +105,7 @@ func (c *serviceClient) Det44InterfaceDump(ctx context.Context, in *Det44Interfa 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 @@ -128,7 +128,7 @@ func (c *serviceClient_Det44InterfaceDumpClient) Recv() (*Det44InterfaceDetails, switch m := msg.(type) { case *Det44InterfaceDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -148,7 +148,7 @@ func (c *serviceClient) Det44MapDump(ctx context.Context, in *Det44MapDump) (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 @@ -171,7 +171,7 @@ func (c *serviceClient_Det44MapDumpClient) Recv() (*Det44MapDetails, error) { switch m := msg.(type) { case *Det44MapDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -209,7 +209,7 @@ func (c *serviceClient) Det44SessionDump(ctx context.Context, in *Det44SessionDu 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 @@ -232,7 +232,7 @@ func (c *serviceClient_Det44SessionDumpClient) Recv() (*Det44SessionDetails, err switch m := msg.(type) { case *Det44SessionDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -297,7 +297,7 @@ func (c *serviceClient) NatDetMapDump(ctx context.Context, in *NatDetMapDump) (R 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 @@ -320,7 +320,7 @@ func (c *serviceClient_NatDetMapDumpClient) Recv() (*NatDetMapDetails, error) { switch m := msg.(type) { case *NatDetMapDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err @@ -349,7 +349,7 @@ func (c *serviceClient) NatDetSessionDump(ctx context.Context, in *NatDetSession 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 @@ -372,7 +372,7 @@ func (c *serviceClient_NatDetSessionDumpClient) Recv() (*NatDetSessionDetails, e switch m := msg.(type) { case *NatDetSessionDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: err = c.Stream.Close() if err != nil { return nil, err -- cgit 1.2.3-korg