Use packed data to store cache encoded message

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

diff --git a/pkg/control/transaction.go b/pkg/control/transaction.go
index 2f4acab..b0da077 100644 (file)
--- a/pkg/control/transaction.go
+++ b/pkg/control/transaction.go
@@ -20,6 +20,9 @@
 package control
 
 import (
+       "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
+       "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/packer"
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "strconv"
        "sync"
 )
@@ -41,12 +44,19 @@ func (key *TransactionXappKey) String() string {
 //-----------------------------------------------------------------------------
 type Transaction struct {
        mutex             sync.Mutex
-       tracker           *Tracker // tracker instance
-       Subs              *Subscription
-       RmrEndpoint       RmrEndpoint
-       Mtype             int
-       Xid               string     // xapp xid in req
-       OrigParams        *RMRParams // request orginal params
+       tracker           *Tracker                             //tracker instance
+       Subs              *Subscription                        //related subscription
+       RmrEndpoint       RmrEndpoint                          //xapp endpoint
+       Mtype             int                                  //type of initiating message
+       Xid               string                               //xapp xid in req
+       Meid              *xapp.RMRMeid                        //meid transaction related
+       SubReqMsg         *e2ap.E2APSubscriptionRequest        //SubReq TODO: maybe own transactions per type
+       SubRespMsg        *e2ap.E2APSubscriptionResponse       //SubResp TODO: maybe own transactions per type
+       SubFailMsg        *e2ap.E2APSubscriptionFailure        //SubFail TODO: maybe own transactions per type
+       SubDelReqMsg      *e2ap.E2APSubscriptionDeleteRequest  //SubDelReq TODO: maybe own transactions per type
+       SubDelRespMsg     *e2ap.E2APSubscriptionDeleteResponse //SubDelResp TODO: maybe own transactions per type
+       SubDelFailMsg     *e2ap.E2APSubscriptionDeleteFailure  //SubDelFail TODO: maybe own transactions per type
+       Payload           *packer.PackedData                   //Encoded message to be send. Optimized
        RespReceived      bool
        ForwardRespToXapp bool
 }
@@ -73,6 +83,15 @@ func (t *Transaction) GetMtype() int {
        return t.Mtype
 }
 
+func (t *Transaction) GetMeid() *xapp.RMRMeid {
+       t.mutex.Lock()
+       defer t.mutex.Unlock()
+       if t.Meid != nil {
+               return t.Meid
+       }
+       return nil
+}
+
 func (t *Transaction) GetSrc() string {
        t.mutex.Lock()
        defer t.mutex.Unlock()
@@ -96,6 +115,7 @@ func (t *Transaction) RetryTransaction() {
 }
 
 func (t *Transaction) Release() {
+       xapp.Logger.Info("Transaction: Releasing %s", t)
        t.mutex.Lock()
        defer t.mutex.Unlock()
        if t.Subs != nil {