X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=core%2Fchannel_test.go;h=d06e2b3fd8e316323f3428e617642452822ed1c0;hb=c7ae74a95d1bd6fefcbb061f5f045c60c11e32fc;hp=7e721cd20e42ea06e023ba2bae1ab721fab2e14e;hpb=639870b5083a1e66f4584ec7a5f30492fcdb7168;p=govpp.git

diff --git a/core/channel_test.go b/core/channel_test.go
index 7e721cd..d06e2b3 100644
--- a/core/channel_test.go
+++ b/core/channel_test.go
@@ -22,6 +22,7 @@ import (
 
 	"git.fd.io/govpp.git/adapter/mock"
 	"git.fd.io/govpp.git/api"
+	"git.fd.io/govpp.git/examples/binapi/interface_types"
 	"git.fd.io/govpp.git/examples/binapi/interfaces"
 	"git.fd.io/govpp.git/examples/binapi/memif"
 	"git.fd.io/govpp.git/examples/binapi/vpe"
@@ -103,7 +104,7 @@ func TestRequestReplyMemifDetails(t *testing.T) {
 	// mock reply
 	ctx.mockVpp.MockReply(&memif.MemifDetails{
 		SwIfIndex: 25,
-		IfName:    []byte("memif-name"),
+		IfName:    "memif-name",
 		Role:      0,
 	})
 
@@ -128,7 +129,7 @@ func TestMultiRequestReplySwInterfaceMemifDump(t *testing.T) {
 	var msgs []api.Message
 	for i := 1; i <= 10; i++ {
 		msgs = append(msgs, &memif.MemifDetails{
-			SwIfIndex: uint32(i),
+			SwIfIndex: interface_types.InterfaceIndex(i),
 		})
 	}
 	ctx.mockVpp.MockReply(msgs...)
@@ -159,8 +160,8 @@ func TestNotificationEvent(t *testing.T) {
 
 	// mock event and force its delivery
 	ctx.mockVpp.MockReply(&interfaces.SwInterfaceEvent{
-		SwIfIndex:  2,
-		LinkUpDown: 1,
+		SwIfIndex: 2,
+		Flags:     interface_types.IF_STATUS_API_FLAG_LINK_UP,
 	})
 	ctx.mockVpp.SendMsg(0, []byte(""))
 
@@ -178,7 +179,7 @@ func TestNotificationEvent(t *testing.T) {
 
 	// verify the received notifications
 	Expect(notif.SwIfIndex).To(BeEquivalentTo(2), "Incorrect SwIfIndex value for SwInterfaceSetFlags")
-	Expect(notif.LinkUpDown).To(BeEquivalentTo(1), "Incorrect LinkUpDown value for SwInterfaceSetFlags")
+	Expect(notif.Flags).To(BeEquivalentTo(interface_types.IF_STATUS_API_FLAG_LINK_UP), "Incorrect LinkUpDown value for SwInterfaceSetFlags")
 
 	err = sub.Unsubscribe()
 	Expect(err).ShouldNot(HaveOccurred())
@@ -213,15 +214,15 @@ func TestSetReplyTimeoutMultiRequest(t *testing.T) {
 	ctx.mockVpp.MockReply(
 		&interfaces.SwInterfaceDetails{
 			SwIfIndex:     1,
-			InterfaceName: []byte("if-name-test"),
+			InterfaceName: "if-name-test",
 		},
 		&interfaces.SwInterfaceDetails{
 			SwIfIndex:     2,
-			InterfaceName: []byte("if-name-test"),
+			InterfaceName: "if-name-test",
 		},
 		&interfaces.SwInterfaceDetails{
 			SwIfIndex:     3,
-			InterfaceName: []byte("if-name-test"),
+			InterfaceName: "if-name-test",
 		},
 	)
 	ctx.mockVpp.MockReply(&ControlPingReply{})
@@ -287,8 +288,8 @@ func TestMultiRequestDouble(t *testing.T) {
 	for i := 1; i <= 3; i++ {
 		msgs = append(msgs, mock.MsgWithContext{
 			Msg: &interfaces.SwInterfaceDetails{
-				SwIfIndex:     uint32(i),
-				InterfaceName: []byte("if-name-test"),
+				SwIfIndex:     interface_types.InterfaceIndex(i),
+				InterfaceName: "if-name-test",
 			},
 			Multipart: true,
 			SeqNum:    1,
@@ -300,8 +301,8 @@ func TestMultiRequestDouble(t *testing.T) {
 		msgs = append(msgs,
 			mock.MsgWithContext{
 				Msg: &interfaces.SwInterfaceDetails{
-					SwIfIndex:     uint32(i),
-					InterfaceName: []byte("if-name-test"),
+					SwIfIndex:     interface_types.InterfaceIndex(i),
+					InterfaceName: "if-name-test",
 				},
 				Multipart: true,
 				SeqNum:    2,
@@ -368,8 +369,8 @@ func TestReceiveReplyAfterTimeout(t *testing.T) {
 	)
 
 	req := &interfaces.SwInterfaceSetFlags{
-		SwIfIndex:   1,
-		AdminUpDown: 1,
+		SwIfIndex: 1,
+		Flags:     interface_types.IF_STATUS_API_FLAG_ADMIN_UP,
 	}
 	reply := &interfaces.SwInterfaceSetFlagsReply{}
 
@@ -426,8 +427,8 @@ func TestReceiveReplyAfterTimeoutMultiRequest(t *testing.T) {
 	for i := 1; i <= 3; i++ {
 		msgs = append(msgs, mock.MsgWithContext{
 			Msg: &interfaces.SwInterfaceDetails{
-				SwIfIndex:     uint32(i),
-				InterfaceName: []byte("if-name-test"),
+				SwIfIndex:     interface_types.InterfaceIndex(i),
+				InterfaceName: "if-name-test",
 			},
 			Multipart: true,
 			SeqNum:    2,
@@ -440,8 +441,8 @@ func TestReceiveReplyAfterTimeoutMultiRequest(t *testing.T) {
 	ctx.mockVpp.MockReplyWithContext(mock.MsgWithContext{Msg: &interfaces.SwInterfaceSetFlagsReply{}, SeqNum: 3})
 
 	req := &interfaces.SwInterfaceSetFlags{
-		SwIfIndex:   1,
-		AdminUpDown: 1,
+		SwIfIndex: 1,
+		Flags:     interface_types.IF_STATUS_API_FLAG_ADMIN_UP,
 	}
 	reply := &interfaces.SwInterfaceSetFlagsReply{}
 
@@ -465,5 +466,5 @@ func TestInvalidMessageID(t *testing.T) {
 	// second should fail with error invalid message ID
 	err = ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{})
 	Expect(err).Should(HaveOccurred())
-	Expect(err.Error()).To(ContainSubstring("invalid message ID"))
+	Expect(err.Error()).To(ContainSubstring("unexpected message"))
 }