X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftracker.go;h=20af9f04722b681350570793458c51ae28d9065c;hb=refs%2Fchanges%2F52%2F2252%2F3;hp=869e8ca66ed590319fae39582e9897931168aa67;hpb=e406a34d5547107533e65ddfbb2074e96d77b4b3;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 869e8ca..20af9f0 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -21,6 +21,7 @@ package control
 
 import (
 	"fmt"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"sync"
 )
 
@@ -36,15 +37,24 @@ func (t *Tracker) Init() {
 	t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
 }
 
-func (t *Tracker) TrackTransaction(endpoint RmrEndpoint, params *RMRParams, respReceived bool, forwardRespToXapp bool) (*Transaction, error) {
+func (t *Tracker) TrackTransaction(
+	endpoint *RmrEndpoint,
+	xid string,
+	meid *xapp.RMRMeid,
+	respReceived bool,
+	forwardRespToXapp bool) (*Transaction, error) {
+
+	if endpoint == nil {
+		err := fmt.Errorf("Tracker: No valid endpoint given")
+		return nil, err
+	}
 
 	trans := &Transaction{
 		tracker:           nil,
 		Subs:              nil,
-		RmrEndpoint:       endpoint,
-		Mtype:             params.Mtype,
-		Xid:               params.Xid,
-		OrigParams:        params,
+		RmrEndpoint:       *endpoint,
+		Xid:               xid,
+		Meid:              meid,
 		RespReceived:      respReceived,
 		ForwardRespToXapp: forwardRespToXapp,
 	}
@@ -52,14 +62,16 @@ func (t *Tracker) TrackTransaction(endpoint RmrEndpoint, params *RMRParams, resp
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 
-	xappkey := TransactionXappKey{endpoint, params.Xid}
-	if _, ok := t.transactionXappTable[xappkey]; ok {
-		err := fmt.Errorf("Tracker: Similar transaction with xappkey %s is ongoing, transaction %s not created ", xappkey, trans)
+	xappkey := TransactionXappKey{*endpoint, xid}
+	if othtrans, ok := t.transactionXappTable[xappkey]; ok {
+		err := fmt.Errorf("Tracker: %s is ongoing, %s not created ", othtrans, trans)
 		return nil, err
 	}
 
 	trans.tracker = t
 	t.transactionXappTable[xappkey] = trans
+	xapp.Logger.Info("Tracker: Create %s", trans.String())
+	xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
 	return trans, nil
 }
 
@@ -67,8 +79,10 @@ func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*Transaction,
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 	if trans, ok2 := t.transactionXappTable[xappKey]; ok2 {
+		xapp.Logger.Info("Tracker: Delete %s", trans.String())
 		delete(t.transactionXappTable, xappKey)
+		xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
 		return trans, nil
 	}
-	return nil, fmt.Errorf("Tracker: No record for xappkey %s", xappKey)
+	return nil, fmt.Errorf("Tracker: No record %s", xappKey)
 }