X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=53d8a85e6be6d498760e7fdfc88175a2b08951e3;hb=896c3acac45d9e23300072e0cf544bf728396066;hp=3054999375266f854abe543f76bc475f2de52973;hpb=5f8ffa07163f52d65092d63f5d173149cd5c46ad;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go index 3054999..53d8a85 100644 --- a/pkg/control/ut_messaging_test.go +++ b/pkg/control/ut_messaging_test.go @@ -20,6 +20,7 @@ package control import ( + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststube2ap" "testing" ) @@ -60,7 +61,7 @@ func TestSubReqAndRouteNok(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -105,14 +106,14 @@ func TestSubReqAndSubDelOk(t *testing.T) { cretrans := xappConn1.SendSubsReq(t, nil, nil) waiter.WaitResult(t) - crereq, cremsg := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) - delreq, delmsg := e2termConn.RecvSubsDelReq(t) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) waiter = rtmgrHttp.AllocNextEvent(true) - e2termConn.SendSubsDelResp(t, delreq, delmsg) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) xappConn1.RecvSubsDelResp(t, deltrans) waiter.WaitResult(t) @@ -121,7 +122,7 @@ func TestSubReqAndSubDelOk(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -158,19 +159,19 @@ func TestSubReqRetransmission(t *testing.T) { //Subs Create cretrans := xappConn1.SendSubsReq(t, nil, nil) - crereq, cremsg := e2termConn.RecvSubsReq(t) + crereq, cremsg := e2termConn1.RecvSubsReq(t) seqBef := mainCtrl.get_msgcounter(t) xappConn1.SendSubsReq(t, nil, cretrans) //Retransmitted SubReq mainCtrl.wait_msgcounter_change(t, seqBef, 10) - e2termConn.SendSubsResp(t, crereq, cremsg) + e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) //Subs Delete deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) - delreq, delmsg := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq, delmsg) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) xappConn1.RecvSubsDelResp(t, deltrans) //Wait that subs is cleaned @@ -178,7 +179,7 @@ func TestSubReqRetransmission(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -216,19 +217,19 @@ func TestSubDelReqRetransmission(t *testing.T) { //Subs Create cretrans := xappConn1.SendSubsReq(t, nil, nil) - crereq, cremsg := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) //Subs Delete deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) - delreq, delmsg := e2termConn.RecvSubsDelReq(t) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) seqBef := mainCtrl.get_msgcounter(t) xappConn1.SendSubsDelReq(t, deltrans, e2SubsId) //Retransmitted SubDelReq mainCtrl.wait_msgcounter_change(t, seqBef, 10) - e2termConn.SendSubsDelResp(t, delreq, delmsg) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) xappConn1.RecvSubsDelResp(t, deltrans) //Wait that subs is cleaned @@ -236,7 +237,7 @@ func TestSubDelReqRetransmission(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -278,13 +279,13 @@ func TestSubDelReqCollision(t *testing.T) { //Subs Create cretrans := xappConn1.SendSubsReq(t, nil, nil) - crereq, cremsg := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) //Subs Delete xappConn1.SendSubsDelReq(t, nil, e2SubsId) - delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) // Subs Delete colliding seqBef := mainCtrl.get_msgcounter(t) @@ -293,7 +294,7 @@ func TestSubDelReqCollision(t *testing.T) { mainCtrl.wait_msgcounter_change(t, seqBef, 10) // Del resp for first and second - e2termConn.SendSubsDelResp(t, delreq1, delmsg1) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) // don't care in which order responses are received xappConn1.RecvSubsDelResp(t, nil) @@ -304,46 +305,46 @@ func TestSubDelReqCollision(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } //----------------------------------------------------------------------------- // TestSubReqAndSubDelOkTwoParallel // -// stub stub -// +-------+ +---------+ +---------+ -// | xapp | | submgr | | e2term | -// +-------+ +---------+ +---------+ -// | | | -// | | | -// | | | -// | SubReq1 | | -// |------------->| | -// | | | -// | | SubReq1 | -// | |------------->| -// | | | -// | SubReq2 | | -// |------------->| | -// | | | -// | | SubReq2 | -// | |------------->| -// | | | -// | | SubResp1 | -// | |<-------------| -// | | SubResp2 | -// | |<-------------| -// | | | -// | SubResp1 | | -// |<-------------| | -// | SubResp2 | | -// |<-------------| | -// | | | -// | [SUBS 1 DELETE] | -// | | | -// | [SUBS 2 DELETE] | -// | | | +// stub stub stub +// +-------+ +-------+ +---------+ +---------+ +// | xapp | | xapp | | submgr | | e2term | +// +-------+ +-------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | | | | +// | SubReq2 | | +// |------------------------>| | +// | | | | +// | | | SubReq2 | +// | | |------------->| +// | | | | +// | | | SubResp1 | +// | | |<-------------| +// | | SubResp1 | | +// | |<-------------| | +// | | | | +// | | | SubResp2 | +// | | |<-------------| +// | SubResp2 | | +// |<------------------------| | +// | | | | +// | | [SUBS 1 DELETE] | +// | | | | +// | | [SUBS 2 DELETE] | +// | | | | // //----------------------------------------------------------------------------- func TestSubReqAndSubDelOkTwoParallel(t *testing.T) { @@ -354,42 +355,42 @@ func TestSubReqAndSubDelOkTwoParallel(t *testing.T) { rparams1.Init() rparams1.Req.EventTriggerDefinition.ProcedureCode = 5 cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.RecvSubsReq(t) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} rparams2.Init() rparams2.Req.EventTriggerDefinition.ProcedureCode = 28 cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) - crereq2, cremsg2 := e2termConn.RecvSubsReq(t) + crereq2, cremsg2 := e2termConn1.RecvSubsReq(t) //Resp1 - e2termConn.SendSubsResp(t, crereq1, cremsg1) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Resp2 - e2termConn.SendSubsResp(t, crereq2, cremsg2) + e2termConn1.SendSubsResp(t, crereq2, cremsg2) e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2) //Del1 deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1) - delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq1, delmsg1) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) xappConn1.RecvSubsDelResp(t, deltrans1) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId1, 10) //Del2 deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2) - delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq2, delmsg2) + delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq2, delmsg2) xappConn2.RecvSubsDelResp(t, deltrans2) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId2, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -440,22 +441,22 @@ func TestSameSubsDiffRan(t *testing.T) { //Req1 cretrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1") xappConn1.SendSubsReq(t, nil, cretrans1) - crereq1, cremsg1 := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq1, cremsg1) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Req2 cretrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_2") xappConn1.SendSubsReq(t, nil, cretrans2) - crereq2, cremsg2 := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq2, cremsg2) + crereq2, cremsg2 := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq2, cremsg2) e2SubsId2 := xappConn1.RecvSubsResp(t, cretrans2) //Del1 deltrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1") xappConn1.SendSubsDelReq(t, deltrans1, e2SubsId1) - delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq1, delmsg1) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) xappConn1.RecvSubsDelResp(t, deltrans1) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId1, 10) @@ -463,15 +464,15 @@ func TestSameSubsDiffRan(t *testing.T) { //Del2 deltrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_2") xappConn1.SendSubsDelReq(t, deltrans2, e2SubsId2) - delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq2, delmsg2) + delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq2, delmsg2) xappConn1.RecvSubsDelResp(t, deltrans2) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId2, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -512,18 +513,18 @@ func TestSubReqRetryInSubmgr(t *testing.T) { cretrans := xappConn1.SendSubsReq(t, nil, nil) // E2t: Receive 1st SubsReq - e2termConn.RecvSubsReq(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 2nd SubsReq and send SubsResp - crereq, cremsg := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) // Xapp: Receive SubsResp e2SubsId := xappConn1.RecvSubsResp(t, cretrans) deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) - delreq, delmsg := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq, delmsg) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) xappConn1.RecvSubsDelResp(t, deltrans) // Wait that subs is cleaned @@ -531,7 +532,7 @@ func TestSubReqRetryInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -575,21 +576,21 @@ func TestSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) { xappConn1.SendSubsReq(t, nil, nil) // E2t: Receive 1st SubsReq - e2termConn.RecvSubsReq(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 2nd SubsReq - e2termConn.RecvSubsReq(t) + e2termConn1.RecvSubsReq(t) // E2t: Send receive SubsDelReq and send SubsResp - delreq, delmsg := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq, delmsg) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) // Wait that subs is cleaned mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -630,23 +631,23 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { xappConn1.SendSubsReq(t, nil, nil) // E2t: Receive 1st SubsReq - e2termConn.RecvSubsReq(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 2nd SubsReq - e2termConn.RecvSubsReq(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 1st SubsDelReq - e2termConn.RecvSubsDelReq(t) + e2termConn1.RecvSubsDelReq(t) // E2t: Receive 2nd SubsDelReq - delreq, _ := e2termConn.RecvSubsDelReq(t) + delreq, _ := e2termConn1.RecvSubsDelReq(t) // Wait that subs is cleaned mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 15) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -681,10 +682,10 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) { cretrans := xappConn1.SendSubsReq(t, nil, nil) // E2t: Receive SubsReq and send SubsFail - crereq, cremsg := e2termConn.RecvSubsReq(t) + crereq, cremsg := e2termConn1.RecvSubsReq(t) fparams := &teststube2ap.E2StubSubsFailParams{} fparams.Set(crereq) - e2termConn.SendSubsFail(t, fparams, cremsg) + e2termConn1.SendSubsFail(t, fparams, cremsg) // Xapp: Receive SubsFail e2SubsId := xappConn1.RecvSubsFail(t, cretrans) @@ -694,7 +695,7 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -732,8 +733,8 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) { // Subs Create cretrans := xappConn1.SendSubsReq(t, nil, nil) - crereq, cremsg := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) // Subs Delete @@ -741,11 +742,11 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) { deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) // E2t: Receive 1st SubsDelReq - e2termConn.RecvSubsDelReq(t) + e2termConn1.RecvSubsDelReq(t) // E2t: Receive 2nd SubsDelReq and send SubsDelResp - delreq, delmsg := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq, delmsg) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) // Xapp: Receive SubsDelResp xappConn1.RecvSubsDelResp(t, deltrans) @@ -755,7 +756,7 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -791,8 +792,8 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { // Subs Create cretrans := xappConn1.SendSubsReq(t, nil, nil) - crereq, cremsg := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) // Subs Delete @@ -800,10 +801,10 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) // E2t: Receive 1st SubsDelReq - e2termConn.RecvSubsDelReq(t) + e2termConn1.RecvSubsDelReq(t) // E2t: Receive 2nd SubsDelReq - e2termConn.RecvSubsDelReq(t) + e2termConn1.RecvSubsDelReq(t) // Xapp: Receive SubsDelResp xappConn1.RecvSubsDelResp(t, deltrans) @@ -813,7 +814,7 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -849,16 +850,16 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) { // Subs Create cretrans := xappConn1.SendSubsReq(t, nil, nil) - crereq, cremsg := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) e2SubsId := xappConn1.RecvSubsResp(t, cretrans) // Xapp: Send SubsDelReq deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) // E2t: Send receive SubsDelReq and send SubsDelFail - delreq, delmsg := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelFail(t, delreq, delmsg) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelFail(t, delreq, delmsg) // Xapp: Receive SubsDelResp xappConn1.RecvSubsDelResp(t, deltrans) @@ -868,7 +869,7 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -876,45 +877,45 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) { // TestSubReqAndSubDelOkSameAction // // stub stub -// +-------+ +---------+ +---------+ -// | xapp | | submgr | | e2term | -// +-------+ +---------+ +---------+ -// | | | -// | | | -// | | | -// | SubReq1 | | -// |------------->| | -// | | | -// | | SubReq1 | -// | |------------->| -// | | SubResp1 | -// | |<-------------| -// | SubResp1 | | -// |<-------------| | -// | | | -// | SubReq2 | | -// |------------->| | -// | | | -// | SubResp2 | | -// |<-------------| | -// | | | -// | SubDelReq 1 | | -// |------------->| | -// | | | -// | SubDelResp 1 | | -// |<-------------| | -// | | | -// | SubDelReq 2 | | -// |------------->| | -// | | | -// | | SubDelReq 2 | -// | |------------->| -// | | | -// | | SubDelReq 2 | -// | |------------->| -// | | | -// | SubDelResp 2 | | -// |<-------------| | +// +-------+ +-------+ +---------+ +---------+ +// | xapp2 | | xapp1 | | submgr | | e2term | +// +-------+ +-------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | | | SubResp1 | +// | | |<-------------| +// | | SubResp1 | | +// | |<-------------| | +// | | | | +// | SubReq2 | | +// |--------------------------->| | +// | | | | +// | SubResp2 | | +// |<---------------------------| | +// | | | | +// | | SubDelReq 1 | | +// | |------------->| | +// | | | | +// | | SubDelResp 1 | | +// | |<-------------| | +// | | | | +// | SubDelReq 2 | | +// |--------------------------->| | +// | | | | +// | | | SubDelReq 2 | +// | | |------------->| +// | | | | +// | | | SubDelReq 2 | +// | | |------------->| +// | | | | +// | SubDelResp 2 | | +// |<---------------------------| | // //----------------------------------------------------------------------------- func TestSubReqAndSubDelOkSameAction(t *testing.T) { @@ -924,82 +925,82 @@ func TestSubReqAndSubDelOkSameAction(t *testing.T) { rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.RecvSubsReq(t) - e2termConn.SendSubsResp(t, crereq1, cremsg1) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} rparams2.Init() cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) - //crereq2, cremsg2 := e2termConn.RecvSubsReq(t) - //e2termConn.SendSubsResp(t, crereq2, cremsg2) + //crereq2, cremsg2 := e2termConn1.RecvSubsReq(t) + //e2termConn1.SendSubsResp(t, crereq2, cremsg2) e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2) //Del1 deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1) - //e2termConn.RecvSubsDelReq(t) - //e2termConn.SendSubsDelResp(t, delreq1, delmsg1) + //e2termConn1.RecvSubsDelReq(t) + //e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) xappConn1.RecvSubsDelResp(t, deltrans1) //Wait that subs is cleaned //mainCtrl.wait_subs_clean(t, e2SubsId1, 10) //Del2 deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2) - delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq2, delmsg2) + delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq2, delmsg2) xappConn2.RecvSubsDelResp(t, deltrans2) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId2, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } //----------------------------------------------------------------------------- // TestSubReqAndSubDelOkSameActionParallel // -// stub stub -// +-------+ +---------+ +---------+ -// | xapp | | submgr | | e2term | -// +-------+ +---------+ +---------+ -// | | | -// | | | -// | | | -// | SubReq1 | | -// |------------->| | -// | | | -// | | SubReq1 | -// | |------------->| -// | SubReq2 | | -// |------------->| | -// | | SubResp1 | -// | |<-------------| -// | SubResp1 | | -// |<-------------| | -// | | | -// | SubResp2 | | -// |<-------------| | -// | | | -// | SubDelReq 1 | | -// |------------->| | -// | | | -// | SubDelResp 1 | | -// |<-------------| | -// | | | -// | SubDelReq 2 | | -// |------------->| | -// | | | -// | | SubDelReq 2 | -// | |------------->| -// | | | -// | | SubDelReq 2 | -// | |------------->| -// | | | -// | SubDelResp 2 | | -// |<-------------| | +// stub stub stub +// +-------+ +-------+ +---------+ +---------+ +// | xapp2 | | xapp1 | | submgr | | e2term | +// +-------+ +-------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | SubReq2 | | +// |--------------------------->| | +// | | | SubResp1 | +// | | |<-------------| +// | | SubResp1 | | +// | |<-------------| | +// | | | | +// | SubResp2 | | +// |<---------------------------| | +// | | | | +// | | SubDelReq 1 | | +// | |------------->| | +// | | | | +// | | SubDelResp 1 | | +// | |<-------------| | +// | | | | +// | SubDelReq 2 | | +// |--------------------------->| | +// | | | | +// | | | SubDelReq 2 | +// | | |------------->| +// | | | | +// | | | SubDelReq 2 | +// | | |------------->| +// | | | | +// | SubDelResp 2 | | +// |<---------------------------| | // //----------------------------------------------------------------------------- func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) { @@ -1009,7 +1010,7 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) { rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.RecvSubsReq(t) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} @@ -1017,7 +1018,7 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) { cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) //Resp1 - e2termConn.SendSubsResp(t, crereq1, cremsg1) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Resp2 @@ -1029,8 +1030,8 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) { //Del2 deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2) - delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq2, delmsg2) + delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq2, delmsg2) xappConn2.RecvSubsDelResp(t, deltrans2) //Wait that subs is cleaned @@ -1038,34 +1039,34 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } //----------------------------------------------------------------------------- // TestSubReqAndSubDelNokSameActionParallel // -// stub stub -// +-------+ +---------+ +---------+ -// | xapp | | submgr | | e2term | -// +-------+ +---------+ +---------+ -// | | | -// | | | -// | | | -// | SubReq1 | | -// |------------->| | -// | | | -// | | SubReq1 | -// | |------------->| -// | SubReq2 | | -// |------------->| | -// | | SubFail1 | -// | |<-------------| -// | SubFail1 | | -// |<-------------| | -// | | | -// | SubFail2 | | -// |<-------------| | +// stub stub stub +// +-------+ +-------+ +---------+ +---------+ +// | xapp2 | | xapp1 | | submgr | | e2term | +// +-------+ +-------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | SubReq2 | | +// |--------------------------->| | +// | | | SubFail1 | +// | | |<-------------| +// | | SubFail1 | | +// | |<-------------| | +// | | | | +// | SubFail2 | | +// |<---------------------------| | // //----------------------------------------------------------------------------- func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { @@ -1075,7 +1076,7 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.RecvSubsReq(t) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} @@ -1087,7 +1088,7 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { //E2T Fail fparams := &teststube2ap.E2StubSubsFailParams{} fparams.Set(crereq1) - e2termConn.SendSubsFail(t, fparams, cremsg1) + e2termConn1.SendSubsFail(t, fparams, cremsg1) //Fail1 e2SubsId1 := xappConn1.RecvSubsFail(t, cretrans1) @@ -1099,67 +1100,289 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } //----------------------------------------------------------------------------- // TestSubReqAndSubDelNoAnswerSameActionParallel // +// stub stub stub +// +-------+ +-------+ +---------+ +---------+ +// | xapp2 | | xapp1 | | submgr | | e2term | +// +-------+ +-------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | | SubReq2 | | +// |--------------------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | | | | +// | | | | +// | | | SubDelReq | +// | | |------------->| +// | | | | +// | | | SubDelResp | +// | | |<-------------| +// +//----------------------------------------------------------------------------- +func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { + CaseBegin("TestSubReqAndSubDelNoAnswerSameActionParallel") + + //Req1 + rparams1 := &teststube2ap.E2StubSubsReqParams{} + rparams1.Init() + xappConn1.SendSubsReq(t, rparams1, nil) + + e2termConn1.RecvSubsReq(t) + + //Req2 + rparams2 := &teststube2ap.E2StubSubsReqParams{} + rparams2.Init() + seqBef2 := mainCtrl.get_msgcounter(t) + xappConn2.SendSubsReq(t, rparams2, nil) + mainCtrl.wait_msgcounter_change(t, seqBef2, 10) + + //Req1 (retransmitted) + e2termConn1.RecvSubsReq(t) + + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) + + //Wait that subs is cleaned + mainCtrl.wait_subs_clean(t, delreq1.RequestId.Seq, 10) + + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) + mainCtrl.wait_registry_empty(t, 15) +} + +//----------------------------- Policy cases --------------------------------- +//----------------------------------------------------------------------------- +// TestSubReqPolicyAndSubDelOk +// // stub stub // +-------+ +---------+ +---------+ // | xapp | | submgr | | e2term | // +-------+ +---------+ +---------+ // | | | +// | SubReq | | +// |------------->| | +// | | | +// | | SubReq | +// | |------------->| +// | | | +// | | SubResp | +// | |<-------------| +// | | | +// | SubResp | | +// |<-------------| | // | | | // | | | -// | SubReq1 | | +// | SubDelReq | | // |------------->| | // | | | -// | | SubReq1 | +// | | SubDelReq | // | |------------->| -// | SubReq2 | | +// | | | +// | | SubDelResp | +// | |<-------------| +// | | | +// | SubDelResp | | +// |<-------------| | +// +//----------------------------------------------------------------------------- +func TestSubReqPolicyAndSubDelOk(t *testing.T) { + CaseBegin("TestSubReqAndSubDelOk") + + rparams1 := &teststube2ap.E2StubSubsReqParams{} + rparams1.Init() + rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy + cretrans := xappConn1.SendSubsReq(t, rparams1, nil) + + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) + deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + + e2termConn1.SendSubsDelResp(t, delreq, delmsg) + xappConn1.RecvSubsDelResp(t, deltrans) + + //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) +} + +//----------------------------------------------------------------------------- +// TestSubReqPolicyChangeAndSubDelOk +// +// stub stub +// +-------+ +---------+ +---------+ +// | xapp | | submgr | | e2term | +// +-------+ +---------+ +---------+ +// | | | +// | SubReq | | // |------------->| | // | | | -// | | SubReq1 | +// | | SubReq | // | |------------->| // | | | +// | | SubResp | +// | |<-------------| +// | | | +// | SubResp | | +// |<-------------| | +// | | | +// | SubReq | | +// |------------->| | +// | | | +// | | SubReq | +// | |------------->| +// | | | +// | | SubResp | +// | |<-------------| +// | | | +// | SubResp | | +// |<-------------| | +// | | | +// | SubDelReq | | +// |------------->| | // | | | // | | SubDelReq | // | |------------->| // | | | // | | SubDelResp | // | |<-------------| +// | | | +// | SubDelResp | | +// |<-------------| | // //----------------------------------------------------------------------------- -func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { - CaseBegin("TestSubReqAndSubDelNoAnswerSameActionParallel") - //Req1 +func TestSubReqPolicyChangeAndSubDelOk(t *testing.T) { + CaseBegin("TestSubReqAndSubDelOk") + rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() - xappConn1.SendSubsReq(t, rparams1, nil) + rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy + cretrans := xappConn1.SendSubsReq(t, rparams1, nil) - e2termConn.RecvSubsReq(t) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) - //Req2 - rparams2 := &teststube2ap.E2StubSubsReqParams{} - rparams2.Init() - seqBef2 := mainCtrl.get_msgcounter(t) - xappConn2.SendSubsReq(t, rparams2, nil) - mainCtrl.wait_msgcounter_change(t, seqBef2, 10) + //Policy change + rparams1.Req.RequestId.Seq = e2SubsId + rparams1.Req.ActionSetups[0].SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitW200ms + xappConn1.SendSubsReq(t, rparams1, cretrans) - //Req1 (retransmitted) - e2termConn.RecvSubsReq(t) + crereq, cremsg = e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId = xappConn1.RecvSubsResp(t, cretrans) + deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) - delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq1, delmsg1) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) + xappConn1.RecvSubsDelResp(t, deltrans) //Wait that subs is cleaned - mainCtrl.wait_subs_clean(t, delreq1.RequestId.Seq, 10) + mainCtrl.wait_subs_clean(t, e2SubsId, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) - mainCtrl.wait_registry_empty(t, 15) + e2termConn1.TestMsgChanEmpty(t) + mainCtrl.wait_registry_empty(t, 10) +} + +//----------------------------------------------------------------------------- +// TestSubReqAndSubDelOkTwoE2termParallel +// +// stub stub stub +// +-------+ +---------+ +---------+ +---------+ +// | xapp | | submgr | | e2term1 | | e2term2 | +// +-------+ +---------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | SubReq1 | | | +// |------------->| | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | SubReq2 | | | +// |------------->| | | +// | | | | +// | | SubReq2 | | +// | |---------------------------->| +// | | | | +// | | SubResp1 | | +// | |<-------------| | +// | SubResp1 | | | +// |<-------------| | | +// | | SubResp2 | | +// | |<----------------------------| +// | SubResp2 | | | +// |<-------------| | | +// | | | | +// | [SUBS 1 DELETE] | | +// | | | | +// | [SUBS 2 DELETE] | | +// | | | | +// +//----------------------------------------------------------------------------- +func TestSubReqAndSubDelOkTwoE2termParallel(t *testing.T) { + CaseBegin("TestSubReqAndSubDelOkTwoE2termParallel") + + //Req1 + cretrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1") + xappConn1.SendSubsReq(t, nil, cretrans1) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + + cretrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_11") + xappConn1.SendSubsReq(t, nil, cretrans2) + crereq2, cremsg2 := e2termConn2.RecvSubsReq(t) + + //Resp1 + e2termConn1.SendSubsResp(t, crereq1, cremsg1) + e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) + + //Resp2 + e2termConn2.SendSubsResp(t, crereq2, cremsg2) + e2SubsId2 := xappConn1.RecvSubsResp(t, cretrans2) + + //Del1 + deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) + xappConn1.RecvSubsDelResp(t, deltrans1) + //Wait that subs is cleaned + mainCtrl.wait_subs_clean(t, e2SubsId1, 10) + + //Del2 + deltrans2 := xappConn1.SendSubsDelReq(t, nil, e2SubsId2) + delreq2, delmsg2 := e2termConn2.RecvSubsDelReq(t) + e2termConn2.SendSubsDelResp(t, delreq2, delmsg2) + xappConn1.RecvSubsDelResp(t, deltrans2) + //Wait that subs is cleaned + mainCtrl.wait_subs_clean(t, e2SubsId2, 10) + + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) + e2termConn2.TestMsgChanEmpty(t) + mainCtrl.wait_registry_empty(t, 10) }