"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
//
// 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
// mainCtrl.SimulateRestart(t)
// xapp.Logger.Debug("mainCtrl.SimulateRestart done")
-
queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13660"})
// Delete subscription 2
mainCtrl.VerifyCounterValues(t)
}
-/*
func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
subReqCount := 2
mainCtrl.VerifyCounterValues(t)
}
-*/
-/*
+
func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
subReqCount := 19
mainCtrl.VerifyCounterValues(t)
}
-*/
func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
CaseBegin("TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen")