Refactor GoVPP

Squashed commit of the following:

commit 348930db31575e9f59b3834d9fec07411f011e05
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 15 11:30:13 2018 +0200

    Use debug level for log about different context

commit 9fc963c559cea67a41b85c6cdadc322fb3b1fc7c
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 15 11:22:03 2018 +0200

    Remove annoying logs and add env vars for debugging

commit fdc9fd624d13feadb602e0d03d58f8a44b7a565f
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 15 11:18:47 2018 +0200

    Fix printing unknown VPPApiError

commit 8f968be36a91de4d4a8ea17593ba314f82aa9583
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Tue Aug 14 17:25:10 2018 +0200

    Refactor entire GoVPP

    - fix some cases with inconsistent VPP messages, causing messages
      to be incorrectly identified as event or request
    - simplify API, remove direct access to internal Go channels
    - add module name with message to registration of messages
    - start watching filesystem only when vpe-api file does not exist
    - simplify code in message codec and remove unneeded parts
    - retrieve IDs of all registered messages after connect to VPP
    - define fallback for control ping in core to avoid duplicate registration
    - add SetLogLevel function to set logger level more easily
    - remove lot of unused code

commit 34dd1b7e10ef0324aa8c4e4cc42375bd6021c6cb
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Mon Aug 13 11:29:54 2018 +0200

    Rename VnetError to VPPApiError

commit c6549d6f77847a1367a12ff47fb716e2955e973a
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Mon Aug 13 10:23:43 2018 +0200

    Fix examples and regenerate binapi

commit 4612e36b416779771f5efab4fc654c2766d2cb1c
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Mon Aug 13 09:51:22 2018 +0200

    Add parsing and generation for services

commit ac9c5280c5aa27e325f327609e2364cc66f3723f
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Fri Aug 10 14:30:15 2018 +0200

    Fix exit status on error and add continue-onerror flag

commit 9b3f4ef9fc7c8c62037fa107085eae18a8725314
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 15:20:56 2018 +0200

    Return VnetError when Retval != 0

commit 8fd21a907b5e628ec4d2026215b83d15da96c297
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 14:59:05 2018 +0200

    Add all missing errors from api_errno.h

commit 08450f288d3046ebaecf40203174ae342a07f1eb
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 14:29:27 2018 +0200

    Update README

commit d8dced0728dd62243539be741868fb7d9b8de4cc
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:59:59 2018 +0200

    Regenerate vpe in core

commit 254da7592cdbf634cf7aa46ae36ce7bb6d4ee555
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:37:00 2018 +0200

    Add VnetError type for Retvals

commit 4475c1087fb53ab4c788e530bc7fef7cfc89d2cd
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:36:07 2018 +0200

    Add registration API

commit 892a3ea5a2c703e2f7c29331663f6a6fa706bff5
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 13:30:43 2018 +0200

    Generate registration for messages and check all IDs on connect

commit 389ed03b6e7082260281866c3449d72d72347c99
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:32:41 2018 +0200

    Show error for empty adapter (on Darwin/Windows)

commit ef1ea040d656ade64242432dc5f06810ed8dcde6
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:31:37 2018 +0200

    Improve logged info

commit d4adae3b14ed54c8d693060dd857fa9ba5ec8e06
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:27:48 2018 +0200

    Update examples

commit 63921e1346014701a22639a2611129563bb1eb78
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Thu Aug 9 11:02:56 2018 +0200

    Generate unions and fix some issues

    - add comments between sections
    - define structs on single line if it has no fields
    - generate unions with setters/getters for each field
    - fix detection of message type

commit 6ab3e3fa590b245898306a6ffaf32c7721eab60c
Author: Ondrej Fabry <ofabry@cisco.com>
Date:   Wed Aug 8 15:37:10 2018 +0200

    Refactor binapi-generator

    - split JSON parsing from code generation
    - parse and generate enums
    - parse unions (no generation yet)
    - change output file suffix to '.ba.go'
    - cleanup and simplify code
    - split code into files
    - add flag for debug mode

Change-Id: I58f685e0d4c7a38e9a7b6ea0a1f47792d95d7399
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>

1 files changed, 34 insertions, 40 deletions

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"))
-}
+}*/