xapp-frame v0.8.2 integration to submgr

[ric-plt/submgr.git] / pkg / control / tracker.go

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index dfab96e..df3d56e 100644 (file)
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -21,84 +21,88 @@ package control
 
 import (
        "fmt"
+       "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "sync"
 )
 
-var trackerMutex = &sync.Mutex{}
-
-/*
-Implements a record of ongoing transactions and helper functions to CRUD the records.
-*/
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 type Tracker struct {
-       transactionTable map[TransactionKey]Transaction
+       mutex                sync.Mutex
+       transactionXappTable map[TransactionXappKey]*TransactionXapp
+       transSeq             uint64
 }
 
 func (t *Tracker) Init() {
-       t.transactionTable = make(map[TransactionKey]Transaction)
+       t.transactionXappTable = make(map[TransactionXappKey]*TransactionXapp)
 }
 
-/*
-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 {
-       trackerMutex.Lock()
-       defer trackerMutex.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
-       }
-       t.transactionTable[key] = xact
-       return nil
+func (t *Tracker) initTransaction(transBase *Transaction) {
+       t.mutex.Lock()
+       defer t.mutex.Unlock()
+       transBase.EventChan = make(chan interface{})
+       transBase.tracker = t
+       transBase.Seq = t.transSeq
+       t.transSeq++
 }
 
-/*
-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}
-       trackerMutex.Lock()
-       defer trackerMutex.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)
+func (t *Tracker) NewSubsTransaction(subs *Subscription) *TransactionSubs {
+       trans := &TransactionSubs{}
+       trans.Meid = subs.GetMeid()
+       t.initTransaction(&trans.Transaction)
+       xapp.Logger.Debug("CREATE %s", trans.String())
+       return trans
+}
+
+func (t *Tracker) NewXappTransaction(
+       endpoint *xapp.RmrEndpoint,
+       xid string,
+       requestId e2ap.RequestId,
+       meid *xapp.RMRMeid) *TransactionXapp {
+
+       trans := &TransactionXapp{}
+       trans.XappKey = &TransactionXappKey{requestId.Id, *endpoint, xid}
+       trans.Meid = meid
+       trans.RequestId = requestId
+       t.initTransaction(&trans.Transaction)
+       xapp.Logger.Debug("CREATE %s", trans.String())
+       return trans
+}
+
+func (t *Tracker) Track(trans *TransactionXapp) error {
+
+       if trans.GetEndpoint() == nil {
+               err := fmt.Errorf("Tracker: No valid endpoint given in %s", trans.String())
                return err
        }
-       t.transactionTable[key] = xact
-       return nil
-}
 
-/*
-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}
-       trackerMutex.Lock()
-       defer trackerMutex.Unlock()
-       var xact Transaction
-       if xact, ok := t.transactionTable[key]; ok {
-               return xact, nil
+       t.mutex.Lock()
+       defer t.mutex.Unlock()
+
+       theKey := *trans.XappKey
+
+       if othtrans, ok := t.transactionXappTable[theKey]; ok {
+               err := fmt.Errorf("Tracker: %s is ongoing, not tracking %s", othtrans, trans)
+               return 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[theKey] = trans
+       xapp.Logger.Debug("Tracker: Append %s", trans.String())
+       //xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
+       return 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
-       trackerMutex.Lock()
-       defer trackerMutex.Unlock()
-       if xact, ok := t.transactionTable[key]; ok {
-               delete(t.transactionTable, key)
-               return xact, nil
+func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*TransactionXapp, error) {
+       t.mutex.Lock()
+       defer t.mutex.Unlock()
+       if trans, ok2 := t.transactionXappTable[xappKey]; ok2 {
+               xapp.Logger.Debug("Tracker: Remove %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 %v", xappKey)
 }