X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Ftransaction.go;h=c7ca81258eb02c7e8684e2137ca4cb1342a75836;hb=fbd4df5c352abde2ca4c0867f7471a0050242fdb;hp=56dff1d912ba3e0729b9d917c099f79c40c368ec;hpb=47942b4fd845472cd4f669bdcc5320be71f1570c;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/transaction.go b/pkg/control/transaction.go
index 56dff1d..c7ca812 100644
--- a/pkg/control/transaction.go
+++ b/pkg/control/transaction.go
@@ -52,7 +52,11 @@ type Transaction struct {
 }
 
 func (t *Transaction) String() string {
-	return "trans(" + strconv.FormatUint(uint64(t.Seq), 10) + "/" + t.Meid.RanName + ")"
+	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) {
@@ -125,7 +129,7 @@ func (t *TransactionSubs) Release() {
 //
 //-----------------------------------------------------------------------------
 type TransactionXappKey struct {
-	RmrEndpoint
+	xapp.RmrEndpoint
 	Xid string // xapp xid in req
 }
 
@@ -138,8 +142,8 @@ func (key *TransactionXappKey) String() string {
 //-----------------------------------------------------------------------------
 type TransactionXapp struct {
 	Transaction
-	XappKey *TransactionXappKey
-	SubId   uint32
+	XappKey   *TransactionXappKey
+	RequestId e2ap.RequestId
 }
 
 func (t *TransactionXapp) String() string {
@@ -147,10 +151,10 @@ 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() *RmrEndpoint {
+func (t *TransactionXapp) GetEndpoint() *xapp.RmrEndpoint {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 	if t.XappKey != nil {
@@ -180,7 +184,7 @@ func (t *TransactionXapp) GetSrc() string {
 func (t *TransactionXapp) GetSubId() uint32 {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	return t.SubId
+	return t.RequestId.InstanceId
 }
 
 func (t *TransactionXapp) Release() {