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 /core/trace_test.go | |
| 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 'core/trace_test.go')
| -rw-r--r-- | core/trace_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/trace_test.go b/core/trace_test.go index 1a29e7a..edeaa34 100644 --- a/core/trace_test.go +++ b/core/trace_test.go @@ -5,8 +5,8 @@ import ( interfaces "git.fd.io/govpp.git/binapi/interface" "git.fd.io/govpp.git/binapi/ip" "git.fd.io/govpp.git/binapi/l2" + memclnt "git.fd.io/govpp.git/binapi/memclnt" "git.fd.io/govpp.git/binapi/memif" - "git.fd.io/govpp.git/binapi/vpe" "git.fd.io/govpp.git/core" . "github.com/onsi/gomega" "strings" @@ -78,7 +78,7 @@ func TestMultiRequestTraceEnabled(t *testing.T) { &interfaces.SwInterfaceDetails{ SwIfIndex: 3, }, - &vpe.ControlPingReply{}, + &memclnt.ControlPingReply{}, } ctx.mockVpp.MockReply(reply...) @@ -109,7 +109,7 @@ func TestMultiRequestTraceEnabled(t *testing.T) { if i == 0 { Expect(request[0].GetMessageName()).To(Equal(entry.Message.GetMessageName())) } else if i == len(traced)-1 { - msg := vpe.ControlPing{} + msg := memclnt.ControlPing{} Expect(msg.GetMessageName()).To(Equal(entry.Message.GetMessageName())) } else { Expect(reply[i-1].GetMessageName()).To(Equal(entry.Message.GetMessageName())) |