X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftransaction.go;h=d922d18426a01270f1d302da0f2fb2c9956cb36a;hb=3f7becc8a1e15c5b69dfd95d86b9b7308b3e1c5e;hp=56dff1d912ba3e0729b9d917c099f79c40c368ec;hpb=47942b4fd845472cd4f669bdcc5320be71f1570c;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/transaction.go b/pkg/control/transaction.go index 56dff1d..d922d18 100644 --- a/pkg/control/transaction.go +++ b/pkg/control/transaction.go @@ -21,6 +21,7 @@ package control import ( "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" + "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/xapptweaks" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" "strconv" "sync" @@ -52,7 +53,7 @@ type Transaction struct { } func (t *Transaction) String() string { - return "trans(" + strconv.FormatUint(uint64(t.Seq), 10) + "/" + t.Meid.RanName + ")" + return "trans(" + strconv.FormatUint(uint64(t.Seq), 10) + "/" + (&xapptweaks.RMRMeid{t.Meid}).String() + ")" } func (t *Transaction) SendEvent(event interface{}, waittime time.Duration) (bool, bool) { @@ -125,7 +126,7 @@ func (t *TransactionSubs) Release() { // //----------------------------------------------------------------------------- type TransactionXappKey struct { - RmrEndpoint + xapptweaks.RmrEndpoint Xid string // xapp xid in req } @@ -150,7 +151,7 @@ func (t *TransactionXapp) String() string { return "transxapp(" + t.Transaction.String() + "/" + transkey + "/" + strconv.FormatUint(uint64(t.SubId), 10) + ")" } -func (t *TransactionXapp) GetEndpoint() *RmrEndpoint { +func (t *TransactionXapp) GetEndpoint() *xapptweaks.RmrEndpoint { t.mutex.Lock() defer t.mutex.Unlock() if t.XappKey != nil {