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, 28 insertions, 39 deletions

diff --git a/core/notification_handler.go b/core/notification_handler.go
index c0e8687..7b889e3 100644
--- a/core/notification_handler.go
+++ b/core/notification_handler.go
@@ -16,21 +16,20 @@ package core
 
 import (
 	"fmt"
-	"reflect"
 
 	"git.fd.io/govpp.git/api"
 	logger "github.com/sirupsen/logrus"
 )
 
-// processNotifSubscribeRequest processes a notification subscribe request.
-func (c *Connection) processNotifSubscribeRequest(ch *channel, req *api.NotifSubscribeRequest) error {
+// processSubscriptionRequest processes a notification subscribe request.
+func (c *Connection) processSubscriptionRequest(ch *channel, req *subscriptionRequest) error {
 	var err error
 
 	// subscribe / unsubscribe
-	if req.Subscribe {
-		err = c.addNotifSubscription(req.Subscription)
+	if req.subscribe {
+		err = c.addNotifSubscription(req.sub)
 	} else {
-		err = c.removeNotifSubscription(req.Subscription)
+		err = c.removeNotifSubscription(req.sub)
 	}
 
 	// send the reply into the go channel
@@ -40,7 +39,7 @@ func (c *Connection) processNotifSubscribeRequest(ch *channel, req *api.NotifSub
 	default:
 		// unable to write into the channel without blocking
 		log.WithFields(logger.Fields{
-			"channel": ch,
+			"channel": ch.id,
 		}).Warn("Unable to deliver the subscribe reply, reciever end not ready.")
 	}
 
@@ -50,14 +49,14 @@ func (c *Connection) processNotifSubscribeRequest(ch *channel, req *api.NotifSub
 // addNotifSubscription adds the notification subscription into the subscriptions map of the connection.
 func (c *Connection) addNotifSubscription(subs *api.NotifSubscription) error {
 	// get message ID of the notification message
-	msgID, err := c.getSubscriptionMessageID(subs)
+	msgID, msgName, err := c.getSubscriptionMessageID(subs)
 	if err != nil {
 		return err
 	}
 
 	log.WithFields(logger.Fields{
-		"msg_id":       msgID,
-		"subscription": subs,
+		"msg_name": msgName,
+		"msg_id":   msgID,
 	}).Debug("Adding new notification subscription.")
 
 	// add the subscription into map
@@ -72,14 +71,14 @@ func (c *Connection) addNotifSubscription(subs *api.NotifSubscription) error {
 // removeNotifSubscription removes the notification subscription from the subscriptions map of the connection.
 func (c *Connection) removeNotifSubscription(subs *api.NotifSubscription) error {
 	// get message ID of the notification message
-	msgID, err := c.getSubscriptionMessageID(subs)
+	msgID, msgName, err := c.getSubscriptionMessageID(subs)
 	if err != nil {
 		return err
 	}
 
 	log.WithFields(logger.Fields{
-		"msg_id":       msgID,
-		"subscription": subs,
+		"msg_name": msgName,
+		"msg_id":   msgID,
 	}).Debug("Removing notification subscription.")
 
 	// remove the subscription from the map
@@ -115,31 +114,22 @@ func (c *Connection) sendNotifications(msgID uint16, data []byte) {
 
 	// send to notification to each subscriber
 	for _, subs := range c.notifSubscriptions[msgID] {
+		msg := subs.MsgFactory()
 		log.WithFields(logger.Fields{
-			"msg_id":       msgID,
-			"msg_size":     len(data),
-			"subscription": subs,
+			"msg_name": msg.GetMessageName(),
+			"msg_id":   msgID,
+			"msg_size": len(data),
 		}).Debug("Sending a notification to the subscription channel.")
 
-		msg := subs.MsgFactory()
-		err := c.codec.DecodeMsg(data, msg)
-		if err != nil {
+		if err := c.codec.DecodeMsg(data, msg); err != nil {
 			log.WithFields(logger.Fields{
-				"msg_id":       msgID,
-				"msg_size":     len(data),
-				"subscription": subs,
-			}).Error("Unable to decode the notification message.")
+				"msg_name": msg.GetMessageName(),
+				"msg_id":   msgID,
+				"msg_size": len(data),
+			}).Errorf("Unable to decode the notification message: %v", err)
 			continue
 		}
 
-		// special case for the strange interface counters message
-		if msg.GetMessageName() == "vnet_interface_counters" {
-			v := reflect.ValueOf(msg).Elem().FieldByName("Data")
-			if v.IsValid() {
-				v.SetBytes(data[8:]) // include the Count and Data fields in the data
-			}
-		}
-
 		// send the message into the go channel of the subscription
 		select {
 		case subs.NotifChan <- msg:
@@ -147,9 +137,9 @@ func (c *Connection) sendNotifications(msgID uint16, data []byte) {
 		default:
 			// unable to write into the channel without blocking
 			log.WithFields(logger.Fields{
-				"msg_id":       msgID,
-				"msg_size":     len(data),
-				"subscription": subs,
+				"msg_name": msg.GetMessageName(),
+				"msg_id":   msgID,
+				"msg_size": len(data),
 			}).Warn("Unable to deliver the notification, reciever end not ready.")
 		}
 
@@ -160,22 +150,21 @@ func (c *Connection) sendNotifications(msgID uint16, data []byte) {
 		log.WithFields(logger.Fields{
 			"msg_id":   msgID,
 			"msg_size": len(data),
-		}).Debug("No subscription found for the notification message.")
+		}).Info("No subscription found for the notification message.")
 	}
 }
 
 // getSubscriptionMessageID returns ID of the message the subscription is tied to.
-func (c *Connection) getSubscriptionMessageID(subs *api.NotifSubscription) (uint16, error) {
+func (c *Connection) getSubscriptionMessageID(subs *api.NotifSubscription) (uint16, string, error) {
 	msg := subs.MsgFactory()
 	msgID, err := c.GetMessageID(msg)
-
 	if err != nil {
 		log.WithFields(logger.Fields{
 			"msg_name": msg.GetMessageName(),
 			"msg_crc":  msg.GetCrcString(),
 		}).Errorf("unable to retrieve message ID: %v", err)
-		return 0, fmt.Errorf("unable to retrieve message ID: %v", err)
+		return 0, "", fmt.Errorf("unable to retrieve message ID: %v", err)
 	}
 
-	return msgID, nil
+	return msgID, msg.GetMessageName(), nil
 }