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

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 087b781..c16a76a 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -31,39 +31,62 @@ import (
 type Tracker struct {
 	mutex                sync.Mutex
 	transactionXappTable map[TransactionXappKey]*Transaction
+	transSeq             uint64
 }
 
 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) NewTransactionFromSkel(transSkel *Transaction) *Transaction {
+	t.mutex.Lock()
+	defer t.mutex.Unlock()
+	trans := transSkel
+	if trans == nil {
+		trans = &Transaction{}
+	}
+	trans.EventChan = make(chan interface{})
+	trans.tracker = t
+	trans.Seq = t.transSeq
+	t.transSeq++
+	xapp.Logger.Debug("Transaction: Create %s", trans.String())
+	return trans
+}
+
+func (t *Tracker) NewTransaction(meid *xapp.RMRMeid) *Transaction {
+	trans := &Transaction{}
+	trans.Meid = meid
+	trans = t.NewTransactionFromSkel(trans)
+	return trans
+}
+
+func (t *Tracker) TrackTransaction(
+	endpoint *RmrEndpoint,
+	xid string,
+	meid *xapp.RMRMeid) (*Transaction, error) {
 
-	trans := &Transaction{
-		tracker:           nil,
-		Subs:              nil,
-		RmrEndpoint:       endpoint,
-		Xid:               params.Xid,
-		OrigParams:        params,
-		RespReceived:      respReceived,
-		ForwardRespToXapp: forwardRespToXapp,
+	if endpoint == nil {
+		err := fmt.Errorf("Tracker: No valid endpoint given")
+		return nil, err
 	}
 
+	trans := &Transaction{}
+	trans.XappKey = &TransactionXappKey{*endpoint, xid}
+	trans.Meid = meid
+	trans = t.NewTransactionFromSkel(trans)
+
 	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)
+	if othtrans, ok := t.transactionXappTable[*trans.XappKey]; ok {
+		err := fmt.Errorf("Tracker: %s is ongoing, %s not created ", othtrans, trans)
 		return nil, err
 	}
 
-	err := subs.SetTransaction(trans)
-	if err != nil {
-		return nil, err
-	}
 	trans.tracker = t
-	t.transactionXappTable[xappkey] = trans
+	t.transactionXappTable[*trans.XappKey] = trans
+	xapp.Logger.Debug("Tracker: Add %s", trans.String())
+	//xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
 	return trans, nil
 }
 
@@ -71,8 +94,10 @@ func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*Transaction,
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 	if trans, ok2 := t.transactionXappTable[xappKey]; ok2 {
+		xapp.Logger.Debug("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)
 }