diff options
| author |   Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2022-04-27 18:39:03 +0200 |
|---|---|---|
| committer | Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2022-05-30 18:49:13 +0200 |
| commit | 4102c72bce694babd94a481b1201d33895a6f9c5 (patch) | |
| tree | 1b11238ca4706008c88712f26942dd74ab9c14a6 /cmd | |
| parent | a4112fac7b86fe09650d2bb57969fe46404edd7d (diff) | |
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 <nathan.skrzypczak@gmail.com>
Change-Id: Ie5cd2d5ded7ecaffd9abc3ca675df40be272b1fa
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/govpp/main.go | 5 | ||||
| -rw-r--r-- | cmd/vpp-proxy/main.go | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmd/govpp/main.go b/cmd/govpp/main.go index 1c6b905..ebc15a5 100644 --- a/cmd/govpp/main.go +++ b/cmd/govpp/main.go @@ -30,6 +30,7 @@ import ( "git.fd.io/govpp.git" "git.fd.io/govpp.git/adapter/socketclient" + "git.fd.io/govpp.git/binapi/vlib" "git.fd.io/govpp.git/binapi/vpe" "git.fd.io/govpp.git/binapigen" "git.fd.io/govpp.git/binapigen/vppapi" @@ -154,8 +155,8 @@ func sendCLI(args []string) { log.Fatal(err) } - client := vpe.NewServiceClient(conn) - reply, err := client.CliInband(context.Background(), &vpe.CliInband{ + client := vlib.NewServiceClient(conn) + reply, err := client.CliInband(context.Background(), &vlib.CliInband{ Cmd: cmd, }) if err != nil { diff --git a/cmd/vpp-proxy/main.go b/cmd/vpp-proxy/main.go index 3c85bcf..ac74294 100644 --- a/cmd/vpp-proxy/main.go +++ b/cmd/vpp-proxy/main.go @@ -23,6 +23,7 @@ import ( "git.fd.io/govpp.git/adapter/statsclient" "git.fd.io/govpp.git/api" interfaces "git.fd.io/govpp.git/binapi/interface" + "git.fd.io/govpp.git/binapi/vlib" "git.fd.io/govpp.git/binapi/vpe" _ "git.fd.io/govpp.git/core" "git.fd.io/govpp.git/proxy" @@ -93,8 +94,8 @@ func runClient() { panic(err) } - req := &vpe.CliInband{Cmd: "show version"} - reply := new(vpe.CliInbandReply) + req := &vlib.CliInband{Cmd: "show version"} + reply := new(vlib.CliInbandReply) if err := binapiChannel.SendRequest(req).ReceiveReply(reply); err != nil { log.Fatalln("binapi request failed:", err) } |