X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftracker.go;h=9b984a38799c48b36f338efb18a99a1b1c151879;hb=90fa02136dc7e56db75ce353e69571eb3cb0eb69;hp=bd062da9fa2ef4e520f7a7c685732ff1a73e047c;hpb=93cc3e245f87798c8753209980817727e0648401;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index bd062da..9b984a3 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -21,27 +21,34 @@ 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 {
-	transaction_table map[Transaction_key]*Transaction
+	transactionTable map[TransactionKey]Transaction
+	mutex sync.Mutex
+}
+
+func (t *Tracker) Init() {
+	t.transactionTable = make(map[TransactionKey]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) Track_transaction(key Transaction_key, xact *Transaction) error{
-	if _, ok := t.transaction_table[key]; ok {
+func (t *Tracker) TrackTransaction(key TransactionKey, xact Transaction) error {
+	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.trans_type )
+		err := fmt.Errorf("transaction tracker: Similar transaction with sub id %d and type %s is ongoing", key.SubID, key.transType)
 		return err
 	}
-	t.transaction_table[key] = xact
+	t.transactionTable[key] = xact
 	return nil
 }
 
@@ -49,25 +56,48 @@ func (t *Tracker) Track_transaction(key Transaction_key, xact *Transaction) erro
 Retreives the transaction table entry for the given request.
 Returns error in case the transaction cannot be found.
 */
-func (t *Tracker) Retrive_transaction(subID uint16, act Action) (*Transaction, error){
-	key := Transaction_key{subID, act}
-	if xact, ok := t.transaction_table[key]; ok {
+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
+}
+
+/*
+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()
+	var xact Transaction
+	if xact, ok := t.transactionTable[key]; ok {
 		return xact, nil
 	}
-	err := fmt.Errorf("Tranaction record for Subscription ID %d and action %s does not exist", subID, act)
-	return nil, err
+	err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
+	return xact, 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) complete_transaction(subID uint16, act Action) (*string, *uint16, error){
-	key := Transaction_key{subID, act}
-	if xact, ok := t.transaction_table[key]; ok {
-		delete(t.transaction_table, key)
-		return &(xact.Xapp_instance_address), &(xact.Xapp_port), nil
+func (t *Tracker) completeTransaction(subID uint16, act Action) (Transaction, error) {
+	key := TransactionKey{subID, act}
+	var emptyTransaction Transaction
+	t.mutex.Lock()
+	defer t.mutex.Unlock()
+	if xact, ok := t.transactionTable[key]; ok {
+		delete(t.transactionTable, key)
+		return xact, nil
 	}
-	err := fmt.Errorf("Tranaction record for Subscription ID %d and action %s does not exist", subID, act)
-	return nil, nil, err
+	err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
+	return emptyTransaction, err
 }