From c7ae74a95d1bd6fefcbb061f5f045c60c11e32fc Mon Sep 17 00:00:00 2001 From: Vladimir Lavor Date: Wed, 1 Jul 2020 12:18:54 +0200 Subject: Binary API generator improvements * Many aliases removed, aliased types reference original types via import instead * Added various helper methods for simpler conversion between go and vpp types Change-Id: I7999ac8d524cece4da03e6447b13421659765095 Signed-off-by: Vladimir Lavor --- core/channel_test.go | 8 ++++---- core/connection_test.go | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'core') diff --git a/core/channel_test.go b/core/channel_test.go index 6775519..d06e2b3 100644 --- a/core/channel_test.go +++ b/core/channel_test.go @@ -129,7 +129,7 @@ func TestMultiRequestReplySwInterfaceMemifDump(t *testing.T) { var msgs []api.Message for i := 1; i <= 10; i++ { msgs = append(msgs, &memif.MemifDetails{ - SwIfIndex: interfaces.InterfaceIndex(i), + SwIfIndex: interface_types.InterfaceIndex(i), }) } ctx.mockVpp.MockReply(msgs...) @@ -288,7 +288,7 @@ func TestMultiRequestDouble(t *testing.T) { for i := 1; i <= 3; i++ { msgs = append(msgs, mock.MsgWithContext{ Msg: &interfaces.SwInterfaceDetails{ - SwIfIndex: interfaces.InterfaceIndex(i), + SwIfIndex: interface_types.InterfaceIndex(i), InterfaceName: "if-name-test", }, Multipart: true, @@ -301,7 +301,7 @@ func TestMultiRequestDouble(t *testing.T) { msgs = append(msgs, mock.MsgWithContext{ Msg: &interfaces.SwInterfaceDetails{ - SwIfIndex: interfaces.InterfaceIndex(i), + SwIfIndex: interface_types.InterfaceIndex(i), InterfaceName: "if-name-test", }, Multipart: true, @@ -427,7 +427,7 @@ func TestReceiveReplyAfterTimeoutMultiRequest(t *testing.T) { for i := 1; i <= 3; i++ { msgs = append(msgs, mock.MsgWithContext{ Msg: &interfaces.SwInterfaceDetails{ - SwIfIndex: interfaces.InterfaceIndex(i), + SwIfIndex: interface_types.InterfaceIndex(i), InterfaceName: "if-name-test", }, Multipart: true, diff --git a/core/connection_test.go b/core/connection_test.go index 643d4a3..453bbce 100644 --- a/core/connection_test.go +++ b/core/connection_test.go @@ -15,6 +15,7 @@ package core_test import ( + "git.fd.io/govpp.git/examples/binapi/interface_types" "testing" . "github.com/onsi/gomega" @@ -161,7 +162,7 @@ func TestMultiRequestsWithSequenceNumbers(t *testing.T) { var msgs []api.Message for i := 0; i < 10; i++ { - msgs = append(msgs, &interfaces.SwInterfaceDetails{SwIfIndex: interfaces.InterfaceIndex(i)}) + msgs = append(msgs, &interfaces.SwInterfaceDetails{SwIfIndex: interface_types.InterfaceIndex(i)}) } ctx.mockVpp.MockReply(msgs...) ctx.mockVpp.MockReply(&vpe.ControlPingReply{}) @@ -280,7 +281,7 @@ func TestMultiRequestsWithErrors(t *testing.T) { } for i := 0; i < 10; i++ { msgs = append(msgs, mock.MsgWithContext{ - Msg: &interfaces.SwInterfaceDetails{SwIfIndex: interfaces.InterfaceIndex(i)}, + Msg: &interfaces.SwInterfaceDetails{SwIfIndex: interface_types.InterfaceIndex(i)}, SeqNum: 1, Multipart: true, }) -- cgit 1.2.3-korg