X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fmain_test.go;h=155f92ceb9086399e540b2846532858932226082;hb=a189c866d786c2dbde19d34d9dd2404e17b3e407;hp=1c69b0110d40fb3c56192d042d3e243b55d6ca08;hpb=bf2f4122f6bf89fc572f6c4cad5f0c4108a996e0;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/main_test.go b/pkg/control/main_test.go
index 1c69b01..155f92c 100644
--- a/pkg/control/main_test.go
+++ b/pkg/control/main_test.go
@@ -117,24 +117,39 @@ func initTestingMessageChannel() testingMessageChannel {
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+type xappTransaction struct {
+	tc   *testingXappControl
+	xid  string
+	meid *xapp.RMRMeid
+}
 
 type testingXappControl struct {
 	testingRmrControl
 	testingMessageChannel
-	meid    *xapp.RMRMeid
 	xid_seq uint64
-	xid     string
 }
 
 func (tc *testingXappControl) newXid() string {
-	tc.xid = tc.desc + "_XID_" + strconv.FormatUint(uint64(tc.xid_seq), 10)
+	var xid string
+	xid = tc.desc + "_XID_" + strconv.FormatUint(uint64(tc.xid_seq), 10)
 	tc.xid_seq++
-	return tc.xid
+	return xid
+}
+
+func (tc *testingXappControl) newXappTransaction(xid *string, ranname string) *xappTransaction {
+	trans := &xappTransaction{}
+	trans.tc = tc
+	if xid == nil {
+		trans.xid = tc.newXid()
+	} else {
+		trans.xid = *xid
+	}
+	trans.meid = &xapp.RMRMeid{RanName: ranname}
+	return trans
 }
 
 func (tc *testingXappControl) Consume(msg *xapp.RMRParams) (err error) {
 
-	//if msg.Xid == tc.xid {
 	if strings.Contains(msg.Xid, tc.desc) {
 		xapp.Logger.Info("(%s) Consume mtype=%s subid=%d xid=%s", tc.desc, xapp.RicMessageTypeToName[msg.Mtype], msg.SubId, msg.Xid)
 		tc.rmrConChan <- msg
@@ -144,13 +159,11 @@ func (tc *testingXappControl) Consume(msg *xapp.RMRParams) (err error) {
 	return
 }
 
-func createNewXappControl(desc string, rtfile string, port string, stat string, ranname string) *testingXappControl {
+func createNewXappControl(desc string, rtfile string, port string, stat string) *testingXappControl {
 	xappCtrl := &testingXappControl{}
 	xappCtrl.testingRmrControl = initTestingRmrControl(desc, rtfile, port, stat, xappCtrl)
 	xappCtrl.testingMessageChannel = initTestingMessageChannel()
-	xappCtrl.meid = &xapp.RMRMeid{RanName: ranname}
-	xappCtrl.xid_seq = 0
-	xappCtrl.newXid()
+	xappCtrl.xid_seq = 1
 	return xappCtrl
 }
 
@@ -312,7 +325,7 @@ newrt|end
 
 	xapprtfilename1, _ := testCreateTmpFile(xapprt1)
 	defer os.Remove(xapprtfilename1)
-	xappConn1 = createNewXappControl("xappConn1", xapprtfilename1, "13560", "RMRXAPP1STUB", "RAN_NAME_1")
+	xappConn1 = createNewXappControl("xappstub1", xapprtfilename1, "13560", "RMRXAPP1STUB")
 
 	//---------------------------------
 	//
@@ -332,7 +345,7 @@ newrt|end
 
 	xapprtfilename2, _ := testCreateTmpFile(xapprt2)
 	defer os.Remove(xapprtfilename2)
-	xappConn2 = createNewXappControl("xappConn2", xapprtfilename2, "13660", "RMRXAPP2STUB", "RAN_NAME_1")
+	xappConn2 = createNewXappControl("xappstub2", xapprtfilename2, "13660", "RMRXAPP2STUB")
 
 	//---------------------------------
 	//
@@ -351,7 +364,7 @@ newrt|end
 
 	e2termrtfilename, _ := testCreateTmpFile(e2termrt)
 	defer os.Remove(e2termrtfilename)
-	e2termConn = createNewE2termControl("e2termConn", e2termrtfilename, "15560", "RMRE2TERMSTUB")
+	e2termConn = createNewE2termControl("e2termstub", e2termrtfilename, "15560", "RMRE2TERMSTUB")
 
 	//---------------------------------
 	//