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"
}
func (t *Transaction) String() string {
- return "trans(" + strconv.FormatUint(uint64(t.Seq), 10) + "/" + (&xapptweaks.RMRMeid{t.Meid}).String() + ")"
+ meidstr := "N/A"
+ if t.Meid != nil {
+ meidstr = t.Meid.String()
+ }
+ return "trans(" + strconv.FormatUint(uint64(t.Seq), 10) + "/" + meidstr + ")"
}
func (t *Transaction) SendEvent(event interface{}, waittime time.Duration) (bool, bool) {
//
//-----------------------------------------------------------------------------
type TransactionXappKey struct {
- xapptweaks.RmrEndpoint
+ xapp.RmrEndpoint
Xid string // xapp xid in req
}
//-----------------------------------------------------------------------------
type TransactionXapp struct {
Transaction
- XappKey *TransactionXappKey
- SubId uint32
+ XappKey *TransactionXappKey
+ RequestId e2ap.RequestId
}
func (t *TransactionXapp) String() string {
if t.XappKey != nil {
transkey = t.XappKey.String()
}
- return "transxapp(" + t.Transaction.String() + "/" + transkey + "/" + strconv.FormatUint(uint64(t.SubId), 10) + ")"
+ return "transxapp(" + t.Transaction.String() + "/" + transkey + "/" + strconv.FormatUint(uint64(t.RequestId.InstanceId), 10) + ")"
}
-func (t *TransactionXapp) GetEndpoint() *xapptweaks.RmrEndpoint {
+func (t *TransactionXapp) GetEndpoint() *xapp.RmrEndpoint {
t.mutex.Lock()
defer t.mutex.Unlock()
if t.XappKey != nil {
func (t *TransactionXapp) GetSubId() uint32 {
t.mutex.Lock()
defer t.mutex.Unlock()
- return t.SubId
+ return t.RequestId.InstanceId
}
func (t *TransactionXapp) Release() {