X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=f27284855e42821d29a0e5018a8e3069280b0008;hb=55d2a285e4914afce7492c6b4b6feebe5485210b;hp=4f93f20cd12699aa3d721c1b5de2a9712ba9cb20;hpb=bd9c98e068581cfe38187b3ada774653df26440a;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index 4f93f20..f272848 100644
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -2418,7 +2418,7 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
 	// Req
 	params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
 	restSubId := xappConn1.SendRESTSubsReq(t, params)
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "failAll")
 	waiter.WaitResult(t)
 
 	e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
@@ -2465,7 +2465,7 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
 	params.SetMeid("RAN_NAME_1")
 	restSubId2 := xappConn2.SendRESTSubsReq(t, params)
 	xapp.Logger.Info("Send REST subscriber request for second subscriber : %v", restSubId2)
-	xappConn2.ExpectRESTNotification(t, restSubId2)
+	xappConn2.ExpectRESTNotificationNok(t, restSubId2, "allFail")
 	waiter.WaitResult(t)
 	// e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2) - TOD: missing delete
 	xappConn2.WaitRESTNotification(t, restSubId2)
@@ -2941,6 +2941,7 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
 //     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
 	CaseBegin("TestRESTSubReqTwoRetriesNoRespSubDelRespInSubmgr start")
 
@@ -2966,9 +2967,8 @@ func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
 	xapp.Logger.Info("Ignore 2nd REST subscriber request for subscriber : %v", restSubId)
 
 	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
-	// e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)	- TODO:  Should we delete this?
 	xappConn1.WaitRESTNotification(t, restSubId)
 
 	// Wait that subs is cleaned
@@ -3004,7 +3004,7 @@ func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
 	e2termConn1.RecvSubsDelReq(t)
 	xapp.Logger.Info("Ignore 1st INTERNAL delete request for subscriber : %v", restSubId)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 	e2termConn1.RecvSubsDelReq(t)
 	xapp.Logger.Info("Ignore 2nd INTERNAL delete request for subscriber : %v", restSubId)
 
@@ -3082,7 +3082,7 @@ func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
 	e2termConn1.RecvSubsDelReq(t)
 	xapp.Logger.Info("Ignore 1st INTERNAL delete request for subscriber : %v", restSubId)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 	e2termConn1.RecvSubsDelReq(t)
 	xapp.Logger.Info("Ignore 2nd INTERNAL delete request for subscriber : %v", restSubId)
 
@@ -3149,7 +3149,7 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
 	e2termConn1.SendSubsFail(t, fparams1, cremsg1)
 
 	delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 	e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
 	e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
 	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId)
@@ -5167,7 +5167,7 @@ func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
 
 	_, cremsg = e2termConn1.RecvSubsReq(t)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
 	// Subscription already created in E2 Node.
 	fparams := &teststube2ap.E2StubSubsFailParams{}
@@ -5240,7 +5240,7 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
 
 	_, cremsg = e2termConn1.RecvSubsReq(t)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
 	// Subscription already created in E2 Node.
 	fparams := &teststube2ap.E2StubSubsFailParams{}
@@ -5318,7 +5318,7 @@ func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
 
 	_, cremsg = e2termConn1.RecvSubsReq(t)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
 	// Subscription already created in E2 Node.
 	fparams := &teststube2ap.E2StubSubsFailParams{}
@@ -5394,7 +5394,7 @@ func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
 
 	_, cremsg = e2termConn1.RecvSubsReq(t)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
 	// Subscription already created in E2 Node.
 	fparams := &teststube2ap.E2StubSubsFailParams{}
@@ -5468,7 +5468,7 @@ func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
 
 	_, cremsg = e2termConn1.RecvSubsReq(t)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
 	// Subscription already created in E2 Node.
 	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
@@ -5541,7 +5541,7 @@ func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
 
 	_, cremsg = e2termConn1.RecvSubsReq(t)
 
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
 	// Subscription already created in E2 Node.
 	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
@@ -5984,7 +5984,7 @@ func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
 
 	// E2t: Receive SubsDelReq
 	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
-	xappConn1.ExpectRESTNotification(t, restSubId)
+	xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
 	// Subscription does not exist in in E2 Node.
 	e2termConn1.SendSubsDelFail(t, delreq, delmsg)