Fixed incorrect message error in the stream API

The message package is passed to the stream object and
used to evaluate correct reply message type

Change-Id: I2c9844d6447d024af1693205efd5721e2f89f22d
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>

1 files changed, 17 insertions, 11 deletions

diff --git a/adapter/mock/mock_vpp_adapter.go b/adapter/mock/mock_vpp_adapter.go
index f79bb8b..90195e7 100644
--- a/adapter/mock/mock_vpp_adapter.go
+++ b/adapter/mock/mock_vpp_adapter.go
@@ -44,7 +44,7 @@ type VppAdapter struct {
 	access       sync.RWMutex
 	msgNameToIds map[string]uint16
 	msgIDsToName map[uint16]string
-	binAPITypes  map[string]reflect.Type
+	binAPITypes  map[string]map[string]reflect.Type
 
 	repliesLock   sync.Mutex     // mutex for the queue
 	replies       []reply        // FIFO queue of messages
@@ -126,7 +126,7 @@ func NewVppAdapter() *VppAdapter {
 		msgIDSeq:     1000,
 		msgIDsToName: make(map[uint16]string),
 		msgNameToIds: make(map[string]uint16),
-		binAPITypes:  make(map[string]reflect.Type),
+		binAPITypes:  make(map[string]map[string]reflect.Type),
 	}
 	a.registerBinAPITypes()
 	return a
@@ -165,19 +165,25 @@ func (a *VppAdapter) GetMsgNameByID(msgID uint16) (string, bool) {
 func (a *VppAdapter) registerBinAPITypes() {
 	a.access.Lock()
 	defer a.access.Unlock()
-	for _, msg := range api.GetRegisteredMessages() {
-		a.binAPITypes[msg.GetMessageName()] = reflect.TypeOf(msg).Elem()
+	for pkg, msgs := range api.GetRegisteredMessages() {
+		msgMap := make(map[string]reflect.Type)
+		for _, msg := range msgs {
+			msgMap[msg.GetMessageName()] = reflect.TypeOf(msg).Elem()
+		}
+		a.binAPITypes[pkg] = msgMap
 	}
 }
 
 // ReplyTypeFor returns reply message type for given request message name.
-func (a *VppAdapter) ReplyTypeFor(requestMsgName string) (reflect.Type, uint16, bool) {
+func (a *VppAdapter) ReplyTypeFor(pkg, requestMsgName string) (reflect.Type, uint16, bool) {
 	replyName, foundName := binapi.ReplyNameFor(requestMsgName)
 	if foundName {
-		if reply, found := a.binAPITypes[replyName]; found {
-			msgID, err := a.GetMsgID(replyName, "")
-			if err == nil {
-				return reply, msgID, found
+		if messages, found := a.binAPITypes[pkg]; found {
+			if reply, found := messages[replyName]; found {
+				msgID, err := a.GetMsgID(replyName, "")
+				if err == nil {
+					return reply, msgID, found
+				}
 			}
 		}
 	}
@@ -186,8 +192,8 @@ func (a *VppAdapter) ReplyTypeFor(requestMsgName string) (reflect.Type, uint16,
 }
 
 // ReplyFor returns reply message for given request message name.
-func (a *VppAdapter) ReplyFor(requestMsgName string) (api.Message, uint16, bool) {
-	replType, msgID, foundReplType := a.ReplyTypeFor(requestMsgName)
+func (a *VppAdapter) ReplyFor(pkg, requestMsgName string) (api.Message, uint16, bool) {
+	replType, msgID, foundReplType := a.ReplyTypeFor(pkg, requestMsgName)
 	if foundReplType {
 		msgVal := reflect.New(replType)
 		if msg, ok := msgVal.Interface().(api.Message); ok {