X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=81464b8cb68c8cc93ef177c0c19fc550ac64f5a6;hb=47518ae7612cbfb1562fa1f74b9023389d8cfd61;hp=e1d3424a42934520908e8b58264165eb3bdc504e;hpb=4abf18056b1674fb284c4d7d753c35a3ddab37e4;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go index e1d3424..81464b8 100644 --- a/pkg/control/ut_messaging_test.go +++ b/pkg/control/ut_messaging_test.go @@ -56,9 +56,10 @@ func TestSubReqAndRouteNok(t *testing.T) { CaseBegin("TestSubReqAndRouteNok") // Init counter check - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cRouteCreateFail, 1) - mainCtrl.GetCounterValuesBefore(t) + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cRouteCreateFail, 1}, + }) waiter := rtmgrHttp.AllocNextEvent(false) newSubsId := mainCtrl.get_registry_next_subid(t) @@ -108,17 +109,17 @@ func TestSubReqAndRouteUpdateNok(t *testing.T) { CaseBegin("TestSubReqAndRouteUpdateNok") // Init counter check - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 2) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cRouteCreateUpdateFail, 1) - - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 1) - mainCtrl.GetCounterValuesBefore(t) + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 2}, + Counter{cSubReqToE2, 1}, + Counter{cSubRespFromE2, 1}, + Counter{cSubRespToXapp, 1}, + Counter{cRouteCreateUpdateFail, 1}, + Counter{cSubDelReqFromXapp, 1}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, + Counter{cSubDelRespToXapp, 1}, + }) cretrans := xappConn1.SendSubsReq(t, nil, nil) crereq, cremsg := e2termConn1.RecvSubsReq(t) @@ -128,7 +129,7 @@ func TestSubReqAndRouteUpdateNok(t *testing.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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560"}) waiter := rtmgrHttp.AllocNextEvent(false) newSubsId := mainCtrl.get_registry_next_subid(t) @@ -184,17 +185,17 @@ func TestSubDelReqAndRouteDeleteNok(t *testing.T) { CaseBegin("TestSubDelReqAndRouteDeleteNok") // Init counter check - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 1) - - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cRouteDeleteFail, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 1) - mainCtrl.GetCounterValuesBefore(t) + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cSubReqToE2, 1}, + Counter{cSubRespFromE2, 1}, + Counter{cSubRespToXapp, 1}, + Counter{cSubDelReqFromXapp, 1}, + Counter{cRouteDeleteFail, 1}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, + Counter{cSubDelRespToXapp, 1}, + }) cretrans := xappConn1.SendSubsReq(t, nil, nil) crereq, cremsg := e2termConn1.RecvSubsReq(t) @@ -204,7 +205,7 @@ func TestSubDelReqAndRouteDeleteNok(t *testing.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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560"}) deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) delreq, delmsg := e2termConn1.RecvSubsDelReq(t) @@ -280,17 +281,17 @@ func TestSubMergeDelAndRouteUpdateNok(t *testing.T) { CaseBegin("TestSubMergeDelAndRouteUpdateNok") // Init counter check - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 2) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 2) - - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 2) - mainCtrl.SetTimesCounterWillBeAdded(cRouteDeleteUpdateFail, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 2) - mainCtrl.GetCounterValuesBefore(t) + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 2}, + Counter{cSubReqToE2, 1}, + Counter{cSubRespFromE2, 1}, + Counter{cSubRespToXapp, 2}, + Counter{cSubDelReqFromXapp, 2}, + Counter{cRouteDeleteUpdateFail, 1}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, + Counter{cSubDelRespToXapp, 2}, + }) //Req1 rparams1 := &teststube2ap.E2StubSubsReqParams{} @@ -309,7 +310,7 @@ func TestSubMergeDelAndRouteUpdateNok(t *testing.T) { 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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560", "localhost:13660"}) //Del1 waiter := rtmgrHttp.AllocNextEvent(false) @@ -374,16 +375,16 @@ func TestSubReqAndSubDelOk(t *testing.T) { CaseBegin("TestSubReqAndSubDelOk") // Init counter check - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 1) - - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 1) - mainCtrl.GetCounterValuesBefore(t) + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cSubReqToE2, 1}, + Counter{cSubRespFromE2, 1}, + Counter{cSubRespToXapp, 1}, + Counter{cSubDelReqFromXapp, 1}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, + Counter{cSubDelRespToXapp, 1}, + }) cretrans := xappConn1.SendSubsReq(t, nil, nil) crereq, cremsg := e2termConn1.RecvSubsReq(t) @@ -393,7 +394,7 @@ func TestSubReqAndSubDelOk(t *testing.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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560"}) deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) delreq, delmsg := e2termConn1.RecvSubsDelReq(t) @@ -809,18 +810,20 @@ func TestSameSubsDiffRan(t *testing.T) { //----------------------------------------------------------------------------- func TestSubReqRetryInSubmgr(t *testing.T) { - CaseBegin("TestSubReqRetryInSubmgr start") - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 1) - mainCtrl.GetCounterValuesBefore(t) + + // Init counter check + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cSubReqToE2, 1}, + Counter{cSubReReqToE2, 1}, + Counter{cSubRespFromE2, 1}, + Counter{cSubRespToXapp, 1}, + Counter{cSubDelReqFromXapp, 1}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, + Counter{cSubDelRespToXapp, 1}, + }) // Xapp: Send SubsReq cretrans := xappConn1.SendSubsReq(t, nil, nil) @@ -879,15 +882,17 @@ func TestSubReqRetryInSubmgr(t *testing.T) { //----------------------------------------------------------------------------- func TestSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) { - CaseBegin("TestSubReqTwoRetriesNoRespSubDelRespInSubmgr start") - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqTimerExpiry, 2) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.GetCounterValuesBefore(t) + + // Init counter check + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cSubReqToE2, 1}, + Counter{cSubReReqToE2, 1}, + Counter{cSubReqTimerExpiry, 2}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, + }) // Xapp: Send SubsReq xappConn1.SendSubsReq(t, nil, nil) @@ -943,15 +948,17 @@ func TestSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) { //----------------------------------------------------------------------------- func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { - CaseBegin("TestSubReqTwoRetriesNoRespAtAllInSubmgr start") - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqTimerExpiry, 2) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqTimerExpiry, 2) - mainCtrl.GetCounterValuesBefore(t) + + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cSubReqToE2, 1}, + Counter{cSubReReqToE2, 1}, + Counter{cSubReqTimerExpiry, 2}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelReReqToE2, 1}, + Counter{cSubDelReqTimerExpiry, 2}, + }) // Xapp: Send SubsReq xappConn1.SendSubsReq(t, nil, nil) @@ -996,12 +1003,6 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { // | | SubFail | // | |<-------------| // | | | -// | | SubDelReq | -// | |------------->| -// | | | -// | | SubDelResp | -// | |<-------------| -// | | | // | SubFail | | // |<-------------| | // | | | @@ -1009,15 +1010,14 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { //----------------------------------------------------------------------------- func TestSubReqSubFailRespInSubmgr(t *testing.T) { - CaseBegin("TestSubReqSubFailRespInSubmgr start") - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubFailFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubFailToXapp, 1) - mainCtrl.GetCounterValuesBefore(t) + + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cSubReqToE2, 1}, + Counter{cSubFailFromE2, 1}, + Counter{cSubFailToXapp, 1}, + }) // Xapp: Send SubsReq cretrans := xappConn1.SendSubsReq(t, nil, nil) @@ -1028,10 +1028,6 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) { 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) @@ -1192,17 +1188,18 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { //----------------------------------------------------------------------------- func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) { - CaseBegin("TestSubReqSubDelFailRespInSubmgr start") - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelFailFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 1) - mainCtrl.GetCounterValuesBefore(t) + + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 1}, + Counter{cSubReqToE2, 1}, + Counter{cSubRespFromE2, 1}, + Counter{cSubRespToXapp, 1}, + Counter{cSubDelReqFromXapp, 1}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelFailFromE2, 1}, + Counter{cSubDelRespToXapp, 1}, + }) // Subs Create cretrans := xappConn1.SendSubsReq(t, nil, nil) @@ -1280,17 +1277,18 @@ func TestSubReqAndSubDelOkSameAction(t *testing.T) { CaseBegin("TestSubReqAndSubDelOkSameAction") // Init counter check - mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 2) - mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 2) - mainCtrl.SetTimesCounterWillBeAdded(cMergedSubscriptions, 1) - mainCtrl.SetTimesCounterWillBeAdded(cUnmergedSubscriptions, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 2) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1) - mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 2) - mainCtrl.GetCounterValuesBefore(t) + mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ + Counter{cSubReqFromXapp, 2}, + Counter{cSubReqToE2, 1}, + Counter{cSubRespFromE2, 1}, + Counter{cSubRespToXapp, 2}, + Counter{cMergedSubscriptions, 1}, + Counter{cUnmergedSubscriptions, 1}, + Counter{cSubDelReqFromXapp, 2}, + Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, + Counter{cSubDelRespToXapp, 2}, + }) //Req1 rparams1 := &teststube2ap.E2StubSubsReqParams{} @@ -1311,7 +1309,7 @@ func TestSubReqAndSubDelOkSameAction(t *testing.T) { 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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560", "localhost:13660"}) //Del1 deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1) @@ -1441,11 +1439,6 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) { // | | | SubFail1 | // | | |<-------------| // | | | | -// | | | SubDelReq | -// | | |------------->| -// | | | SubDelResp | -// | | |<-------------| -// | | | | // | | SubFail1 | | // | |<-------------| | // | | | | @@ -1476,10 +1469,6 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) { 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 @@ -1947,7 +1936,7 @@ func TestSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) { resp, _ := xapp.Subscription.QuerySubscriptions() assert.Equal(t, resp[0].Meid, "RAN_NAME_1") - assert.Equal(t, resp[0].Endpoint, []string{"localhost:13560"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560"}) e2SubsId := uint32(resp[0].SubscriptionID) t.Logf("e2SubsId = %v", e2SubsId) @@ -2014,7 +2003,7 @@ func TestSubReqAndSubDelOkWithRestartInMiddle(t *testing.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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560"}) mainCtrl.SimulateRestart(t) @@ -2022,7 +2011,7 @@ func TestSubReqAndSubDelOkWithRestartInMiddle(t *testing.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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560"}) deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId) delreq, delmsg := e2termConn1.RecvSubsDelReq(t) @@ -2115,7 +2104,7 @@ func TestSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) { 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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560", "localhost:13660"}) mainCtrl.SimulateRestart(t) @@ -2123,7 +2112,7 @@ func TestSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) { 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"}) + assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560", "localhost:13660"}) //Del1 deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1) @@ -2149,3 +2138,37 @@ func TestSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) { e2termConn1.TestMsgChanEmpty(t) mainCtrl.wait_registry_empty(t, 10) } + +//----------------------------------------------------------------------------- +// Test debug GET and POST requests +// +// curl +// +-------+ +---------+ +// | user | | submgr | +// +-------+ +---------+ +// | | +// | GET/POST Req | +// |------------->| +// | Resp | +// |<-------------| +// | | + +func TestGetSubscriptions(t *testing.T) { + + mainCtrl.sendGetRequest(t, "localhost:8088", "/ric/v1/subscriptions") +} + +func TestGetSymptomData(t *testing.T) { + + mainCtrl.sendGetRequest(t, "localhost:8080", "/ric/v1/symptomdata") +} + +func TestPostdeleteSubId(t *testing.T) { + + mainCtrl.sendPostRequest(t, "localhost:8080", "/ric/v1/test/deletesubid=1") +} + +func TestPostEmptyDb(t *testing.T) { + + mainCtrl.sendPostRequest(t, "localhost:8080", "/ric/v1/test/emptydb") +}