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 +++-- examples/perf-bench/perf-bench.go | 18 +++++++++--------- examples/stream-client/stream_client.go | 11 ++++++----- 3 files changed, 18 insertions(+), 16 deletions(-) (limited to 'examples') 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 } } diff --git a/examples/perf-bench/perf-bench.go b/examples/perf-bench/perf-bench.go index 6472068..f7a9857 100644 --- a/examples/perf-bench/perf-bench.go +++ b/examples/perf-bench/perf-bench.go @@ -30,7 +30,7 @@ import ( "git.fd.io/govpp.git/adapter/socketclient" "git.fd.io/govpp.git/adapter/statsclient" "git.fd.io/govpp.git/api" - "git.fd.io/govpp.git/binapi/vpe" + "git.fd.io/govpp.git/binapi/memclnt" "git.fd.io/govpp.git/core" ) @@ -117,8 +117,8 @@ func syncTest(ch api.Channel, cnt int) { fmt.Printf("Running synchronous perf test with %d requests...\n", cnt) for i := 0; i < cnt; i++ { - req := &vpe.ControlPing{} - reply := &vpe.ControlPingReply{} + req := &memclnt.ControlPing{} + reply := &memclnt.ControlPingReply{} if err := ch.SendRequest(req).ReceiveReply(reply); err != nil { log.Fatalln("Error in reply:", err) @@ -134,12 +134,12 @@ func syncTest2(conn api.Connection, cnt int) { log.Fatalln("Error NewStream:", err) } for i := 0; i < cnt; i++ { - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.ControlPing{}); err != nil { log.Fatalln("Error SendMsg:", err) } if msg, err := stream.RecvMsg(); err != nil { log.Fatalln("Error RecvMsg:", err) - } else if _, ok := msg.(*vpe.ControlPingReply); ok { + } else if _, ok := msg.(*memclnt.ControlPingReply); ok { // ok } else { log.Fatalf("unexpected reply: %v", msg.GetMessageName()) @@ -154,14 +154,14 @@ func asyncTest(ch api.Channel, cnt int) { go func() { for i := 0; i < cnt; i++ { - ctxChan <- ch.SendRequest(&vpe.ControlPing{}) + ctxChan <- ch.SendRequest(&memclnt.ControlPing{}) } close(ctxChan) fmt.Printf("Sending asynchronous requests finished\n") }() for ctx := range ctxChan { - reply := &vpe.ControlPingReply{} + reply := &memclnt.ControlPingReply{} if err := ctx.ReceiveReply(reply); err != nil { log.Fatalln("Error in reply:", err) } @@ -179,7 +179,7 @@ func asyncTest2(conn api.Connection, cnt int) { if err != nil { log.Fatalln("Error NewStream:", err) } - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.ControlPing{}); err != nil { log.Fatalln("Error SendMsg:", err) } ctxChan <- stream @@ -191,7 +191,7 @@ func asyncTest2(conn api.Connection, cnt int) { for ctx := range ctxChan { if msg, err := ctx.RecvMsg(); err != nil { log.Fatalln("Error RecvMsg:", err) - } else if _, ok := msg.(*vpe.ControlPingReply); ok { + } else if _, ok := msg.(*memclnt.ControlPingReply); ok { // ok } else { log.Fatalf("unexpected reply: %v", msg.GetMessageName()) 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