X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fmessaging_test.go;h=2f7bc4a580614d2f591d0e861e45433dae716412;hb=refs%2Fchanges%2F45%2F2245%2F1;hp=1b50c8b9c52fa8cd0eb689dccf30c2cd0807536c;hpb=e406a34d5547107533e65ddfbb2074e96d77b4b3;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/messaging_test.go b/pkg/control/messaging_test.go
index 1b50c8b..2f7bc4a 100644
--- a/pkg/control/messaging_test.go
+++ b/pkg/control/messaging_test.go
@@ -548,24 +548,24 @@ func (mc *testingMainControl) wait_subs_trans_clean(t *testing.T, e2SubsId int,
 	return false
 }
 
-func (mc *testingMainControl) get_seqcnt(t *testing.T) uint16 {
+func (mc *testingMainControl) get_subid(t *testing.T) uint16 {
 	mc.c.registry.mutex.Lock()
 	defer mc.c.registry.mutex.Unlock()
-	return mc.c.registry.counter
+	return mc.c.registry.subIds[0]
 }
 
-func (mc *testingMainControl) wait_seqcnt_change(t *testing.T, orig uint16, secs int) (uint16, bool) {
+func (mc *testingMainControl) wait_subid_change(t *testing.T, origSubId uint16, secs int) (uint16, bool) {
 	i := 1
 	for ; i <= secs*2; i++ {
 		mc.c.registry.mutex.Lock()
-		curr := mc.c.registry.counter
+		currSubId := mc.c.registry.subIds[0]
 		mc.c.registry.mutex.Unlock()
-		if curr != orig {
-			return curr, true
+		if currSubId != origSubId {
+			return currSubId, true
 		}
 		time.Sleep(500 * time.Millisecond)
 	}
-	testError(t, "(general) no seq change within %d secs", secs)
+	testError(t, "(general) no subId change within %d secs", secs)
 	return 0, false
 }
 
@@ -622,8 +622,11 @@ func (mc *testingMainControl) wait_msgcounter_change(t *testing.T, orig uint64,
 //-----------------------------------------------------------------------------
 func TestSubReqAndSubDelOk(t *testing.T) {
 	xapp.Logger.Info("TestSubReqAndSubDelOk")
+	rtmgrHttp.UseChannel(true)
 
 	cretrans := xappConn1.handle_xapp_subs_req(t, nil)
+	msg := rtmgrHttp.WaitReq(t)
+	msg.RetOk()
 	crereq, cremsg := e2termConn.handle_e2term_subs_req(t)
 	e2termConn.handle_e2term_subs_resp(t, crereq, cremsg)
 	e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans)
@@ -633,8 +636,12 @@ func TestSubReqAndSubDelOk(t *testing.T) {
 	e2termConn.handle_e2term_subs_del_resp(t, delreq, delmsg)
 	xappConn1.handle_xapp_subs_del_resp(t, deltrans)
 
+	msg = rtmgrHttp.WaitReq(t)
+	msg.RetOk()
+
 	//Wait that subs is cleaned
 	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+	rtmgrHttp.UseChannel(false)
 }
 
 //-----------------------------------------------------------------------------
@@ -1306,5 +1313,3 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
 	// Wait that subs is cleaned
 	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
 }
-
-/* */