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 --- examples/stream-client/stream_client.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'examples/stream-client/stream_client.go') diff --git a/examples/stream-client/stream_client.go b/examples/stream-client/stream_client.go index f4af859..3a826e5 100644 --- a/examples/stream-client/stream_client.go +++ b/examples/stream-client/stream_client.go @@ -32,6 +32,7 @@ import ( "git.fd.io/govpp.git/binapi/ip" "git.fd.io/govpp.git/binapi/ip_types" "git.fd.io/govpp.git/binapi/mactime" + "git.fd.io/govpp.git/binapi/memclnt" "git.fd.io/govpp.git/binapi/vpe" "git.fd.io/govpp.git/core" ) @@ -157,7 +158,7 @@ func interfaceDumpStream(stream api.Stream) { logError(err, "SwInterfaceDump sending message") return } - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.ControlPing{}); err != nil { logError(err, "ControlPing sending message") return } @@ -174,7 +175,7 @@ Loop: case *interfaces.SwInterfaceDetails: fmt.Printf(" - SwInterfaceDetails: %+v\n", msg) - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: fmt.Printf(" - ControlPingReply: %+v\n", msg) break Loop @@ -227,7 +228,7 @@ func ipAddressDumpStream(stream api.Stream, index interface_types.InterfaceIndex logError(err, "IPAddressDump sending message") return } - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.ControlPing{}); err != nil { logError(err, "ControlPing sending sending message") return } @@ -244,7 +245,7 @@ Loop: case *ip.IPAddressDetails: fmt.Printf(" - IPAddressDetails: %+v\n", msg) - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: fmt.Printf(" - ControlPingReply: %+v\n", msg) break Loop @@ -260,7 +261,7 @@ Loop: // Mactime dump uses MactimeDumpReply message as an end of the stream // notification instead of the control ping. -func mactimeDump(stream api.Stream, ) { +func mactimeDump(stream api.Stream) { fmt.Println("Sending mactime dump..") if err := stream.SendMsg(&mactime.MactimeDump{}); err != nil { -- cgit 1.2.3-korg