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

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 1682ae7..c16a76a 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -21,83 +21,83 @@ package control
 
 import (
 	"fmt"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"sync"
 )
 
-/*
-Implements a record of ongoing transactions and helper functions to CRUD the records.
-*/
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 type Tracker struct {
-	transactionTable map[TransactionKey]Transaction
-	mutex            sync.Mutex
+	mutex                sync.Mutex
+	transactionXappTable map[TransactionXappKey]*Transaction
+	transSeq             uint64
 }
 
 func (t *Tracker) Init() {
-	t.transactionTable = make(map[TransactionKey]Transaction)
+	t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
 }
 
-/*
-Checks if a tranascation with similar type has been ongoing. If not then creates one.
-Returns error if there is similar transatcion ongoing.
-*/
-func (t *Tracker) TrackTransaction(key TransactionKey, xact Transaction) error {
+func (t *Tracker) NewTransactionFromSkel(transSkel *Transaction) *Transaction {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	if _, ok := t.transactionTable[key]; ok {
-		// TODO: Implement merge related check here. If the key is same but the value is different.
-		err := fmt.Errorf("transaction tracker: Similar transaction with sub id %d and type %s is ongoing", key.SubID, key.transType)
-		return err
+	trans := transSkel
+	if trans == nil {
+		trans = &Transaction{}
 	}
-	t.transactionTable[key] = xact
-	return nil
+	trans.EventChan = make(chan interface{})
+	trans.tracker = t
+	trans.Seq = t.transSeq
+	t.transSeq++
+	xapp.Logger.Debug("Transaction: Create %s", trans.String())
+	return trans
 }
 
-/*
-Retreives the transaction table entry for the given request.
-Returns error in case the transaction cannot be found.
-*/
-func (t *Tracker) UpdateTransaction(SubID uint16, transType Action, xact Transaction) error {
-	key := TransactionKey{SubID, transType}
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-	if _, ok := t.transactionTable[key]; ok {
-		// TODO: Implement merge related check here. If the key is same but the value is different.
-		err := fmt.Errorf("transaction tracker: Similar transaction with sub id %d and type %v is ongoing", key.SubID, key.transType)
-		return err
-	}
-	t.transactionTable[key] = xact
-	return nil
+func (t *Tracker) NewTransaction(meid *xapp.RMRMeid) *Transaction {
+	trans := &Transaction{}
+	trans.Meid = meid
+	trans = t.NewTransactionFromSkel(trans)
+	return trans
 }
 
-/*
-Retreives the transaction table entry for the given request.
-Returns error in case the transaction cannot be found.
-*/
-func (t *Tracker) RetriveTransaction(subID uint16, act Action) (Transaction, error) {
-	key := TransactionKey{subID, act}
+func (t *Tracker) TrackTransaction(
+	endpoint *RmrEndpoint,
+	xid string,
+	meid *xapp.RMRMeid) (*Transaction, error) {
+
+	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()
-	var xact Transaction
-	if xact, ok := t.transactionTable[key]; ok {
-		return xact, nil
+
+	if othtrans, ok := t.transactionXappTable[*trans.XappKey]; ok {
+		err := fmt.Errorf("Tracker: %s is ongoing, %s not created ", othtrans, trans)
+		return nil, err
 	}
-	err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
-	return xact, err
+
+	trans.tracker = t
+	t.transactionXappTable[*trans.XappKey] = trans
+	xapp.Logger.Debug("Tracker: Add %s", trans.String())
+	//xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
+	return trans, nil
 }
 
-/*
-Deletes the transaction table entry for the given request and returns the deleted xapp's address and port for reference.
-Returns error in case the transaction cannot be found.
-*/
-func (t *Tracker) completeTransaction(subID uint16, act Action) (Transaction, error) {
-	key := TransactionKey{subID, act}
-	var emptyTransaction Transaction
+func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*Transaction, error) {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	if xact, ok := t.transactionTable[key]; ok {
-		delete(t.transactionTable, key)
-		return xact, nil
+	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
 	}
-	err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
-	return emptyTransaction, err
+	return nil, fmt.Errorf("Tracker: No record %s", xappKey)
 }