RICPLT-2801, RICPLT-2802
Change-Id: I750c3e404cbe9f1c0d8daa4f4ae30bc5f3964b8c
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>
diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 65f816e..584b331 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -37,10 +37,12 @@
}
type Transaction struct {
- tracker *Tracker // tracker instance
- Key TransactionKey // action key
- Xappkey TransactionXappKey // transaction key
- OrigParams *xapp.RMRParams // request orginal params
+ 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 {
@@ -65,10 +67,10 @@
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) {
+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}
+ trans := &Transaction{t, key, xappkey, params, respReceived, forwardRespToXapp}
t.mutex.Lock()
defer t.mutex.Unlock()
if _, ok := t.transactionTable[key]; ok {
@@ -87,7 +89,7 @@
}
/*
-Retreives the transaction table entry for the given request.
+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) {
@@ -119,3 +121,39 @@
err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
return nil, err
}
+
+/*
+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}
+ 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
+ }
+ err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
+ return nil, false, err
+}
+
+/*
+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}
+ t.mutex.Lock()
+ defer t.mutex.Unlock()
+ if trans, ok := t.transactionTable[key]; ok {
+ trans.RespReceived = false
+ return nil
+ }
+ err := fmt.Errorf("transaction record for Subscription ID %d and action %s does not exist", subID, act)
+ return err
+}