X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=1e196f01ba96038d230ea686b0e6357cd8424107;hb=b9ffb74d59784de5a7784e2e7f7c08ec61856776;hp=c0d76e2e49fec62be585cd8dc5096b446e78e415;hpb=c9eb08a02821033f198fcde1ea60279b19c5c617;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go index c0d76e2..1e196f0 100644 --- a/pkg/control/ut_messaging_test.go +++ b/pkg/control/ut_messaging_test.go @@ -25,6 +25,7 @@ import ( "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" "github.com/stretchr/testify/assert" "testing" + "time" ) //----------------------------------------------------------------------------- @@ -54,7 +55,7 @@ func TestSubReqAndRouteNok(t *testing.T) { CaseBegin("TestSubReqAndRouteNok") waiter := rtmgrHttp.AllocNextEvent(false) - newSubsId := mainCtrl.get_subid(t) + newSubsId := mainCtrl.get_registry_next_subid(t) xappConn1.SendSubsReq(t, nil, nil) waiter.WaitResult(t) @@ -169,6 +170,10 @@ func TestSubReqRetransmission(t *testing.T) { xappConn1.SendSubsReq(t, nil, cretrans) //Retransmitted SubReq mainCtrl.wait_msgcounter_change(t, seqBef, 10) + // hack as there is no real way to see has message be handled. + // Previuos counter check just tells that is has been received by submgr + // --> artificial delay + <-time.After(1 * time.Second) e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) @@ -233,6 +238,11 @@ func TestSubDelReqRetransmission(t *testing.T) { xappConn1.SendSubsDelReq(t, deltrans, e2SubsId) //Retransmitted SubDelReq mainCtrl.wait_msgcounter_change(t, seqBef, 10) + // hack as there is no real way to see has message be handled. + // Previuos counter check just tells that is has been received by submgr + // --> artificial delay + <-time.After(1 * time.Second) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) xappConn1.RecvSubsDelResp(t, deltrans) @@ -297,6 +307,11 @@ func TestSubDelReqCollision(t *testing.T) { xappConn1.SendSubsDelReq(t, deltranscol2, e2SubsId) //Colliding SubDelReq mainCtrl.wait_msgcounter_change(t, seqBef, 10) + // hack as there is no real way to see has message be handled. + // Previuos counter check just tells that is has been received by submgr + // --> artificial delay + <-time.After(1 * time.Second) + // Del resp for first and second e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) @@ -590,7 +605,7 @@ func TestSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) { e2termConn1.SendSubsDelResp(t, delreq, delmsg) // Wait that subs is cleaned - mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 10) + mainCtrl.wait_subs_clean(t, delreq.RequestId.InstanceId, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) @@ -647,7 +662,7 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { delreq, _ := e2termConn1.RecvSubsDelReq(t) // Wait that subs is cleaned - mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 15) + mainCtrl.wait_subs_clean(t, delreq.RequestId.InstanceId, 15) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) @@ -672,6 +687,12 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { // | | SubFail | // | |<-------------| // | | | +// | | SubDelReq | +// | |------------->| +// | | | +// | | SubDelResp | +// | |<-------------| +// | | | // | SubFail | | // |<-------------| | // | | | @@ -685,11 +706,173 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) { // Xapp: Send SubsReq cretrans := xappConn1.SendSubsReq(t, nil, nil) - // E2t: Receive SubsReq and send SubsFail - crereq, cremsg := e2termConn1.RecvSubsReq(t) - fparams := &teststube2ap.E2StubSubsFailParams{} - fparams.Set(crereq) - e2termConn1.SendSubsFail(t, fparams, cremsg) + // E2t: Receive SubsReq and send SubsFail (first) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + fparams1 := &teststube2ap.E2StubSubsFailParams{} + fparams1.Set(crereq1) + e2termConn1.SendSubsFail(t, fparams1, cremsg1) + + // E2t: Receive SubsDelReq and send SubsDelResp (internal first) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) + + // Xapp: Receive SubsFail + e2SubsId := xappConn1.RecvSubsFail(t, cretrans) + + // Wait that subs is cleaned + mainCtrl.wait_subs_clean(t, e2SubsId, 10) + + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) + mainCtrl.wait_registry_empty(t, 10) +} + +//----------------------------------------------------------------------------- +// TestSubReqSubFailRespInSubmgrWithDuplicate +// +// stub stub +// +-------+ +---------+ +---------+ +// | xapp | | submgr | | e2term | +// +-------+ +---------+ +---------+ +// | | | +// | SubReq | | +// |------------->| | +// | | | +// | | SubReq | +// | |------------->| +// | | | +// | | SubFail | +// | |<-------------| +// | | | +// | | SubDelReq | +// | |------------->| +// | | | +// | | SubDelResp | +// | |<-------------| +// | | | +// | | SubReq | +// | |------------->| +// | | | +// | | SubResp | +// | |<-------------| +// | | | +// | SubResp | | +// |<-------------| | +// | | | +// | [SUBS DELETE] | +// | | | +// +//----------------------------------------------------------------------------- + +func TestSubReqSubFailRespInSubmgrWithDuplicate(t *testing.T) { + + CaseBegin("TestSubReqSubFailRespInSubmgrWithDuplicate start") + + // Xapp: Send SubsReq + cretrans := xappConn1.SendSubsReq(t, nil, nil) + + // E2t: Receive SubsReq and send SubsFail (first) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + fparams1 := &teststube2ap.E2StubSubsFailParams{} + fparams1.Set(crereq1) + fparams1.SetCauseVal(-1, 5, 3) + e2termConn1.SendSubsFail(t, fparams1, cremsg1) + + // E2t: Receive SubsDelReq and send SubsDelResp (internal) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) + + // E2t: Receive SubsReq and send SubsResp (second) + crereq2, cremsg2 := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq2, cremsg2) + + // XAPP: Receive SubsResp + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) + + // Delete + deltrans2 := xappConn1.SendSubsDelReq(t, nil, e2SubsId) + delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq2, delmsg2) + xappConn1.RecvSubsDelResp(t, deltrans2) + + // Wait that subs is cleaned + mainCtrl.wait_subs_clean(t, e2SubsId, 10) + + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) + mainCtrl.wait_registry_empty(t, 10) +} + +//----------------------------------------------------------------------------- +// TestSubReqSubFailRespInSubmgrWithDuplicateFail +// +// stub stub +// +-------+ +---------+ +---------+ +// | xapp | | submgr | | e2term | +// +-------+ +---------+ +---------+ +// | | | +// | SubReq | | +// |------------->| | +// | | | +// | | SubReq | +// | |------------->| +// | | | +// | | SubFail | +// | |<-------------| +// | | | +// | | SubDelReq | +// | |------------->| +// | | | +// | | SubDelResp | +// | |<-------------| +// | | | +// | | SubReq | +// | |------------->| +// | | | +// | | SubFail | +// | |<-------------| +// | | | +// | | SubDelReq | +// | |------------->| +// | | | +// | | SubDelResp | +// | |<-------------| +// | SubFail | | +// |<-------------| | +// | | | +// +//----------------------------------------------------------------------------- + +func TestSubReqSubFailRespInSubmgrWithDuplicateFail(t *testing.T) { + + CaseBegin("TestSubReqSubFailRespInSubmgrWithDuplicateFail start") + + // Xapp: Send SubsReq + cretrans := xappConn1.SendSubsReq(t, nil, nil) + + // E2t: Receive SubsReq and send SubsFail (first) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + fparams1 := &teststube2ap.E2StubSubsFailParams{} + fparams1.Set(crereq1) + fparams1.SetCauseVal(-1, 5, 3) + e2termConn1.SendSubsFail(t, fparams1, cremsg1) + + // E2t: Receive SubsDelReq and send SubsDelResp (internal first) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) + + // E2t: Receive SubsReq and send SubsFail (second) + crereq2, cremsg2 := e2termConn1.RecvSubsReq(t) + fparams2 := &teststube2ap.E2StubSubsFailParams{} + fparams2.Set(crereq2) + fparams2.SetCauseVal(-1, 5, 3) + e2termConn1.SendSubsFail(t, fparams2, cremsg2) + + // E2t: Receive SubsDelReq and send SubsDelResp (internal second) + delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq2, delmsg2) // Xapp: Receive SubsFail e2SubsId := xappConn1.RecvSubsFail(t, cretrans) @@ -1071,6 +1254,12 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) { // |--------------------------->| | // | | | SubFail1 | // | | |<-------------| +// | | | | +// | | | SubDelReq | +// | | |------------->| +// | | | SubDelResp | +// | | |<-------------| +// | | | | // | | SubFail1 | | // | |<-------------| | // | | | | @@ -1085,19 +1274,25 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) + + // E2t: Receive SubsReq (first) crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} rparams2.Init() - seqBef2 := mainCtrl.get_msgcounter(t) + subepcnt2 := mainCtrl.get_subs_entrypoint_cnt(t, crereq1.RequestId.InstanceId) cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) - mainCtrl.wait_msgcounter_change(t, seqBef2, 10) + mainCtrl.wait_subs_entrypoint_cnt_change(t, crereq1.RequestId.InstanceId, subepcnt2, 10) - //E2T Fail - fparams := &teststube2ap.E2StubSubsFailParams{} - fparams.Set(crereq1) - e2termConn1.SendSubsFail(t, fparams, cremsg1) + // E2t: send SubsFail (first) + fparams1 := &teststube2ap.E2StubSubsFailParams{} + fparams1.Set(crereq1) + e2termConn1.SendSubsFail(t, fparams1, cremsg1) + + // E2t: internal delete + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) //Fail1 e2SubsId1 := xappConn1.RecvSubsFail(t, cretrans1) @@ -1150,14 +1345,14 @@ func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { rparams1.Init() xappConn1.SendSubsReq(t, rparams1, nil) - e2termConn1.RecvSubsReq(t) + crereq1, _ := e2termConn1.RecvSubsReq(t) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} rparams2.Init() - seqBef2 := mainCtrl.get_msgcounter(t) + subepcnt2 := mainCtrl.get_subs_entrypoint_cnt(t, crereq1.RequestId.InstanceId) xappConn2.SendSubsReq(t, rparams2, nil) - mainCtrl.wait_msgcounter_change(t, seqBef2, 10) + mainCtrl.wait_subs_entrypoint_cnt_change(t, crereq1.RequestId.InstanceId, subepcnt2, 10) //Req1 (retransmitted) e2termConn1.RecvSubsReq(t) @@ -1166,7 +1361,7 @@ func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) //Wait that subs is cleaned - mainCtrl.wait_subs_clean(t, delreq1.RequestId.Seq, 10) + mainCtrl.wait_subs_clean(t, delreq1.RequestId.InstanceId, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) @@ -1294,7 +1489,7 @@ func TestSubReqPolicyChangeAndSubDelOk(t *testing.T) { e2SubsId := xappConn1.RecvSubsResp(t, cretrans) //Policy change - rparams1.Req.RequestId.Seq = e2SubsId + rparams1.Req.RequestId.InstanceId = e2SubsId rparams1.Req.ActionSetups[0].SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitW200ms xappConn1.SendSubsReq(t, rparams1, cretrans)