const parameterSet = 1
const actionDefinitionPresent bool = true
const actionParamCount int = 1
- waiter := rtmgrHttp.AllocNextEvent(false)
+ // Add delay for rtmgt HTTP handling so that HTTP response is received before notify on XAPP side
+ waiter := rtmgrHttp.AllocNextSleep(50, false)
newSubsId := mainCtrl.get_registry_next_subid(t)
// Req
params := xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
restSubId := xappConn1.SendRESTSubsReq(t, params)
-
+ xappConn1.ExpectRESTNotification(t, restSubId)
waiter.WaitResult(t)
- xappConn1.ExpectRESTNotification(t, restSubId)
e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId)
// | | |
//
//-----------------------------------------------------------------------------
-/*
+
func TestRESTSubReqRetransmission(t *testing.T) {
CaseBegin("TestRESTSubReqRetransmission")
delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
- // Wait that subs is cleaned
- mainCtrl.wait_subs_clean(t, e2SubsIdA.E2SubsId, 10)
-
// Del2
xappConn2.SendRESTSubsDelReq(t, &restSubId2)
delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
+ mainCtrl.wait_multi_subs_clean(t, []uint32{e2SubsIdA.E2SubsId, e2SubsIdB.E2SubsId}, 10)
+
waitSubsCleanup(t, e2SubsIdB.E2SubsId, 10)
mainCtrl.VerifyCounterValues(t)
}
-*/
+
func TestRESTSubDelReqRetransmission(t *testing.T) {
CaseBegin("TestRESTSubDelReqRetransmission")
xapp.Subscription.SetResponseCB(xappConn2.SubscriptionRespHandler)
xappConn2.WaitRESTNotificationForAnySubscriptionId(t)
+ waiter := rtmgrHttp.AllocNextSleep(10, true)
restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ waiter.WaitResult(t)
xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
e2SubsId2 := <-xappConn2.RESTNotification
xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId2)
e2termConn1.RecvSubsReq(t)
delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
- xappConn1.ExpectRESTNotification(t, restSubId1) // or restSubId2?
- // xappConn2.WaitRESTNotification(t)
- e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
- e2SubsId1 := xappConn1.WaitRESTNotification(t, restSubId1)
- xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId1)
+ xappConn1.WaitListedRestNotifications(t, []string{restSubId1, restSubId2})
+ e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
- // e2SubsId2 := <-xappConn2.RESTNotification
- // xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId2)
+ e2SubsIdA := <-xappConn1.ListedRESTNotifications
+ xapp.Logger.Info("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
+ e2SubsIdB := <-xappConn1.ListedRESTNotifications
+ xapp.Logger.Info("TEST: 2.nd XAPP notification received e2SubsId=%v", e2SubsIdB)
// Del1
xappConn1.SendRESTSubsDelReq(t, &restSubId1)
// Del2
xappConn2.SendRESTSubsDelReq(t, &restSubId2)
+ mainCtrl.wait_multi_subs_clean(t, []uint32{e2SubsIdA.E2SubsId, e2SubsIdB.E2SubsId}, 10)
+
//Wait that subs is cleaned
- waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsIdA.E2SubsId, 10)
mainCtrl.VerifyCounterValues(t)
}
mainCtrl.wait_registry_empty(t, 10)
}
-/*
func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
subReqCount := 2
mainCtrl.VerifyCounterValues(t)
}
-*/
-/*
func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
subReqCount := 19
mainCtrl.VerifyCounterValues(t)
}
-*/
-/*
func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
subReqCount := 2
mainCtrl.VerifyCounterValues(t)
}
-*/
+
/*
func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
mainCtrl.VerifyCounterValues(t)
}
*/
+
+func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
+ CaseBegin("TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ var params *teststube2ap.RESTSubsReqParams = nil
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+ params.SetMeid("RAN_NAME_1")
+ eventTriggerDefinition := "1234"
+ params.SetSubEventTriggerDefinition(eventTriggerDefinition)
+
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
+func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
+ CaseBegin("TestRESTSubReqReportSameActionDiffActionListLen")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ var params *teststube2ap.RESTSubsReqParams = nil
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+ params.SetMeid("RAN_NAME_1")
+
+ actionId := int64(1)
+ actionType := "report"
+ actionDefinition := "56781"
+ subsequestActionType := "continue"
+ timeToWait := "w10ms"
+ params.AppendActionToActionToBeSetupList(actionId, actionType, actionDefinition, subsequestActionType, timeToWait)
+
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
+func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
+ CaseBegin("TestRESTSubReqReportSameActionDiffActionID")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ var params *teststube2ap.RESTSubsReqParams = nil
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+ params.SetMeid("RAN_NAME_1")
+ params.SetSubActionIDs(int64(2))
+
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
+func TestRESTSubReqDiffActionType(t *testing.T) {
+ CaseBegin("TestRESTSubReqDiffActionType")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount, actionDefinitionPresent, policyParamCount)
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+ params.SetMeid("RAN_NAME_1")
+
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
+func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
+ CaseBegin("TestRESTSubReqPolicyAndSubDelOkSameAction")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount, actionDefinitionPresent, policyParamCount)
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqPolicyParams(subReqCount, actionDefinitionPresent, policyParamCount)
+ params.SetMeid("RAN_NAME_1")
+
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
+func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
+ CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionLen")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ var params *teststube2ap.RESTSubsReqParams = nil
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+ params.SetMeid("RAN_NAME_1")
+ actionDefinition := "5678"
+ params.SetSubActionDefinition(actionDefinition)
+
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
+func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
+ CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionContents")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ var params *teststube2ap.RESTSubsReqParams = nil
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+ params.SetMeid("RAN_NAME_1")
+ actionDefinition := "56782"
+ params.SetSubActionDefinition(actionDefinition)
+
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
+func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
+ CaseBegin("TestRESTSubReqReportSameActionDiffSubsAction")
+
+ mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+ Counter{cSubReqFromXapp, 2},
+ Counter{cSubReqToE2, 2},
+ Counter{cSubRespFromE2, 2},
+ Counter{cSubRespToXapp, 2},
+ Counter{cSubDelReqFromXapp, 2},
+ Counter{cSubDelReqToE2, 2},
+ Counter{cSubDelRespFromE2, 2},
+ Counter{cSubDelRespToXapp, 2},
+ })
+
+ // Req1
+ var params *teststube2ap.RESTSubsReqParams = nil
+
+ //Subs Create
+ restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+
+ queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
+
+ // Req2
+ params = xappConn2.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+ params.SetMeid("RAN_NAME_1")
+ params.SetTimeToWait("w200ms")
+ restSubId2 := xappConn2.SendRESTSubsReq(t, params)
+ xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+ crereq, cremsg := e2termConn1.RecvSubsReq(t)
+ xappConn2.ExpectRESTNotification(t, restSubId2)
+ e2termConn1.SendSubsResp(t, crereq, cremsg)
+ e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
+
+ deleteXapp1Subscription(t, &restSubId1)
+ deleteXapp2Subscription(t, &restSubId2)
+
+ waitSubsCleanup(t, e2SubsId1, 10)
+ waitSubsCleanup(t, e2SubsId2, 10)
+
+ mainCtrl.VerifyCounterValues(t)
+
+}
+
////////////////////////////////////////////////////////////////////////////////////
// Services for UT cases
////////////////////////////////////////////////////////////////////////////////////