X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=b1379052548864c83c916d90ba6324d1c691193d;hb=b3277dceb4d0791961942583781f371222fb12ff;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..b137905 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,1272 @@ 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)
+
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionResponseDecodeFail
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp | ASN.1 decode fails
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | Duplicated action
+//     |                 |<-------------|
+//     | RESTNotif (fail)|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionResponseDecodeFail")
+	subReqCount := 1
+	parameterSet := 1 // E2SM-gNB-X2
+	actionDefinitionPresent := true
+	actionParamCount := 1
+
+	// Req
+	params := xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+	restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+	crereq, cremsg := e2termConn1.RecvSubsReq(t)
+	// Decode of this response fails which will result resending original request
+	e2termConn1.SendInvalidE2Asn1Resp(t, cremsg, xapp.RIC_SUB_RESP)
+
+	_, cremsg = e2termConn1.RecvSubsReq(t)
+
+	xappConn1.ExpectRESTNotification(t, restSubId)
+
+	// Subscription already created in E2 Node.
+	fparams := &teststube2ap.E2StubSubsFailParams{}
+	fparams.Set(crereq)
+	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	instanceId := xappConn1.WaitRESTNotification(t, restSubId)
+	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionResponseUnknownInstanceId
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp | Unknown instanceId
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | Duplicated action
+//     |                 |<-------------|
+//     | RESTNotif (fail)|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionResponseUnknownInstanceId")
+	subReqCount := 1
+	parameterSet := 1 // E2SM-gNB-X2
+	actionDefinitionPresent := true
+	actionParamCount := 1
+
+	// Req
+	params := xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+	restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+	crereq, cremsg := e2termConn1.RecvSubsReq(t)
+
+	// Unknown instanceId in this response which will result resending original request
+	orgInstanceId := crereq.RequestId.InstanceId
+	crereq.RequestId.InstanceId = 0
+	e2termConn1.SendSubsResp(t, crereq, cremsg)
+
+	_, cremsg = e2termConn1.RecvSubsReq(t)
+
+	xappConn1.ExpectRESTNotification(t, restSubId)
+
+	// Subscription already created in E2 Node.
+	fparams := &teststube2ap.E2StubSubsFailParams{}
+	fparams.Set(crereq)
+	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	instanceId := xappConn1.WaitRESTNotification(t, restSubId)
+	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, orgInstanceId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionResponseNoTransaction
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp | No transaction for the response
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | Duplicated action
+//     |                 |<-------------|
+//     | RESTNotif (fail)|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionResponseNoTransaction")
+	subReqCount := 1
+	parameterSet := 1 // E2SM-gNB-X2
+	actionDefinitionPresent := true
+	actionParamCount := 1
+
+	// Req
+	params := xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+	restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+	crereq, cremsg := e2termConn1.RecvSubsReq(t)
+
+	mainCtrl.MakeTransactionNil(t, crereq.RequestId.InstanceId)
+	// No transaction exist for this response which will result resending original request
+	e2termConn1.SendSubsResp(t, crereq, cremsg)
+
+	_, cremsg = e2termConn1.RecvSubsReq(t)
+
+	xappConn1.ExpectRESTNotification(t, restSubId)
+
+	// Subscription already created in E2 Node.
+	fparams := &teststube2ap.E2StubSubsFailParams{}
+	fparams.Set(crereq)
+	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	// Resending happens because there no transaction
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	instanceId := xappConn1.WaitRESTNotification(t, restSubId)
+	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionFailureDecodeFail
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | ASN.1 decode fails
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | Duplicated action
+//     |                 |<-------------|
+//     | RESTNotif (fail)|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionFailureDecodeFail")
+	subReqCount := 1
+	parameterSet := 1 // E2SM-gNB-X2
+	actionDefinitionPresent := true
+	actionParamCount := 1
+
+	// Req
+	params := xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+	restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+	crereq, cremsg := e2termConn1.RecvSubsReq(t)
+
+	// Decode of this response fails which will result resending original request
+	e2termConn1.SendInvalidE2Asn1Resp(t, cremsg, xapp.RIC_SUB_FAILURE)
+
+	_, cremsg = e2termConn1.RecvSubsReq(t)
+
+	xappConn1.ExpectRESTNotification(t, restSubId)
+
+	// Subscription already created in E2 Node.
+	fparams := &teststube2ap.E2StubSubsFailParams{}
+	fparams.Set(crereq)
+	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	instanceId := xappConn1.WaitRESTNotification(t, restSubId)
+	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionResponseUnknownInstanceId
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | Unknown instanceId
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | Duplicated action
+//     |                 |<-------------|
+//     | RESTNotif (fail)|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionFailureUnknownInstanceId")
+	subReqCount := 1
+	parameterSet := 1 // E2SM-gNB-X2
+	actionDefinitionPresent := true
+	actionParamCount := 1
+
+	// Req
+	params := xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+	restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+	crereq, cremsg := e2termConn1.RecvSubsReq(t)
+
+	// Unknown instanceId in this response which will result resending original request
+	fparams := &teststube2ap.E2StubSubsFailParams{}
+	fparams.Set(crereq)
+	fparams.Fail.RequestId.InstanceId = 0
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	_, cremsg = e2termConn1.RecvSubsReq(t)
+
+	xappConn1.ExpectRESTNotification(t, restSubId)
+
+	// Subscription already created in E2 Node.
+	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	instanceId := xappConn1.WaitRESTNotification(t, restSubId)
+	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionFailureNoTransaction
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | No transaction for the response
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubFail | Duplicated action
+//     |                 |<-------------|
+//     | RESTNotif (fail)|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionFailureNoTransaction")
+	subReqCount := 1
+	parameterSet := 1 // E2SM-gNB-X2
+	actionDefinitionPresent := true
+	actionParamCount := 1
+
+	// Req
+	params := xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+	restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+	crereq, cremsg := e2termConn1.RecvSubsReq(t)
+
+	mainCtrl.MakeTransactionNil(t, crereq.RequestId.InstanceId)
+
+	// No transaction exist for this response which will result resending original request
+	fparams := &teststube2ap.E2StubSubsFailParams{}
+	fparams.Set(crereq)
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	_, cremsg = e2termConn1.RecvSubsReq(t)
+
+	xappConn1.ExpectRESTNotification(t, restSubId)
+
+	// Subscription already created in E2 Node.
+	fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
+	e2termConn1.SendSubsFail(t, fparams, cremsg)
+
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	// Resending happens because there no transaction
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	instanceId := xappConn1.WaitRESTNotification(t, restSubId)
+	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionDeleteResponseDecodeFail
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp | ASN.1 decode fails
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |<-------------|
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteResponseDecodeFail")
+
+	// Req
+	var params *teststube2ap.RESTSubsReqParams = nil
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
+
+	// Del
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
+	// E2t: Receive 1st SubsDelReq
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+
+	// Decode of this response fails which will result resending original request
+	e2termConn1.SendInvalidE2Asn1Resp(t, delmsg, xapp.RIC_SUB_DEL_REQ)
+
+	// E2t: Receive 2nd SubsDelReq and send SubsDelResp
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+
+	// Subscription does not exist in in E2 Node.
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp | Unknown instanceId
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId")
+
+	// Req
+	var params *teststube2ap.RESTSubsReqParams = nil
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
+
+	// Del
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
+	// E2t: Receive 1st SubsDelReq
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+
+	// Unknown instanceId in this response which will result resending original request
+	delreq.RequestId.InstanceId = 0
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	// E2t: Receive 2nd SubsDelReq
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+
+	// Subscription does not exist in in E2 Node.
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionDeleteResponseNoTransaction
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp | No transaction for the response
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteResponseNoTransaction")
+
+	// Req
+	var params *teststube2ap.RESTSubsReqParams = nil
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
+
+	// Del
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
+	// E2t: Receive 1st SubsDelReq
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+
+	mainCtrl.MakeTransactionNil(t, e2SubsId)
+
+	// No transaction exist for this response which will result resending original request
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	// E2t: Receive 2nd SubsDelReq
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+
+	// Subscription does not exist in in E2 Node.
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionDeleteFailureDecodeFail
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | ASN.1 decode fails
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteFailureDecodeFail")
+
+	// Req
+	var params *teststube2ap.RESTSubsReqParams = nil
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
+
+	// Del
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
+	// E2t: Receive 1st SubsDelReq
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+
+	// Decode of this response fails which will result resending original request
+	e2termConn1.SendInvalidE2Asn1Resp(t, delmsg, xapp.RIC_SUB_DEL_FAILURE)
+
+	// E2t: Receive 2nd SubsDelReq and send SubsDelResp
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+
+	// Subscription does not exist in in E2 Node.
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | Unknown instanceId
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId")
+
+	// Req
+	var params *teststube2ap.RESTSubsReqParams = nil
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
+
+	// Del
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
+	// E2t: Receive 1st SubsDelReq
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+
+	// Unknown instanceId in this response which will result resending original request
+	delreq.RequestId.InstanceId = 0
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// E2t: Receive 2nd SubsDelReq
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+
+	// Subscription does not exist in in E2 Node.
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTUnpackSubscriptionDeleteFailureNoTransaction
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | No transaction for the response
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |<-------------|
+//
+//-----------------------------------------------------------------------------
+func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
+	xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteFailureNoTransaction")
+
+	// Req
+	var params *teststube2ap.RESTSubsReqParams = nil
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
+
+	// Del
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
+	// E2t: Receive 1st SubsDelReq
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+
+	mainCtrl.MakeTransactionNil(t, e2SubsId)
+
+	// No transaction exist for this response which will result resending original request
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// E2t: Receive 2nd SubsDelReq
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+
+	// Subscription does not exist in in E2 Node.
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	// Wait that subs is cleaned
+	mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+	xappConn1.TestMsgChanEmpty(t)
+	e2termConn1.TestMsgChanEmpty(t)
+	mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTSubReqFailAsn1PackSubReqError
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |        ASN.1 encode fails      |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |  SubDelFail  |
+//     |                 |<-------------|
+//     |                 |              |
+//     |       RESTNotif |              |
+//     |       unsuccess |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |            [SUBS DELETE]       |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
+
+	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+		Counter{cSubReqFromXapp, 1},
+		Counter{cSubDelReqToE2, 1},
+		Counter{cSubDelFailFromE2, 1},
+		Counter{cSubRespToXapp, 1},
+	})
+
+	subReqCount := 1
+	parameterSet := 1 // E2SM-gNB-X2
+	actionDefinitionPresent := true
+	actionParamCount := 1
+
+	var params *teststube2ap.RESTSubsReqParams = nil
+	params = xappConn1.GetRESTSubsReqReportParams(subReqCount, parameterSet, actionDefinitionPresent, actionParamCount)
+	e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_REQ, false)
+
+	// Req
+	restSubId := xappConn1.SendRESTSubsReq(t, params)
+	xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId)
+
+	// E2t: Receive SubsDelReq
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	xappConn1.ExpectRESTNotification(t, restSubId)
+
+	// Subscription does not exist in in E2 Node.
+	e2termConn1.SendSubsDelFail(t, delreq, delmsg)
+
+	e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
+	xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId)
+
+	e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_REQ, true)
+	// Wait that subs is cleaned
+	waitSubsCleanup(t, e2SubsId, 10)
+	mainCtrl.VerifyCounterValues(t)
+}
+
 ////////////////////////////////////////////////////////////////////////////////////
 //   Services for UT cases
 ////////////////////////////////////////////////////////////////////////////////////