X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=dff639e2029e25c84f63c5b2111620f3f1266d15;hb=2b512b60f935da2b2af5e501d87159f97fcaaf09;hp=63ffaaf1f17d1d219ec1558082a7cc84731de915;hpb=5d9b232c7d3d6aea8686ea598d5b09ef82ecd6f0;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index 63ffaaf..dff639e 100644
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -2898,12 +2898,15 @@ func TestRESTSubReqRetransmissionV4(t *testing.T) {
 	params2.SetSubscriptionID(&restSubId)
 
 	xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
-	xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+	xappConn1.ExpectAnyNotification(t)
 	// Resend the original request with an additional e2 subscription (detail), this time with restsubsid
 	restSubId_resend := xappConn1.SendRESTSubsReq(t, params2)
+	e2SubsId1 := xappConn1.WaitAnyRESTNotification(t)
+	assert.Equal(t, e2SubsId, e2SubsId1)
 
 	crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
 
+	xappConn1.DecrementRequestCount()
 	xappConn1.ExpectRESTNotification(t, restSubId_resend)
 	e2termConn1.SendSubsResp(t, crereq2, cremsg2)
 	e2SubsId2 := xappConn1.WaitRESTNotification(t, restSubId_resend)
@@ -2914,11 +2917,14 @@ func TestRESTSubReqRetransmissionV4(t *testing.T) {
 	xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
 	params = xappConn1.GetRESTSubsReqReportParams(subReqCount)
 	params.SetSubscriptionID(&restSubId)
-	xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+	xappConn1.ExpectAnyNotification(t)
 	// Resend the original request again with only one e2 subscription (detail), this time with restsubsid
 	restSubId_resend2 := xappConn1.SendRESTSubsReq(t, params)
 	assert.Equal(t, restSubId_resend, restSubId_resend2)
 
+	e2SubsId1 = xappConn1.WaitAnyRESTNotification(t)
+	assert.Equal(t, e2SubsId, e2SubsId1)
+
 	// Delete both e2 subscriptions
 	xappConn1.SendRESTSubsDelReq(t, &restSubId)
 	e2SubsIds := []uint32{e2SubsId, e2SubsId2}
@@ -3013,10 +3019,15 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) {
 	params2.SetSubscriptionID(&restSubId)
 
 	xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
-	xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+	xappConn1.ExpectAnyNotification(t)
 	// Resend the original request with an additional e2 subscription (detail), this time with restsubsid
 	restSubId_resend := xappConn1.SendRESTSubsReq(t, params2)
 
+	e2SubsId1 := xappConn1.WaitAnyRESTNotification(t)
+	assert.Equal(t, e2SubsId, e2SubsId1)
+	// The first E2 subscription returns immediately, manually decrement expected request count for the remaining request handling
+	xappConn1.DecrementRequestCount()
+
 	crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
 
 	xappConn1.ExpectRESTNotification(t, restSubId_resend)
@@ -3028,12 +3039,15 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) {
 
 	xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
 	params = xappConn1.GetRESTSubsReqReportParams(subReqCount)
-	xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+	xappConn1.ExpectAnyNotification(t)
 	// Resend the original request again with only one e2 subscription (detail), WITHOUT restsubsid
 	// md5sum shall find the original request
 	restSubId_resend2 := xappConn1.SendRESTSubsReq(t, params)
 	assert.Equal(t, restSubId_resend, restSubId_resend2)
 
+	e2SubsId1 = xappConn1.WaitAnyRESTNotification(t)
+	assert.Equal(t, e2SubsId, e2SubsId1)
+
 	// Delete both e2 subscriptions
 	xappConn1.SendRESTSubsDelReq(t, &restSubId)
 	e2SubsIds := []uint32{e2SubsId, e2SubsId2}
@@ -3137,10 +3151,13 @@ func TestRESTSubReqRetransmissionV6(t *testing.T) {
 	params2.SetSubscriptionID(&restSubId)
 
 	xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
-	xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+	xappConn1.ExpectAnyNotification(t)
 	// Resend the original request with an additional e2 subscription (detail), this time with restsubsid
 	restSubId_resend := xappConn1.SendRESTSubsReq(t, params2)
 
+	e2SubsId1 := xappConn1.WaitAnyRESTNotification(t)
+	assert.Equal(t, e2SubsId, e2SubsId1)
+
 	crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
 
 	xappConn1.ExpectRESTNotification(t, restSubId_resend)
@@ -3938,12 +3955,12 @@ func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
 	params.SetMeid("RAN_NAME_1")
 
 	xapp.Subscription.SetResponseCB(xappConn2.SubscriptionRespHandler)
-	xappConn2.WaitRESTNotificationForAnySubscriptionId(t)
+	xappConn2.ExpectAnyNotification(t)
 	waiter := rtmgrHttp.AllocNextSleep(10, true)
 	restSubId2 := xappConn2.SendRESTSubsReq(t, params)
 	waiter.WaitResult(t)
 	xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
-	e2SubsId2 := <-xappConn2.RESTNotification
+	e2SubsId2 := xappConn2.WaitAnyRESTNotification(t)
 	xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId2)
 
 	queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560", "localhost:13660"})
@@ -4918,10 +4935,10 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 	params = xappConn2.GetRESTSubsReqReportParams(subReqCount)
 	params.SetMeid("RAN_NAME_1")
 	xapp.Subscription.SetResponseCB(xappConn2.SubscriptionRespHandler)
-	xappConn2.WaitRESTNotificationForAnySubscriptionId(t)
+	xappConn2.ExpectAnyNotification(t)
 	restSubId2 := xappConn2.SendRESTSubsReq(t, params)
 	xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
-	e2SubsId2 := <-xappConn2.RESTNotification
+	e2SubsId2 := xappConn2.WaitAnyRESTNotification(t)
 	xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId2)
 
 	queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560", "localhost:13660"})