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/api-trace/api-trace.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'examples/api-trace/api-trace.go') diff --git a/examples/api-trace/api-trace.go b/examples/api-trace/api-trace.go index 3a78c7b..1978c17 100644 --- a/examples/api-trace/api-trace.go +++ b/examples/api-trace/api-trace.go @@ -26,6 +26,7 @@ import ( interfaces "git.fd.io/govpp.git/binapi/interface" "git.fd.io/govpp.git/binapi/interface_types" "git.fd.io/govpp.git/binapi/ip_types" + "git.fd.io/govpp.git/binapi/memclnt" "git.fd.io/govpp.git/binapi/vpe" "git.fd.io/govpp.git/core" "log" @@ -318,7 +319,7 @@ func invokeInterfaceDump(c api.Connection) { fmt.Printf("ERROR: %v\n", err) return } - if err := s.SendMsg(&vpe.ControlPing{}); err != nil { + if err := s.SendMsg(&memclnt.ControlPing{}); err != nil { fmt.Printf("ERROR: %v\n", err) return } @@ -331,7 +332,7 @@ func invokeInterfaceDump(c api.Connection) { switch msg := reply.(type) { case *interfaces.SwInterfaceDetails: fmt.Printf(" - retrieved interface: %v (idx: %d)\n", msg.InterfaceName, msg.SwIfIndex) - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: return } } -- cgit 1.2.3-korg