X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=a9339c2a0302b8561c53fce5a3657cb66b2cc357;hb=7348625b9ef03d41dd5a0ca0f6c508376259717e;hp=de2458a09d9579327b54c7bb335d773584ed9721;hpb=9bcb0a4620d71671f758dce029cb2e3da9ab9dbe;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go index de2458a..a9339c2 100644 --- a/pkg/control/ut_messaging_test.go +++ b/pkg/control/ut_messaging_test.go @@ -22,6 +22,8 @@ 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" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" + "github.com/stretchr/testify/assert" "testing" ) @@ -61,7 +63,7 @@ func TestSubReqAndRouteNok(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -102,27 +104,29 @@ func TestSubReqAndRouteNok(t *testing.T) { func TestSubReqAndSubDelOk(t *testing.T) { CaseBegin("TestSubReqAndSubDelOk") - waiter := rtmgrHttp.AllocNextEvent(true) 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) + + resp, _ := xapp.Subscription.QuerySubscriptions() + assert.Equal(t, resp[0].SubscriptionID, int64(e2SubsId)) + assert.Equal(t, resp[0].Meid, "RAN_NAME_1") + assert.Equal(t, resp[0].Endpoint, []string{"localhost:13560"}) + 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) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -159,19 +163,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 @@ -179,7 +183,7 @@ func TestSubReqRetransmission(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -217,19 +221,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 @@ -237,7 +241,7 @@ func TestSubDelReqRetransmission(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -279,13 +283,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) @@ -294,7 +298,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) @@ -305,46 +309,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) { @@ -355,42 +359,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) } @@ -441,22 +445,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) @@ -464,15 +468,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) } @@ -513,18 +517,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 @@ -532,7 +536,7 @@ func TestSubReqRetryInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -576,21 +580,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) } @@ -631,23 +635,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) } @@ -668,6 +672,12 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { // | | SubFail | // | |<-------------| // | | | +// | | SubDelReq | +// | |------------->| +// | | | +// | | SubDelResp | +// | |<-------------| +// | | | // | SubFail | | // |<-------------| | // | | | @@ -681,11 +691,15 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) { // Xapp: Send SubsReq cretrans := xappConn1.SendSubsReq(t, nil, nil) - // E2t: Receive SubsReq and send SubsFail - crereq, cremsg := e2termConn.RecvSubsReq(t) - fparams := &teststube2ap.E2StubSubsFailParams{} - fparams.Set(crereq) - e2termConn.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) @@ -695,7 +709,165 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.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) + + // 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) } @@ -733,8 +905,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 @@ -742,11 +914,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) @@ -756,7 +928,7 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -792,8 +964,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 @@ -801,10 +973,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) @@ -814,7 +986,7 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -850,16 +1022,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) @@ -869,7 +1041,7 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) { xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -877,45 +1049,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) { @@ -925,82 +1097,87 @@ 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) + resp, _ := xapp.Subscription.QuerySubscriptions() + assert.Equal(t, resp[0].SubscriptionID, int64(e2SubsId1)) + assert.Equal(t, resp[0].Meid, "RAN_NAME_1") + assert.Equal(t, resp[0].Endpoint, []string{"localhost:13560", "localhost:13660"}) + //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) { @@ -1010,7 +1187,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{} @@ -1018,7 +1195,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 @@ -1030,8 +1207,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 @@ -1039,34 +1216,40 @@ 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 | +// | | |<-------------| +// | | | | +// | | | SubDelReq | +// | | |------------->| +// | | | SubDelResp | +// | | |<-------------| +// | | | | +// | | SubFail1 | | +// | |<-------------| | +// | | | | +// | SubFail2 | | +// |<---------------------------| | // //----------------------------------------------------------------------------- func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { @@ -1076,7 +1259,9 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.RecvSubsReq(t) + + // E2t: Receive SubsReq (first) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} @@ -1085,10 +1270,14 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) mainCtrl.wait_msgcounter_change(t, seqBef2, 10) - //E2T Fail - fparams := &teststube2ap.E2StubSubsFailParams{} - fparams.Set(crereq1) - e2termConn.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) @@ -1100,37 +1289,37 @@ 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 -// +-------+ +---------+ +---------+ -// | xapp | | submgr | | e2term | -// +-------+ +---------+ +---------+ -// | | | -// | | | -// | | | -// | SubReq1 | | -// |------------->| | -// | | | -// | | SubReq1 | -// | |------------->| -// | SubReq2 | | -// |------------->| | -// | | | -// | | SubReq1 | -// | |------------->| -// | | | -// | | | -// | | SubDelReq | -// | |------------->| -// | | | -// | | SubDelResp | -// | |<-------------| +// stub stub stub +// +-------+ +-------+ +---------+ +---------+ +// | xapp2 | | xapp1 | | submgr | | e2term | +// +-------+ +-------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | | SubReq2 | | +// |--------------------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | | | | +// | | | | +// | | | SubDelReq | +// | | |------------->| +// | | | | +// | | | SubDelResp | +// | | |<-------------| // //----------------------------------------------------------------------------- func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { @@ -1141,7 +1330,7 @@ func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { rparams1.Init() xappConn1.SendSubsReq(t, rparams1, nil) - e2termConn.RecvSubsReq(t) + e2termConn1.RecvSubsReq(t) //Req2 rparams2 := &teststube2ap.E2StubSubsReqParams{} @@ -1151,17 +1340,17 @@ func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { mainCtrl.wait_msgcounter_change(t, seqBef2, 10) //Req1 (retransmitted) - e2termConn.RecvSubsReq(t) + e2termConn1.RecvSubsReq(t) - delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t) - e2termConn.SendSubsDelResp(t, delreq1, delmsg1) + 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) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 15) } @@ -1208,23 +1397,21 @@ func TestSubReqPolicyAndSubDelOk(t *testing.T) { rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy cretrans := xappConn1.SendSubsReq(t, rparams1, 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) 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) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -1277,15 +1464,13 @@ func TestSubReqPolicyAndSubDelOk(t *testing.T) { func TestSubReqPolicyChangeAndSubDelOk(t *testing.T) { CaseBegin("TestSubReqAndSubDelOk") - waiter := rtmgrHttp.AllocNextEvent(true) rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy cretrans := xappConn1.SendSubsReq(t, rparams1, 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) //Policy change @@ -1293,22 +1478,100 @@ func TestSubReqPolicyChangeAndSubDelOk(t *testing.T) { rparams1.Req.ActionSetups[0].SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitW200ms xappConn1.SendSubsReq(t, rparams1, cretrans) - 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) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) xappConn1.TestMsgChanEmpty(t) xappConn2.TestMsgChanEmpty(t) - e2termConn.TestMsgChanEmpty(t) + 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) }