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 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
- RespReceived bool
- ForwardRespToXapp bool
-}
-
-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]*TransactionXapp
+ transSeq uint64
}
func (t *Tracker) Init() {
- t.transactionTable = make(map[TransactionKey]*Transaction)
- t.transactionXappTable = make(map[TransactionXappKey]*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(subID uint16, act Action, addr string, port uint16, params *xapp.RMRParams, respReceived bool, forwardRespToXapp bool) (*Transaction, error) {
- key := TransactionKey{subID, act}
- xappkey := TransactionXappKey{addr, port, params.Xid}
- trans := &Transaction{t, key, xappkey, params, respReceived, forwardRespToXapp}
+func (t *Tracker) initTransaction(transBase *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 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
- }
- t.transactionTable[key] = trans
- t.transactionXappTable[xappkey] = trans
- return trans, nil
+ transBase.EventChan = make(chan interface{})
+ transBase.tracker = t
+ transBase.Seq = t.transSeq
+ t.transSeq++
}
-/*
-Retreives the transaction table entry for the given request. Controls that only one response is sent to xapp.
-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
+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
}
-/*
-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}
- 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)
- return trans, nil
- }
- err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
- return nil, err
+func (t *Tracker) NewXappTransaction(
+ endpoint *xapp.RmrEndpoint,
+ xid string,
+ requestId e2ap.RequestId,
+ meid *xapp.RMRMeid) *TransactionXapp {
+
+ trans := &TransactionXapp{}
+ trans.XappKey = &TransactionXappKey{*endpoint, xid}
+ trans.Meid = meid
+ trans.RequestId = requestId
+ t.initTransaction(&trans.Transaction)
+ xapp.Logger.Debug("CREATE %s", trans.String())
+ return trans
}
-/*
-Makes possible to to detect has response already received from BTS
-Returns error in case the transaction cannot be found.
-*/
-func (t *Tracker) CheckResponseReceived(subID uint16, act Action) (*Transaction, bool, error) {
- key := TransactionKey{subID, act}
+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.mutex.Lock()
defer t.mutex.Unlock()
- if trans, ok := t.transactionTable[key]; ok {
- if trans.RespReceived == false {
- trans.RespReceived = true
- // This is used to control that only one response action (success response, failure or timer) is excecuted for the transaction
- return trans, false, nil
- }
- return trans, true, 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, false, 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
}
-/*
-Makes possible to receive response to retransmitted request to BTS
-Returns error in case the transaction cannot be found.
-*/
-func (t *Tracker) RetryTransaction(subID uint16, act Action) error {
- key := TransactionKey{subID, act}
+func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*TransactionXapp, error) {
t.mutex.Lock()
defer t.mutex.Unlock()
- if trans, ok := t.transactionTable[key]; ok {
- trans.RespReceived = false
- return nil
+ 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 err
+ return nil, fmt.Errorf("Tracker: No record %s", xappKey)
}
Code Review / ric-plt / submgr.git / blobdiff