X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=core%2Fchannel_test.go;h=197dda4d92607f6388685bfcd36635fcd8984925;hb=a3bb834db727a3ac9a1ffcfeae9265e5dead851f;hp=d573f297099e56f37f9ba2d78243b9157beceabe;hpb=a679bbc78b98089f9b221bbe7de963f5274073bb;p=govpp.git diff --git a/core/channel_test.go b/core/channel_test.go index d573f29..197dda4 100644 --- a/core/channel_test.go +++ b/core/channel_test.go @@ -19,7 +19,6 @@ import ( "time" "git.fd.io/govpp.git/adapter/mock" - "git.fd.io/govpp.git/core/bin_api/vpe" "git.fd.io/govpp.git/examples/bin_api/interfaces" "git.fd.io/govpp.git/examples/bin_api/memif" "git.fd.io/govpp.git/examples/bin_api/tap" @@ -61,7 +60,7 @@ func TestRequestReplyTapConnect(t *testing.T) { defer ctx.teardownTest() ctx.mockVpp.MockReply(&tap.TapConnectReply{ - Retval: 10, + Retval: 0, SwIfIndex: 1, }) request := &tap.TapConnect{ @@ -72,7 +71,7 @@ func TestRequestReplyTapConnect(t *testing.T) { err := ctx.ch.SendRequest(request).ReceiveReply(reply) Expect(err).ShouldNot(HaveOccurred()) - Expect(reply.Retval).To(BeEquivalentTo(10), "Incorrect retval value for TapConnectReply") + Expect(reply.Retval).To(BeEquivalentTo(0), "Incorrect retval value for TapConnectReply") Expect(reply.SwIfIndex).To(BeEquivalentTo(1), "Incorrect SwIfIndex value for TapConnectReply") } @@ -81,7 +80,6 @@ func TestRequestReplyTapModify(t *testing.T) { defer ctx.teardownTest() ctx.mockVpp.MockReply(&tap.TapModifyReply{ - Retval: 15, SwIfIndex: 2, }) request := &tap.TapModify{ @@ -93,7 +91,7 @@ func TestRequestReplyTapModify(t *testing.T) { err := ctx.ch.SendRequest(request).ReceiveReply(reply) Expect(err).ShouldNot(HaveOccurred()) - Expect(reply.Retval).To(BeEquivalentTo(15), "Incorrect retval value for TapModifyReply") + Expect(reply.Retval).To(BeEquivalentTo(0), "Incorrect retval value for TapModifyReply") Expect(reply.SwIfIndex).To(BeEquivalentTo(2), "Incorrect SwIfIndex value for TapModifyReply") } @@ -101,9 +99,7 @@ func TestRequestReplyTapDelete(t *testing.T) { ctx := setupTest(t) defer ctx.teardownTest() - ctx.mockVpp.MockReply(&tap.TapDeleteReply{ - Retval: 20, - }) + ctx.mockVpp.MockReply(&tap.TapDeleteReply{}) request := &tap.TapDelete{ SwIfIndex: 3, } @@ -111,7 +107,7 @@ func TestRequestReplyTapDelete(t *testing.T) { err := ctx.ch.SendRequest(request).ReceiveReply(reply) Expect(err).ShouldNot(HaveOccurred()) - Expect(reply.Retval).To(BeEquivalentTo(20), "Incorrect retval value for TapDeleteReply") + Expect(reply.Retval).To(BeEquivalentTo(0), "Incorrect retval value for TapDeleteReply") } func TestRequestReplySwInterfaceTapDump(t *testing.T) { @@ -137,7 +133,6 @@ func TestRequestReplyMemifCreate(t *testing.T) { defer ctx.teardownTest() ctx.mockVpp.MockReply(&memif.MemifCreateReply{ - Retval: 22, SwIfIndex: 4, }) request := &memif.MemifCreate{ @@ -150,7 +145,7 @@ func TestRequestReplyMemifCreate(t *testing.T) { err := ctx.ch.SendRequest(request).ReceiveReply(reply) Expect(err).ShouldNot(HaveOccurred()) - Expect(reply.Retval).To(BeEquivalentTo(22), "Incorrect Retval value for MemifCreate") + Expect(reply.Retval).To(BeEquivalentTo(0), "Incorrect Retval value for MemifCreate") Expect(reply.SwIfIndex).To(BeEquivalentTo(4), "Incorrect SwIfIndex value for MemifCreate") } @@ -158,9 +153,7 @@ func TestRequestReplyMemifDelete(t *testing.T) { ctx := setupTest(t) defer ctx.teardownTest() - ctx.mockVpp.MockReply(&memif.MemifDeleteReply{ - Retval: 24, - }) + ctx.mockVpp.MockReply(&memif.MemifDeleteReply{}) request := &memif.MemifDelete{ SwIfIndex: 15, } @@ -168,7 +161,7 @@ func TestRequestReplyMemifDelete(t *testing.T) { err := ctx.ch.SendRequest(request).ReceiveReply(reply) Expect(err).ShouldNot(HaveOccurred()) - Expect(reply.Retval).To(BeEquivalentTo(24), "Incorrect Retval value for MemifDelete") + Expect(reply.Retval).To(BeEquivalentTo(0), "Incorrect Retval value for MemifDelete") } func TestRequestReplyMemifDetails(t *testing.T) { @@ -203,7 +196,7 @@ func TestMultiRequestReplySwInterfaceTapDump(t *testing.T) { }) } ctx.mockVpp.MockReply(msgs...) - ctx.mockVpp.MockReply(&vpe.ControlPingReply{}) + ctx.mockVpp.MockReply(&ControlPingReply{}) reqCtx := ctx.ch.SendMultiRequest(&tap.SwInterfaceTapDump{}) cnt := 0 @@ -231,7 +224,7 @@ func TestMultiRequestReplySwInterfaceMemifDump(t *testing.T) { }) } ctx.mockVpp.MockReply(msgs...) - ctx.mockVpp.MockReply(&vpe.ControlPingReply{}) + ctx.mockVpp.MockReply(&ControlPingReply{}) reqCtx := ctx.ch.SendMultiRequest(&memif.MemifDump{}) cnt := 0 @@ -317,13 +310,14 @@ func TestNotificationEvent(t *testing.T) { ctx.ch.UnsubscribeNotification(subs) } -func TestCheckMessageCompatibility(t *testing.T) { +/*func TestCheckMessageCompatibility(t *testing.T) { ctx := setupTest(t) defer ctx.teardownTest() err := ctx.ch.CheckMessageCompatibility(&interfaces.SwInterfaceSetFlags{}) Expect(err).ShouldNot(HaveOccurred()) -} +}*/ + func TestSetReplyTimeout(t *testing.T) { ctx := setupTest(t) defer ctx.teardownTest() @@ -331,12 +325,12 @@ func TestSetReplyTimeout(t *testing.T) { ctx.ch.SetReplyTimeout(time.Millisecond) // first one request should work - ctx.mockVpp.MockReply(&vpe.ControlPingReply{}) - err := ctx.ch.SendRequest(&vpe.ControlPing{}).ReceiveReply(&vpe.ControlPingReply{}) + ctx.mockVpp.MockReply(&ControlPingReply{}) + err := ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{}) Expect(err).ShouldNot(HaveOccurred()) // no other reply ready - expect timeout - err = ctx.ch.SendRequest(&vpe.ControlPing{}).ReceiveReply(&vpe.ControlPingReply{}) + err = ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{}) Expect(err).Should(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("timeout")) } @@ -355,7 +349,7 @@ func TestSetReplyTimeoutMultiRequest(t *testing.T) { }) } ctx.mockVpp.MockReply(msgs...) - ctx.mockVpp.MockReply(&vpe.ControlPingReply{}) + ctx.mockVpp.MockReply(&ControlPingReply{}) cnt := 0 sendMultiRequest := func() error { @@ -391,19 +385,19 @@ func TestReceiveReplyNegative(t *testing.T) { defer ctx.teardownTest() // invalid context 1 - reqCtx1 := &requestCtxData{} - err := reqCtx1.ReceiveReply(&vpe.ControlPingReply{}) + reqCtx1 := &requestCtx{} + err := reqCtx1.ReceiveReply(&ControlPingReply{}) Expect(err).Should(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("invalid request context")) // invalid context 2 - reqCtx2 := &multiRequestCtxData{} - _, err = reqCtx2.ReceiveReply(&vpe.ControlPingReply{}) + reqCtx2 := &multiRequestCtx{} + _, err = reqCtx2.ReceiveReply(&ControlPingReply{}) Expect(err).Should(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("invalid request context")) // NU - reqCtx3 := &requestCtxData{} + reqCtx3 := &requestCtx{} err = reqCtx3.ReceiveReply(nil) Expect(err).Should(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("invalid request context")) @@ -425,7 +419,7 @@ func TestMultiRequestDouble(t *testing.T) { SeqNum: 1, }) } - msgs = append(msgs, mock.MsgWithContext{Msg: &vpe.ControlPingReply{}, Multipart: true, SeqNum: 1}) + msgs = append(msgs, mock.MsgWithContext{Msg: &ControlPingReply{}, Multipart: true, SeqNum: 1}) for i := 1; i <= 3; i++ { msgs = append(msgs, @@ -438,7 +432,7 @@ func TestMultiRequestDouble(t *testing.T) { SeqNum: 2, }) } - msgs = append(msgs, mock.MsgWithContext{Msg: &vpe.ControlPingReply{}, Multipart: true, SeqNum: 2}) + msgs = append(msgs, mock.MsgWithContext{Msg: &ControlPingReply{}, Multipart: true, SeqNum: 2}) ctx.mockVpp.MockReplyWithContext(msgs...) @@ -475,17 +469,17 @@ func TestReceiveReplyAfterTimeout(t *testing.T) { ctx.ch.SetReplyTimeout(time.Millisecond) // first one request should work - ctx.mockVpp.MockReplyWithContext(mock.MsgWithContext{Msg: &vpe.ControlPingReply{}, SeqNum: 1}) - err := ctx.ch.SendRequest(&vpe.ControlPing{}).ReceiveReply(&vpe.ControlPingReply{}) + ctx.mockVpp.MockReplyWithContext(mock.MsgWithContext{Msg: &ControlPingReply{}, SeqNum: 1}) + err := ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{}) Expect(err).ShouldNot(HaveOccurred()) - err = ctx.ch.SendRequest(&vpe.ControlPing{}).ReceiveReply(&vpe.ControlPingReply{}) + err = ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{}) Expect(err).Should(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("timeout")) ctx.mockVpp.MockReplyWithContext( // simulating late reply - mock.MsgWithContext{Msg: &vpe.ControlPingReply{}, SeqNum: 2}, + mock.MsgWithContext{Msg: &ControlPingReply{}, SeqNum: 2}, // normal reply for next request mock.MsgWithContext{Msg: &tap.TapConnectReply{}, SeqNum: 3}) @@ -515,8 +509,8 @@ func TestReceiveReplyAfterTimeoutMultiRequest(t *testing.T) { ctx.ch.SetReplyTimeout(time.Millisecond * 100) // first one request should work - ctx.mockVpp.MockReplyWithContext(mock.MsgWithContext{Msg: &vpe.ControlPingReply{}, SeqNum: 1}) - err := ctx.ch.SendRequest(&vpe.ControlPing{}).ReceiveReply(&vpe.ControlPingReply{}) + ctx.mockVpp.MockReplyWithContext(mock.MsgWithContext{Msg: &ControlPingReply{}, SeqNum: 1}) + err := ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{}) Expect(err).ShouldNot(HaveOccurred()) cnt := 0 @@ -553,7 +547,7 @@ func TestReceiveReplyAfterTimeoutMultiRequest(t *testing.T) { SeqNum: 2, }) } - msgs = append(msgs, mock.MsgWithContext{Msg: &vpe.ControlPingReply{}, Multipart: true, SeqNum: 2}) + msgs = append(msgs, mock.MsgWithContext{Msg: &ControlPingReply{}, Multipart: true, SeqNum: 2}) ctx.mockVpp.MockReplyWithContext(msgs...) // normal reply for next request @@ -570,7 +564,7 @@ func TestReceiveReplyAfterTimeoutMultiRequest(t *testing.T) { Expect(err).ShouldNot(HaveOccurred()) } -func TestInvalidMessageID(t *testing.T) { +/*func TestInvalidMessageID(t *testing.T) { ctx := setupTest(t) defer ctx.teardownTest() @@ -581,7 +575,7 @@ func TestInvalidMessageID(t *testing.T) { // second should fail with error invalid message ID ctx.mockVpp.MockReply(&vpe.ShowVersionReply{}) - err = ctx.ch.SendRequest(&vpe.ControlPing{}).ReceiveReply(&vpe.ControlPingReply{}) + err = ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{}) Expect(err).Should(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("invalid message ID")) -} +}*/