RICPLT-2962 Preparation for subs merge

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

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 65f816e..869e8ca 100644 (file)
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -21,101 +21,54 @@ package control
 
 import (
        "fmt"
-       "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 TransactionXappKey struct {
-       Addr string // xapp addr
-       Port uint16 // xapp port
-       Xid  string // xapp xid in req
-}
-
-type Transaction struct {
-       tracker    *Tracker           // tracker instance
-       Key        TransactionKey     // action key
-       Xappkey    TransactionXappKey // transaction key
-       OrigParams *xapp.RMRParams    // request orginal params
-}
-
-func (t *Transaction) SubRouteInfo() SubRouteInfo {
-       return SubRouteInfo{t.Key.TransType, t.Xappkey.Addr, t.Xappkey.Port, t.Key.SubID}
-}
-
-/*
-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
+       transactionXappTable map[TransactionXappKey]*Transaction
 }
 
 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(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}
+func (t *Tracker) TrackTransaction(endpoint RmrEndpoint, params *RMRParams, respReceived bool, forwardRespToXapp bool) (*Transaction, error) {
+
+       trans := &Transaction{
+               tracker:           nil,
+               Subs:              nil,
+               RmrEndpoint:       endpoint,
+               Mtype:             params.Mtype,
+               Xid:               params.Xid,
+               OrigParams:        params,
+               RespReceived:      respReceived,
+               ForwardRespToXapp: forwardRespToXapp,
+       }
+
        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
-       }
+
+       xappkey := TransactionXappKey{endpoint, params.Xid}
        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)
+               err := fmt.Errorf("Tracker: Similar transaction with xappkey %s is ongoing, transaction %s not created ", xappkey, trans)
                return nil, err
        }
-       t.transactionTable[key] = trans
+
+       trans.tracker = t
        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
-       }
-       err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
-       return nil, err
-}
-
-/*
-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) (*Transaction, 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 {
+               delete(t.transactionXappTable, xappKey)
                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 for xappkey %s", xappKey)
 }