X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=548950a29b1bea47ee208595b14f0a799b84c7aa;hb=9dc5adc78d459157a42ef8997eeced82a3616f01;hp=1bec316a61ba1a02096b5dacd739bdb262677d23;hpb=01a4c49324392003717106267c56126275b9058b;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go index 1bec316..548950a 100644 --- a/pkg/control/ut_messaging_test.go +++ b/pkg/control/ut_messaging_test.go @@ -20,8 +20,12 @@ 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" + "time" ) //----------------------------------------------------------------------------- @@ -48,19 +52,19 @@ import ( //----------------------------------------------------------------------------- func TestSubReqAndRouteNok(t *testing.T) { - xapp.Logger.Info("TestSubReqAndRouteNok") + CaseBegin("TestSubReqAndRouteNok") waiter := rtmgrHttp.AllocNextEvent(false) - newSubsId := mainCtrl.get_subid(t) - xappConn1.handle_xapp_subs_req(t, nil, nil) + newSubsId := mainCtrl.get_registry_next_subid(t) + xappConn1.SendSubsReq(t, nil, nil) waiter.WaitResult(t) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, newSubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -99,29 +103,31 @@ func TestSubReqAndRouteNok(t *testing.T) { // //----------------------------------------------------------------------------- func TestSubReqAndSubDelOk(t *testing.T) { - xapp.Logger.Info("TestSubReqAndSubDelOk") + CaseBegin("TestSubReqAndSubDelOk") - waiter := rtmgrHttp.AllocNextEvent(true) - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) - waiter.WaitResult(t) + cretrans := xappConn1.SendSubsReq(t, nil, nil) - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) - deltrans := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) - delreq, delmsg := e2termConn.handle_e2term_subs_del_req(t) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) - waiter = rtmgrHttp.AllocNextEvent(true) - e2termConn.handle_e2term_subs_del_resp(t, delreq, delmsg) - xappConn1.handle_xapp_subs_del_resp(t, deltrans) - waiter.WaitResult(t) + 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 := 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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -154,31 +160,35 @@ func TestSubReqAndSubDelOk(t *testing.T) { // //----------------------------------------------------------------------------- func TestSubReqRetransmission(t *testing.T) { - xapp.Logger.Info("TestSubReqRetransmission") + CaseBegin("TestSubReqRetransmission") //Subs Create - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) + cretrans := xappConn1.SendSubsReq(t, nil, nil) + crereq, cremsg := e2termConn1.RecvSubsReq(t) seqBef := mainCtrl.get_msgcounter(t) - xappConn1.handle_xapp_subs_req(t, nil, cretrans) //Retransmitted SubReq + xappConn1.SendSubsReq(t, nil, cretrans) //Retransmitted SubReq mainCtrl.wait_msgcounter_change(t, seqBef, 10) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) + // 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) //Subs Delete - deltrans := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) - delreq, delmsg := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq, delmsg) - xappConn1.handle_xapp_subs_del_resp(t, deltrans) + 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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -212,31 +222,36 @@ func TestSubReqRetransmission(t *testing.T) { // //----------------------------------------------------------------------------- func TestSubDelReqRetransmission(t *testing.T) { - xapp.Logger.Info("TestSubDelReqRetransmission") + CaseBegin("TestSubDelReqRetransmission") //Subs Create - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) + cretrans := xappConn1.SendSubsReq(t, nil, nil) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) //Subs Delete - deltrans := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) - delreq, delmsg := e2termConn.handle_e2term_subs_del_req(t) + deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) seqBef := mainCtrl.get_msgcounter(t) - xappConn1.handle_xapp_subs_del_req(t, deltrans, e2SubsId) //Retransmitted SubDelReq + xappConn1.SendSubsDelReq(t, deltrans, e2SubsId) //Retransmitted SubDelReq mainCtrl.wait_msgcounter_change(t, seqBef, 10) - e2termConn.handle_e2term_subs_del_resp(t, delreq, delmsg) - xappConn1.handle_xapp_subs_del_resp(t, deltrans) + // 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) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -274,122 +289,130 @@ func TestSubDelReqRetransmission(t *testing.T) { //----------------------------------------------------------------------------- func TestSubDelReqCollision(t *testing.T) { - xapp.Logger.Info("TestSubDelReqCollision") + CaseBegin("TestSubDelReqCollision") //Subs Create - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) + cretrans := xappConn1.SendSubsReq(t, nil, nil) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) //Subs Delete - xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) - delreq1, delmsg1 := e2termConn.handle_e2term_subs_del_req(t) + xappConn1.SendSubsDelReq(t, nil, e2SubsId) + delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t) // Subs Delete colliding seqBef := mainCtrl.get_msgcounter(t) - deltranscol2 := xappConn1.newXappTransaction("", "RAN_NAME_1") - xappConn1.handle_xapp_subs_del_req(t, deltranscol2, e2SubsId) //Colliding SubDelReq + deltranscol2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1") + 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 - e2termConn.handle_e2term_subs_del_resp(t, delreq1, delmsg1) + e2termConn1.SendSubsDelResp(t, delreq1, delmsg1) // don't care in which order responses are received - xappConn1.handle_xapp_subs_del_resp(t, nil) - xappConn1.handle_xapp_subs_del_resp(t, nil) + xappConn1.RecvSubsDelResp(t, nil) + xappConn1.RecvSubsDelResp(t, nil) //Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.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) { - xapp.Logger.Info("TestSubReqAndSubDelOkTwoParallel") + CaseBegin("TestSubReqAndSubDelOkTwoParallel") //Req1 - rparams1 := &test_subs_req_params{} + rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() - rparams1.req.EventTriggerDefinition.ProcedureCode = 5 - cretrans1 := xappConn1.handle_xapp_subs_req(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.handle_e2term_subs_req(t) + cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) //Req2 - rparams2 := &test_subs_req_params{} + rparams2 := &teststube2ap.E2StubSubsReqParams{} rparams2.Init() - rparams2.req.EventTriggerDefinition.ProcedureCode = 28 - cretrans2 := xappConn2.handle_xapp_subs_req(t, rparams2, nil) - crereq2, cremsg2 := e2termConn.handle_e2term_subs_req(t) + + rparams2.Req.EventTriggerDefinition.Data.Length = 1 + rparams2.Req.EventTriggerDefinition.Data.Data = make([]uint8, rparams2.Req.EventTriggerDefinition.Data.Length) + rparams2.Req.EventTriggerDefinition.Data.Data[0] = 2 + + cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) + crereq2, cremsg2 := e2termConn1.RecvSubsReq(t) //Resp1 - e2termConn.handle_e2term_subs_resp(t, crereq1, cremsg1) - e2SubsId1 := xappConn1.handle_xapp_subs_resp(t, cretrans1) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) + e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Resp2 - e2termConn.handle_e2term_subs_resp(t, crereq2, cremsg2) - e2SubsId2 := xappConn2.handle_xapp_subs_resp(t, cretrans2) + e2termConn1.SendSubsResp(t, crereq2, cremsg2) + e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2) //Del1 - deltrans1 := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId1) - delreq1, delmsg1 := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq1, delmsg1) - xappConn1.handle_xapp_subs_del_resp(t, deltrans1) + 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 := xappConn2.handle_xapp_subs_del_req(t, nil, e2SubsId2) - delreq2, delmsg2 := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq2, delmsg2) - xappConn2.handle_xapp_subs_del_resp(t, deltrans2) + deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2) + 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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -435,43 +458,43 @@ func TestSubReqAndSubDelOkTwoParallel(t *testing.T) { // //----------------------------------------------------------------------------- func TestSameSubsDiffRan(t *testing.T) { - xapp.Logger.Info("TestSameSubsDiffRan") + CaseBegin("TestSameSubsDiffRan") //Req1 - cretrans1 := xappConn1.newXappTransaction("", "RAN_NAME_1") - xappConn1.handle_xapp_subs_req(t, nil, cretrans1) - crereq1, cremsg1 := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq1, cremsg1) - e2SubsId1 := xappConn1.handle_xapp_subs_resp(t, cretrans1) + cretrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1") + xappConn1.SendSubsReq(t, nil, cretrans1) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) + e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Req2 - cretrans2 := xappConn1.newXappTransaction("", "RAN_NAME_2") - xappConn1.handle_xapp_subs_req(t, nil, cretrans2) - crereq2, cremsg2 := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq2, cremsg2) - e2SubsId2 := xappConn1.handle_xapp_subs_resp(t, cretrans2) + cretrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_2") + xappConn1.SendSubsReq(t, nil, cretrans2) + crereq2, cremsg2 := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq2, cremsg2) + e2SubsId2 := xappConn1.RecvSubsResp(t, cretrans2) //Del1 - deltrans1 := xappConn1.newXappTransaction("", "RAN_NAME_1") - xappConn1.handle_xapp_subs_del_req(t, deltrans1, e2SubsId1) - delreq1, delmsg1 := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq1, delmsg1) - xappConn1.handle_xapp_subs_del_resp(t, deltrans1) + deltrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1") + xappConn1.SendSubsDelReq(t, deltrans1, 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.newXappTransaction("", "RAN_NAME_2") - xappConn1.handle_xapp_subs_del_req(t, deltrans2, e2SubsId2) - delreq2, delmsg2 := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq2, delmsg2) - xappConn1.handle_xapp_subs_del_resp(t, deltrans2) + deltrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_2") + xappConn1.SendSubsDelReq(t, deltrans2, e2SubsId2) + 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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -506,32 +529,32 @@ func TestSameSubsDiffRan(t *testing.T) { func TestSubReqRetryInSubmgr(t *testing.T) { - xapp.Logger.Info("TestSubReqRetryInSubmgr start") + CaseBegin("TestSubReqRetryInSubmgr start") // Xapp: Send SubsReq - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) + cretrans := xappConn1.SendSubsReq(t, nil, nil) // E2t: Receive 1st SubsReq - e2termConn.handle_e2term_subs_req(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 2nd SubsReq and send SubsResp - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) // Xapp: Receive SubsResp - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) - deltrans := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) - delreq, delmsg := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq, delmsg) - xappConn1.handle_xapp_subs_del_resp(t, deltrans) + 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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -569,27 +592,27 @@ func TestSubReqRetryInSubmgr(t *testing.T) { func TestSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) { - xapp.Logger.Info("TestSubReqTwoRetriesNoRespSubDelRespInSubmgr start") + CaseBegin("TestSubReqTwoRetriesNoRespSubDelRespInSubmgr start") // Xapp: Send SubsReq - xappConn1.handle_xapp_subs_req(t, nil, nil) + xappConn1.SendSubsReq(t, nil, nil) // E2t: Receive 1st SubsReq - e2termConn.handle_e2term_subs_req(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 2nd SubsReq - e2termConn.handle_e2term_subs_req(t) + e2termConn1.RecvSubsReq(t) // E2t: Send receive SubsDelReq and send SubsResp - delreq, delmsg := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(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) + mainCtrl.wait_subs_clean(t, delreq.RequestId.InstanceId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -624,29 +647,29 @@ func TestSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) { func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { - xapp.Logger.Info("TestSubReqTwoRetriesNoRespAtAllInSubmgr start") + CaseBegin("TestSubReqTwoRetriesNoRespAtAllInSubmgr start") // Xapp: Send SubsReq - xappConn1.handle_xapp_subs_req(t, nil, nil) + xappConn1.SendSubsReq(t, nil, nil) // E2t: Receive 1st SubsReq - e2termConn.handle_e2term_subs_req(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 2nd SubsReq - e2termConn.handle_e2term_subs_req(t) + e2termConn1.RecvSubsReq(t) // E2t: Receive 1st SubsDelReq - e2termConn.handle_e2term_subs_del_req(t) + e2termConn1.RecvSubsDelReq(t) // E2t: Receive 2nd SubsDelReq - delreq, _ := e2termConn.handle_e2term_subs_del_req(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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -667,6 +690,12 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { // | | SubFail | // | |<-------------| // | | | +// | | SubDelReq | +// | |------------->| +// | | | +// | | SubDelResp | +// | |<-------------| +// | | | // | SubFail | | // |<-------------| | // | | | @@ -675,26 +704,188 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { func TestSubReqSubFailRespInSubmgr(t *testing.T) { - xapp.Logger.Info("TestSubReqSubFailRespInSubmgr start") + CaseBegin("TestSubReqSubFailRespInSubmgr start") // Xapp: Send SubsReq - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) + cretrans := xappConn1.SendSubsReq(t, nil, nil) - // E2t: Receive SubsReq and send SubsFail - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - fparams := &test_subs_fail_params{} - fparams.Set(crereq) - e2termConn.handle_e2term_subs_fail(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.handle_xapp_subs_fail(t, cretrans) + e2SubsId := xappConn1.RecvSubsFail(t, cretrans) // Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + 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) + + // 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) } @@ -728,34 +919,34 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) { func TestSubDelReqRetryInSubmgr(t *testing.T) { - xapp.Logger.Info("TestSubDelReqRetryInSubmgr start") + CaseBegin("TestSubDelReqRetryInSubmgr start") // Subs Create - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) + cretrans := xappConn1.SendSubsReq(t, nil, nil) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) // Subs Delete // Xapp: Send SubsDelReq - deltrans := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) + deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) // E2t: Receive 1st SubsDelReq - e2termConn.handle_e2term_subs_del_req(t) + e2termConn1.RecvSubsDelReq(t) // E2t: Receive 2nd SubsDelReq and send SubsDelResp - delreq, delmsg := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq, delmsg) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) // Xapp: Receive SubsDelResp - xappConn1.handle_xapp_subs_del_resp(t, deltrans) + xappConn1.RecvSubsDelResp(t, deltrans) // Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -787,33 +978,33 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) { func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { - xapp.Logger.Info("TestSubDelReTwoRetriesNoRespInSubmgr start") + CaseBegin("TestSubDelReTwoRetriesNoRespInSubmgr start") // Subs Create - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) + cretrans := xappConn1.SendSubsReq(t, nil, nil) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) // Subs Delete // Xapp: Send SubsDelReq - deltrans := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) + deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) // E2t: Receive 1st SubsDelReq - e2termConn.handle_e2term_subs_del_req(t) + e2termConn1.RecvSubsDelReq(t) // E2t: Receive 2nd SubsDelReq - e2termConn.handle_e2term_subs_del_req(t) + e2termConn1.RecvSubsDelReq(t) // Xapp: Receive SubsDelResp - xappConn1.handle_xapp_subs_del_resp(t, deltrans) + xappConn1.RecvSubsDelResp(t, deltrans) // Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -845,30 +1036,30 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) { - xapp.Logger.Info("TestSubReqSubDelFailRespInSubmgr start") + CaseBegin("TestSubReqSubDelFailRespInSubmgr start") // Subs Create - cretrans := xappConn1.handle_xapp_subs_req(t, nil, nil) - crereq, cremsg := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq, cremsg) - e2SubsId := xappConn1.handle_xapp_subs_resp(t, cretrans) + cretrans := xappConn1.SendSubsReq(t, nil, nil) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) // Xapp: Send SubsDelReq - deltrans := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId) + deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) // E2t: Send receive SubsDelReq and send SubsDelFail - delreq, delmsg := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_fail(t, delreq, delmsg) + delreq, delmsg := e2termConn1.RecvSubsDelReq(t) + e2termConn1.SendSubsDelFail(t, delreq, delmsg) // Xapp: Receive SubsDelResp - xappConn1.handle_xapp_subs_del_resp(t, deltrans) + xappConn1.RecvSubsDelResp(t, deltrans) // Wait that subs is cleaned mainCtrl.wait_subs_clean(t, e2SubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } @@ -876,290 +1067,529 @@ 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) { - xapp.Logger.Info("TestSubReqAndSubDelOkSameAction") + CaseBegin("TestSubReqAndSubDelOkSameAction") //Req1 - rparams1 := &test_subs_req_params{} + rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() - cretrans1 := xappConn1.handle_xapp_subs_req(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.handle_e2term_subs_req(t) - e2termConn.handle_e2term_subs_resp(t, crereq1, cremsg1) - e2SubsId1 := xappConn1.handle_xapp_subs_resp(t, cretrans1) + cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) + e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Req2 - rparams2 := &test_subs_req_params{} + rparams2 := &teststube2ap.E2StubSubsReqParams{} rparams2.Init() - cretrans2 := xappConn2.handle_xapp_subs_req(t, rparams2, nil) - //crereq2, cremsg2 := e2termConn.handle_e2term_subs_req(t) - //e2termConn.handle_e2term_subs_resp(t, crereq2, cremsg2) - e2SubsId2 := xappConn2.handle_xapp_subs_resp(t, cretrans2) + cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) + //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.handle_xapp_subs_del_req(t, nil, e2SubsId1) - //e2termConn.handle_e2term_subs_del_req(t) - //e2termConn.handle_e2term_subs_del_resp(t, delreq1, delmsg1) - xappConn1.handle_xapp_subs_del_resp(t, deltrans1) + deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1) + //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.handle_xapp_subs_del_req(t, nil, e2SubsId2) - delreq2, delmsg2 := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq2, delmsg2) - xappConn2.handle_xapp_subs_del_resp(t, deltrans2) + deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2) + 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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.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) { - xapp.Logger.Info("TestSubReqAndSubDelOkSameActionParallel") + CaseBegin("TestSubReqAndSubDelOkSameActionParallel") //Req1 - rparams1 := &test_subs_req_params{} + rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() - cretrans1 := xappConn1.handle_xapp_subs_req(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.handle_e2term_subs_req(t) + cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil) + crereq1, cremsg1 := e2termConn1.RecvSubsReq(t) //Req2 - rparams2 := &test_subs_req_params{} + rparams2 := &teststube2ap.E2StubSubsReqParams{} rparams2.Init() - cretrans2 := xappConn2.handle_xapp_subs_req(t, rparams2, nil) + cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) //Resp1 - e2termConn.handle_e2term_subs_resp(t, crereq1, cremsg1) - e2SubsId1 := xappConn1.handle_xapp_subs_resp(t, cretrans1) + e2termConn1.SendSubsResp(t, crereq1, cremsg1) + e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1) //Resp2 - e2SubsId2 := xappConn2.handle_xapp_subs_resp(t, cretrans2) + e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2) //Del1 - deltrans1 := xappConn1.handle_xapp_subs_del_req(t, nil, e2SubsId1) - xappConn1.handle_xapp_subs_del_resp(t, deltrans1) + deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1) + xappConn1.RecvSubsDelResp(t, deltrans1) //Del2 - deltrans2 := xappConn2.handle_xapp_subs_del_req(t, nil, e2SubsId2) - delreq2, delmsg2 := e2termConn.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(t, delreq2, delmsg2) - xappConn2.handle_xapp_subs_del_resp(t, deltrans2) + deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2) + 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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } //----------------------------------------------------------------------------- // TestSubReqAndSubDelNokSameActionParallel // +// stub stub stub +// +-------+ +-------+ +---------+ +---------+ +// | xapp2 | | xapp1 | | submgr | | e2term | +// +-------+ +-------+ +---------+ +---------+ +// | | | | +// | | | | +// | | | | +// | | SubReq1 | | +// | |------------->| | +// | | | | +// | | | SubReq1 | +// | | |------------->| +// | SubReq2 | | +// |--------------------------->| | +// | | | SubFail1 | +// | | |<-------------| +// | | | | +// | | | SubDelReq | +// | | |------------->| +// | | | SubDelResp | +// | | |<-------------| +// | | | | +// | | SubFail1 | | +// | |<-------------| | +// | | | | +// | SubFail2 | | +// |<---------------------------| | +// +//----------------------------------------------------------------------------- +func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { + CaseBegin("TestSubReqAndSubDelNokSameActionParallel") + + //Req1 + 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() + subepcnt2 := mainCtrl.get_subs_entrypoint_cnt(t, crereq1.RequestId.InstanceId) + cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil) + mainCtrl.wait_subs_entrypoint_cnt_change(t, crereq1.RequestId.InstanceId, subepcnt2, 10) + + // 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) + //Fail2 + xappConn2.RecvSubsFail(t, cretrans2) + + //Wait that subs is cleaned + mainCtrl.wait_subs_clean(t, e2SubsId1, 15) + + xappConn1.TestMsgChanEmpty(t) + xappConn2.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) + + crereq1, _ := e2termConn1.RecvSubsReq(t) + + //Req2 + rparams2 := &teststube2ap.E2StubSubsReqParams{} + rparams2.Init() + subepcnt2 := mainCtrl.get_subs_entrypoint_cnt(t, crereq1.RequestId.InstanceId) + xappConn2.SendSubsReq(t, rparams2, nil) + mainCtrl.wait_subs_entrypoint_cnt_change(t, crereq1.RequestId.InstanceId, subepcnt2, 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.InstanceId, 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 | +// | |<-------------| // | | | -// | SubReq1 | | +// | SubResp | | +// |<-------------| | +// | | | +// | | | +// | SubDelReq | | // |------------->| | // | | | -// | | SubReq1 | +// | | SubDelReq | // | |------------->| -// | SubReq2 | | -// |------------->| | -// | | SubFail1 | +// | | | +// | | SubDelResp | // | |<-------------| -// | SubFail1 | | -// |<-------------| | // | | | -// | SubFail2 | | +// | SubDelResp | | // |<-------------| | // //----------------------------------------------------------------------------- -func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { - xapp.Logger.Info("TestSubReqAndSubDelNokSameActionParallel") +func TestSubReqPolicyAndSubDelOk(t *testing.T) { + CaseBegin("TestSubReqAndSubDelOk") - //Req1 - rparams1 := &test_subs_req_params{} + rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() - cretrans1 := xappConn1.handle_xapp_subs_req(t, rparams1, nil) - crereq1, cremsg1 := e2termConn.handle_e2term_subs_req(t) - - //Req2 - rparams2 := &test_subs_req_params{} - rparams2.Init() - seqBef2 := mainCtrl.get_msgcounter(t) - cretrans2 := xappConn2.handle_xapp_subs_req(t, rparams2, nil) - mainCtrl.wait_msgcounter_change(t, seqBef2, 10) + rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy + cretrans := xappConn1.SendSubsReq(t, rparams1, nil) - //E2T Fail - fparams := &test_subs_fail_params{} - fparams.Set(crereq1) - e2termConn.handle_e2term_subs_fail(t, fparams, cremsg1) + 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) - //Fail1 - e2SubsId1 := xappConn1.handle_xapp_subs_fail(t, cretrans1) - //Fail2 - xappConn2.handle_xapp_subs_fail(t, cretrans2) + e2termConn1.SendSubsDelResp(t, delreq, delmsg) + xappConn1.RecvSubsDelResp(t, deltrans) //Wait that subs is cleaned - mainCtrl.wait_subs_clean(t, e2SubsId1, 15) + mainCtrl.wait_subs_clean(t, e2SubsId, 10) - xappConn1.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) + xappConn1.TestMsgChanEmpty(t) + xappConn2.TestMsgChanEmpty(t) + e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } //----------------------------------------------------------------------------- -// TestSubReqAndSubDelNoAnswerSameActionParallel +// TestSubReqPolicyChangeAndSubDelOk // // stub stub // +-------+ +---------+ +---------+ // | xapp | | submgr | | e2term | // +-------+ +---------+ +---------+ // | | | -// | | | -// | | | -// | SubReq1 | | +// | SubReq | | // |------------->| | // | | | -// | | SubReq1 | +// | | SubReq | // | |------------->| -// | SubReq2 | | +// | | | +// | | SubResp | +// | |<-------------| +// | | | +// | SubResp | | +// |<-------------| | +// | | | +// | SubReq | | // |------------->| | // | | | -// | | SubReq1 | +// | | SubReq | // | |------------->| // | | | +// | | SubResp | +// | |<-------------| +// | | | +// | SubResp | | +// |<-------------| | +// | | | +// | SubDelReq | | +// |------------->| | // | | | // | | SubDelReq | // | |------------->| // | | | // | | SubDelResp | // | |<-------------| +// | | | +// | SubDelResp | | +// |<-------------| | // //----------------------------------------------------------------------------- -func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { - xapp.Logger.Info("TestSubReqAndSubDelNoAnswerSameActionParallel") - //Req1 - rparams1 := &test_subs_req_params{} +func TestSubReqPolicyChangeAndSubDelOk(t *testing.T) { + CaseBegin("TestSubReqAndSubDelOk") + + rparams1 := &teststube2ap.E2StubSubsReqParams{} rparams1.Init() - xappConn1.handle_xapp_subs_req(t, rparams1, nil) + rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy + cretrans := xappConn1.SendSubsReq(t, rparams1, nil) - e2termConn.handle_e2term_subs_req(t) + crereq, cremsg := e2termConn1.RecvSubsReq(t) + e2termConn1.SendSubsResp(t, crereq, cremsg) + e2SubsId := xappConn1.RecvSubsResp(t, cretrans) - //Req2 - rparams2 := &test_subs_req_params{} - rparams2.Init() - seqBef2 := mainCtrl.get_msgcounter(t) - xappConn2.handle_xapp_subs_req(t, rparams2, nil) - mainCtrl.wait_msgcounter_change(t, seqBef2, 10) + //Policy change + rparams1.Req.RequestId.InstanceId = e2SubsId + rparams1.Req.ActionSetups[0].SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitW200ms + xappConn1.SendSubsReq(t, rparams1, cretrans) - //Req1 (retransmitted) - e2termConn.handle_e2term_subs_req(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.handle_e2term_subs_del_req(t) - e2termConn.handle_e2term_subs_del_resp(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.TestMsgCnt(t) - xappConn2.TestMsgCnt(t) - e2termConn.TestMsgCnt(t) - mainCtrl.wait_registry_empty(t, 15) + xappConn1.TestMsgChanEmpty(t) + xappConn2.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) }