X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftransaction.go;h=f3d5c17699f0ff3056a6c093e818e4236c205b36;hb=cb7dd49aa5f40a880b37a6bc35c972ef2773c164;hp=f722d11d368cc6cf2584fe4e4a62d6f0dcedbc8e;hpb=9dc5adc78d459157a42ef8997eeced82a3616f01;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/transaction.go b/pkg/control/transaction.go
index f722d11..f3d5c17 100644
--- a/pkg/control/transaction.go
+++ b/pkg/control/transaction.go
@@ -20,11 +20,12 @@
 package control
 
 import (
-	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"strconv"
 	"sync"
 	"time"
+
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 )
 
 //-----------------------------------------------------------------------------
@@ -101,12 +102,13 @@ func (t *Transaction) GetMeid() *xapp.RMRMeid {
 	return nil
 }
 
+/*  // This function is not used. Commented out to get better test coverage result
 func (t *Transaction) GetPayload() *e2ap.PackedData {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 	return t.Payload
 }
-
+*/
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -129,6 +131,7 @@ func (t *TransactionSubs) Release() {
 //
 //-----------------------------------------------------------------------------
 type TransactionXappKey struct {
+	InstanceID uint32
 	xapp.RmrEndpoint
 	Xid string // xapp xid in req
 }
@@ -142,8 +145,8 @@ func (key *TransactionXappKey) String() string {
 //-----------------------------------------------------------------------------
 type TransactionXapp struct {
 	Transaction
-	XappKey *TransactionXappKey
-	SubId   uint32
+	XappKey   *TransactionXappKey
+	RequestId e2ap.RequestId
 }
 
 func (t *TransactionXapp) String() string {
@@ -151,7 +154,7 @@ 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() *xapp.RmrEndpoint {
@@ -172,6 +175,7 @@ func (t *TransactionXapp) GetXid() string {
 	return ""
 }
 
+/*  // This function is not used. Commented out to get better test coverage result
 func (t *TransactionXapp) GetSrc() string {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
@@ -180,11 +184,11 @@ func (t *TransactionXapp) GetSrc() string {
 	}
 	return ""
 }
-
+*/
 func (t *TransactionXapp) GetSubId() uint32 {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	return t.SubId
+	return t.RequestId.InstanceId
 }
 
 func (t *TransactionXapp) Release() {