X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=d20b8726361911dab6ff3f2e095577b8098e00ab;hb=fa39fedbbd1c2e6bfea4b952184936f393ff2690;hp=b91b4b8a93efcaaca210c51e44b78fe8cab387f3;hpb=da34eecb23220659f8d519973c03d29444797998;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index b91b4b8..d20b872 100644
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -24,11 +24,28 @@ import (
 	"time"
 
 	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap_wrapper"
 	"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"
 )
 
+func TestRESTSubReqAndDeleteOkWithE2apUtWrapper(t *testing.T) {
+
+	// The effect of this call shall endure thgough the UT suite!
+	// If this causes any issues, the previout interface can be restored
+	// like this:
+	// SetPackerIf(e2ap_wrapper.NewAsn1E2APPacker())
+
+	SetPackerIf(e2ap_wrapper.NewUtAsn1E2APPacker())
+
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, nil)
+
+	deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
+
+	waitSubsCleanup(t, e2SubsId, 10)
+}
+
 //-----------------------------------------------------------------------------
 // TestSubReqAndRouteNok
 //
@@ -4167,8 +4184,10 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 	//	mainCtrl.SimulateRestart(t)
 	//	xapp.Logger.Debug("mainCtrl.SimulateRestart done")
 
-	// Delete subscription 1
+	// Delete subscription 1, and wait until it has removed the first endpoint
+	subepcnt := mainCtrl.get_subs_entrypoint_cnt(t, e2SubsId1)
 	xappConn1.SendRESTSubsDelReq(t, &restSubId1)
+	mainCtrl.wait_subs_entrypoint_cnt_change(t, e2SubsId1, subepcnt, 10)
 
 	// When SDL support for the REST Interface is added
 	// the submgr restart statement below should be removed
@@ -4176,7 +4195,6 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 
 	//	mainCtrl.SimulateRestart(t)
 	//	xapp.Logger.Debug("mainCtrl.SimulateRestart done")
-
 	queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13660"})
 
 	// Delete subscription 2
@@ -4435,7 +4453,6 @@ func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
 	mainCtrl.VerifyCounterValues(t)
 }
 
-/*
 func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
 
 	subReqCount := 2
@@ -4471,8 +4488,7 @@ func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
 
 	mainCtrl.VerifyCounterValues(t)
 }
-*/
-/*
+
 func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
 
 	subReqCount := 19
@@ -4508,7 +4524,373 @@ func TestRESTFullAmountReportSubReqAndSubDelOk(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
 ////////////////////////////////////////////////////////////////////////////////////