X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftracker.go;h=df3d56e4bf4685feb98f8ee5bad7660c8ad99fd9;hb=HEAD;hp=65f816ee6cd037a193d67c7ae0211fc742d95b13;hpb=379ff082446038f3dee0f22d4f79c0965e9da25a;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 65f816e..df3d56e 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -21,101 +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"
 )
 
-type TransactionKey struct {
-	SubID     uint16 // subscription id / sequence number
-	TransType Action // action ongoing (CREATE/DELETE etc)
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type Tracker struct {
+	mutex                sync.Mutex
+	transactionXappTable map[TransactionXappKey]*TransactionXapp
+	transSeq             uint64
 }
 
-type TransactionXappKey struct {
-	Addr string // xapp addr
-	Port uint16 // xapp port
-	Xid  string // xapp xid in req
+func (t *Tracker) Init() {
+	t.transactionXappTable = make(map[TransactionXappKey]*TransactionXapp)
 }
 
-type Transaction struct {
-	tracker    *Tracker           // tracker instance
-	Key        TransactionKey     // action key
-	Xappkey    TransactionXappKey // transaction key
-	OrigParams *xapp.RMRParams    // request orginal params
+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++
 }
 
-func (t *Transaction) SubRouteInfo() SubRouteInfo {
-	return SubRouteInfo{t.Key.TransType, t.Xappkey.Addr, t.Xappkey.Port, t.Key.SubID}
+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
 }
 
-/*
-Implements a record of ongoing transactions and helper functions to CRUD the records.
-*/
-type Tracker struct {
-	transactionTable     map[TransactionKey]*Transaction
-	transactionXappTable map[TransactionXappKey]*Transaction
-	mutex                sync.Mutex
-}
+func (t *Tracker) NewXappTransaction(
+	endpoint *xapp.RmrEndpoint,
+	xid string,
+	requestId e2ap.RequestId,
+	meid *xapp.RMRMeid) *TransactionXapp {
 
-func (t *Tracker) Init() {
-	t.transactionTable = make(map[TransactionKey]*Transaction)
-	t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
+	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
 }
 
-/*
-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(subID uint16, act Action, addr string, port uint16, params *xapp.RMRParams) (*Transaction, error) {
-	key := TransactionKey{subID, act}
-	xappkey := TransactionXappKey{addr, port, params.Xid}
-	trans := &Transaction{t, key, xappkey, params}
-	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 nil, err
-	}
-	if _, ok := t.transactionXappTable[xappkey]; 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 xapp key %v is ongoing", xappkey)
-		return nil, err
+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] = trans
-	t.transactionXappTable[xappkey] = trans
-	return trans, 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}
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	if trans, ok := t.transactionTable[key]; ok {
-		return trans, nil
+
+	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 nil, 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}
+func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*TransactionXapp, error) {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	if trans, ok1 := t.transactionTable[key]; ok1 {
-		if _, ok2 := t.transactionXappTable[trans.Xappkey]; ok2 {
-			delete(t.transactionXappTable, trans.Xappkey)
-		}
-		delete(t.transactionTable, key)
+	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 nil, err
+	return nil, fmt.Errorf("Tracker: No record %v", xappKey)
 }