X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftracker.go;h=11d2cf7784b001de15295694f38b12565c5f40c2;hb=63284a2eed02f5bfec0a237f83aae95adc702c43;hp=087b7811a22f2bb9710aa47bba528829a911a5d3;hpb=0388dd945789dae802aaa93c5062e3ae4c45ddf1;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 087b781..11d2cf7 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -37,14 +37,24 @@ func (t *Tracker) Init() {
 	t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
 }
 
-func (t *Tracker) TrackTransaction(subs *Subscription, endpoint RmrEndpoint, params *xapp.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,
-		Xid:               params.Xid,
-		OrigParams:        params,
+		RmrEndpoint:       *endpoint,
+		Xid:               xid,
+		Meid:              meid,
 		RespReceived:      respReceived,
 		ForwardRespToXapp: forwardRespToXapp,
 	}
@@ -52,16 +62,12 @@ func (t *Tracker) TrackTransaction(subs *Subscription, endpoint RmrEndpoint, par
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 
-	xappkey := TransactionXappKey{endpoint, params.Xid}
+	xappkey := TransactionXappKey{*endpoint, xid}
 	if _, ok := t.transactionXappTable[xappkey]; ok {
 		err := fmt.Errorf("Tracker: Similar transaction with xappkey %s is ongoing, transaction %s not created ", xappkey, trans)
 		return nil, err
 	}
 
-	err := subs.SetTransaction(trans)
-	if err != nil {
-		return nil, err
-	}
 	trans.tracker = t
 	t.transactionXappTable[xappkey] = trans
 	return trans, nil