Submgr v0.7.2

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

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index bd062da..fdbbeaf 100644 (file)
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -28,14 +28,18 @@ import (
 Implements a record of ongoing transactions and helper functions to CRUD the records.
 */
 type Tracker struct {
-       transaction_table map[Transaction_key]*Transaction
+       transaction_table map[Transaction_key]Transaction
+}
+
+func (t *Tracker) Init() {
+       t.transaction_table = make(map[Transaction_key]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{
+func (t *Tracker) Track_transaction(key Transaction_key, xact Transaction) error{
        if _, ok := t.transaction_table[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 )
@@ -49,25 +53,28 @@ 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){
+func (t *Tracker) Retrive_transaction(subID uint16, act Action) (Transaction, error){
        key := Transaction_key{subID, act}
+       var xact Transaction
        if xact, ok := t.transaction_table[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
+       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){
+func (t *Tracker) complete_transaction(subID uint16, act Action) (string, uint16, error){
        key := Transaction_key{subID, act}
+       var empty_address string
+       var empty_port uint16
        if xact, ok := t.transaction_table[key]; ok {
                delete(t.transaction_table, key)
-               return &(xact.Xapp_instance_address), &(xact.Xapp_port), nil
+               return xact.Xapp_instance_address, xact.Xapp_port, nil
        }
        err := fmt.Errorf("Tranaction record for Subscription ID %d and action %s does not exist", subID, act)
-       return nil, nil, err
+       return empty_address, empty_port, err
 }