Submgr restart improvement

[ric-plt/submgr.git] / pkg / control / ut_messaging_test.go

diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index de2458a..f559f91 100644 (file)
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -22,7 +22,10 @@ package control
 import (
        "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
        "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"
        "testing"
+       "time"
 )
 
 //-----------------------------------------------------------------------------
@@ -52,7 +55,7 @@ func TestSubReqAndRouteNok(t *testing.T) {
        CaseBegin("TestSubReqAndRouteNok")
 
        waiter := rtmgrHttp.AllocNextEvent(false)
-       newSubsId := mainCtrl.get_subid(t)
+       newSubsId := mainCtrl.get_registry_next_subid(t)
        xappConn1.SendSubsReq(t, nil, nil)
        waiter.WaitResult(t)
 
@@ -61,7 +64,7 @@ func TestSubReqAndRouteNok(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -102,27 +105,29 @@ func TestSubReqAndRouteNok(t *testing.T) {
 func TestSubReqAndSubDelOk(t *testing.T) {
        CaseBegin("TestSubReqAndSubDelOk")
 
-       waiter := rtmgrHttp.AllocNextEvent(true)
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
-       waiter.WaitResult(t)
 
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
+
+       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"})
+
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
 
-       waiter = rtmgrHttp.AllocNextEvent(true)
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
        xappConn1.RecvSubsDelResp(t, deltrans)
-       waiter.WaitResult(t)
 
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -159,19 +164,23 @@ func TestSubReqRetransmission(t *testing.T) {
 
        //Subs Create
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
 
        seqBef := mainCtrl.get_msgcounter(t)
        xappConn1.SendSubsReq(t, nil, cretrans) //Retransmitted SubReq
        mainCtrl.wait_msgcounter_change(t, seqBef, 10)
 
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       // hack as there is no real way to see has message be handled.
+       // Previuos counter check just tells that is has been received by submgr
+       // --> artificial delay
+       <-time.After(1 * time.Second)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        //Subs Delete
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
        xappConn1.RecvSubsDelResp(t, deltrans)
 
        //Wait that subs is cleaned
@@ -179,7 +188,7 @@ func TestSubReqRetransmission(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -217,19 +226,24 @@ func TestSubDelReqRetransmission(t *testing.T) {
 
        //Subs Create
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        //Subs Delete
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
 
        seqBef := mainCtrl.get_msgcounter(t)
        xappConn1.SendSubsDelReq(t, deltrans, e2SubsId) //Retransmitted SubDelReq
        mainCtrl.wait_msgcounter_change(t, seqBef, 10)
 
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       // hack as there is no real way to see has message be handled.
+       // Previuos counter check just tells that is has been received by submgr
+       // --> artificial delay
+       <-time.After(1 * time.Second)
+
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
        xappConn1.RecvSubsDelResp(t, deltrans)
 
        //Wait that subs is cleaned
@@ -237,7 +251,7 @@ func TestSubDelReqRetransmission(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -279,13 +293,13 @@ func TestSubDelReqCollision(t *testing.T) {
 
        //Subs Create
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        //Subs Delete
        xappConn1.SendSubsDelReq(t, nil, e2SubsId)
-       delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t)
+       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
 
        // Subs Delete colliding
        seqBef := mainCtrl.get_msgcounter(t)
@@ -293,8 +307,13 @@ func TestSubDelReqCollision(t *testing.T) {
        xappConn1.SendSubsDelReq(t, deltranscol2, e2SubsId) //Colliding SubDelReq
        mainCtrl.wait_msgcounter_change(t, seqBef, 10)
 
+       // hack as there is no real way to see has message be handled.
+       // Previuos counter check just tells that is has been received by submgr
+       // --> artificial delay
+       <-time.After(1 * time.Second)
+
        // Del resp for first and second
-       e2termConn.SendSubsDelResp(t, delreq1, delmsg1)
+       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
 
        // don't care in which order responses are received
        xappConn1.RecvSubsDelResp(t, nil)
@@ -305,46 +324,46 @@ func TestSubDelReqCollision(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
 //-----------------------------------------------------------------------------
 // TestSubReqAndSubDelOkTwoParallel
 //
-//   stub                          stub
-// +-------+     +---------+    +---------+
-// | xapp  |     | submgr  |    | e2term  |
-// +-------+     +---------+    +---------+
-//     |              |              |
-//     |              |              |
-//     |              |              |
-//     | SubReq1      |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubReq1      |
-//     |              |------------->|
-//     |              |              |
-//     | SubReq2      |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubReq2      |
-//     |              |------------->|
-//     |              |              |
-//     |              |    SubResp1  |
-//     |              |<-------------|
-//     |              |    SubResp2  |
-//     |              |<-------------|
-//     |              |              |
-//     |    SubResp1  |              |
-//     |<-------------|              |
-//     |    SubResp2  |              |
-//     |<-------------|              |
-//     |              |              |
-//     |        [SUBS 1 DELETE]      |
-//     |              |              |
-//     |        [SUBS 2 DELETE]      |
-//     |              |              |
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp  |  | xapp  |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          |              |              |
+//     |          |              |              |
+//     |          | SubReq1      |              |
+//     |          |------------->|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       SubReq2           |              |
+//     |------------------------>|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          |    SubResp1  |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       SubResp2          |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
 //
 //-----------------------------------------------------------------------------
 func TestSubReqAndSubDelOkTwoParallel(t *testing.T) {
@@ -353,44 +372,47 @@ func TestSubReqAndSubDelOkTwoParallel(t *testing.T) {
        //Req1
        rparams1 := &teststube2ap.E2StubSubsReqParams{}
        rparams1.Init()
-       rparams1.Req.EventTriggerDefinition.ProcedureCode = 5
        cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil)
-       crereq1, cremsg1 := e2termConn.RecvSubsReq(t)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
 
        //Req2
        rparams2 := &teststube2ap.E2StubSubsReqParams{}
        rparams2.Init()
-       rparams2.Req.EventTriggerDefinition.ProcedureCode = 28
+
+       rparams2.Req.EventTriggerDefinition.Data.Length = 1
+       rparams2.Req.EventTriggerDefinition.Data.Data = make([]uint8, rparams2.Req.EventTriggerDefinition.Data.Length)
+       rparams2.Req.EventTriggerDefinition.Data.Data[0] = 2
+
        cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil)
-       crereq2, cremsg2 := e2termConn.RecvSubsReq(t)
+       crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
 
        //Resp1
-       e2termConn.SendSubsResp(t, crereq1, cremsg1)
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1)
 
        //Resp2
-       e2termConn.SendSubsResp(t, crereq2, cremsg2)
+       e2termConn1.SendSubsResp(t, crereq2, cremsg2)
        e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2)
 
        //Del1
        deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1)
-       delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq1, delmsg1)
+       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
        xappConn1.RecvSubsDelResp(t, deltrans1)
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId1, 10)
 
        //Del2
        deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2)
-       delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq2, delmsg2)
+       delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
        xappConn2.RecvSubsDelResp(t, deltrans2)
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId2, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -441,22 +463,22 @@ func TestSameSubsDiffRan(t *testing.T) {
        //Req1
        cretrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1")
        xappConn1.SendSubsReq(t, nil, cretrans1)
-       crereq1, cremsg1 := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq1, cremsg1)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1)
 
        //Req2
        cretrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_2")
        xappConn1.SendSubsReq(t, nil, cretrans2)
-       crereq2, cremsg2 := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq2, cremsg2)
+       crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq2, cremsg2)
        e2SubsId2 := xappConn1.RecvSubsResp(t, cretrans2)
 
        //Del1
        deltrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1")
        xappConn1.SendSubsDelReq(t, deltrans1, e2SubsId1)
-       delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq1, delmsg1)
+       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
        xappConn1.RecvSubsDelResp(t, deltrans1)
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId1, 10)
@@ -464,15 +486,15 @@ func TestSameSubsDiffRan(t *testing.T) {
        //Del2
        deltrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_2")
        xappConn1.SendSubsDelReq(t, deltrans2, e2SubsId2)
-       delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq2, delmsg2)
+       delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
        xappConn1.RecvSubsDelResp(t, deltrans2)
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId2, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -513,18 +535,18 @@ func TestSubReqRetryInSubmgr(t *testing.T) {
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
 
        // E2t: Receive 1st SubsReq
-       e2termConn.RecvSubsReq(t)
+       e2termConn1.RecvSubsReq(t)
 
        // E2t: Receive 2nd SubsReq and send SubsResp
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
 
        // Xapp: Receive SubsResp
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
        xappConn1.RecvSubsDelResp(t, deltrans)
 
        // Wait that subs is cleaned
@@ -532,7 +554,7 @@ func TestSubReqRetryInSubmgr(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -576,21 +598,21 @@ func TestSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
        xappConn1.SendSubsReq(t, nil, nil)
 
        // E2t: Receive 1st SubsReq
-       e2termConn.RecvSubsReq(t)
+       e2termConn1.RecvSubsReq(t)
 
        // E2t: Receive 2nd SubsReq
-       e2termConn.RecvSubsReq(t)
+       e2termConn1.RecvSubsReq(t)
 
        // E2t: Send receive SubsDelReq and send SubsResp
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        // Wait that subs is cleaned
-       mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 10)
+       mainCtrl.wait_subs_clean(t, delreq.RequestId.InstanceId, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -631,23 +653,23 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
        xappConn1.SendSubsReq(t, nil, nil)
 
        // E2t: Receive 1st SubsReq
-       e2termConn.RecvSubsReq(t)
+       e2termConn1.RecvSubsReq(t)
 
        // E2t: Receive 2nd SubsReq
-       e2termConn.RecvSubsReq(t)
+       e2termConn1.RecvSubsReq(t)
 
        // E2t: Receive 1st SubsDelReq
-       e2termConn.RecvSubsDelReq(t)
+       e2termConn1.RecvSubsDelReq(t)
 
        // E2t: Receive 2nd SubsDelReq
-       delreq, _ := e2termConn.RecvSubsDelReq(t)
+       delreq, _ := e2termConn1.RecvSubsDelReq(t)
 
        // Wait that subs is cleaned
-       mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 15)
+       mainCtrl.wait_subs_clean(t, delreq.RequestId.InstanceId, 15)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -668,6 +690,12 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
 //     |              |      SubFail |
 //     |              |<-------------|
 //     |              |              |
+//     |              | SubDelReq    |
+//     |              |------------->|
+//     |              |              |
+//     |              |   SubDelResp |
+//     |              |<-------------|
+//     |              |              |
 //     |      SubFail |              |
 //     |<-------------|              |
 //     |              |              |
@@ -681,11 +709,173 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) {
        // Xapp: Send SubsReq
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
 
-       // E2t: Receive SubsReq and send SubsFail
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       fparams := &teststube2ap.E2StubSubsFailParams{}
-       fparams.Set(crereq)
-       e2termConn.SendSubsFail(t, fparams, cremsg)
+       // E2t: Receive SubsReq and send SubsFail (first)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       fparams1 := &teststube2ap.E2StubSubsFailParams{}
+       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)
+
+       // Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqSubFailRespInSubmgrWithDuplicate
+//
+//   stub                          stub
+// +-------+     +---------+    +---------+
+// | xapp  |     | submgr  |    | e2term  |
+// +-------+     +---------+    +---------+
+//     |              |              |
+//     |  SubReq      |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubFail |
+//     |              |<-------------|
+//     |              |              |
+//     |              | SubDelReq    |
+//     |              |------------->|
+//     |              |              |
+//     |              |   SubDelResp |
+//     |              |<-------------|
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubResp |
+//     |              |<-------------|
+//     |              |              |
+//     |      SubResp |              |
+//     |<-------------|              |
+//     |              |              |
+//     |         [SUBS DELETE]       |
+//     |              |              |
+//
+//-----------------------------------------------------------------------------
+
+func TestSubReqSubFailRespInSubmgrWithDuplicate(t *testing.T) {
+
+       CaseBegin("TestSubReqSubFailRespInSubmgrWithDuplicate start")
+
+       // Xapp: Send SubsReq
+       cretrans := xappConn1.SendSubsReq(t, nil, nil)
+
+       // E2t: Receive SubsReq and send SubsFail (first)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       fparams1 := &teststube2ap.E2StubSubsFailParams{}
+       fparams1.Set(crereq1)
+       fparams1.SetCauseVal(-1, 5, 3)
+       e2termConn1.SendSubsFail(t, fparams1, cremsg1)
+
+       // E2t: Receive SubsDelReq and send SubsDelResp (internal)
+       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
+
+       // E2t: Receive SubsReq and send SubsResp (second)
+       crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq2, cremsg2)
+
+       // XAPP: Receive SubsResp
+       e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
+
+       // Delete
+       deltrans2 := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
+       delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
+       xappConn1.RecvSubsDelResp(t, deltrans2)
+
+       // Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqSubFailRespInSubmgrWithDuplicateFail
+//
+//   stub                          stub
+// +-------+     +---------+    +---------+
+// | xapp  |     | submgr  |    | e2term  |
+// +-------+     +---------+    +---------+
+//     |              |              |
+//     |  SubReq      |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubFail |
+//     |              |<-------------|
+//     |              |              |
+//     |              | SubDelReq    |
+//     |              |------------->|
+//     |              |              |
+//     |              |   SubDelResp |
+//     |              |<-------------|
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubFail |
+//     |              |<-------------|
+//     |              |              |
+//     |              | SubDelReq    |
+//     |              |------------->|
+//     |              |              |
+//     |              |   SubDelResp |
+//     |              |<-------------|
+//     |      SubFail |              |
+//     |<-------------|              |
+//     |              |              |
+//
+//-----------------------------------------------------------------------------
+
+func TestSubReqSubFailRespInSubmgrWithDuplicateFail(t *testing.T) {
+
+       CaseBegin("TestSubReqSubFailRespInSubmgrWithDuplicateFail start")
+
+       // Xapp: Send SubsReq
+       cretrans := xappConn1.SendSubsReq(t, nil, nil)
+
+       // E2t: Receive SubsReq and send SubsFail (first)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       fparams1 := &teststube2ap.E2StubSubsFailParams{}
+       fparams1.Set(crereq1)
+       fparams1.SetCauseVal(-1, 5, 3)
+       e2termConn1.SendSubsFail(t, fparams1, cremsg1)
+
+       // E2t: Receive SubsDelReq and send SubsDelResp (internal first)
+       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
+
+       // E2t: Receive SubsReq and send SubsFail (second)
+       crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
+       fparams2 := &teststube2ap.E2StubSubsFailParams{}
+       fparams2.Set(crereq2)
+       fparams2.SetCauseVal(-1, 5, 3)
+       e2termConn1.SendSubsFail(t, fparams2, cremsg2)
+
+       // E2t: Receive SubsDelReq and send SubsDelResp (internal second)
+       delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
 
        // Xapp: Receive SubsFail
        e2SubsId := xappConn1.RecvSubsFail(t, cretrans)
@@ -695,7 +885,7 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -733,8 +923,8 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) {
 
        // Subs Create
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        // Subs Delete
@@ -742,11 +932,11 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) {
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
 
        // E2t: Receive 1st SubsDelReq
-       e2termConn.RecvSubsDelReq(t)
+       e2termConn1.RecvSubsDelReq(t)
 
        // E2t: Receive 2nd SubsDelReq and send SubsDelResp
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        // Xapp: Receive SubsDelResp
        xappConn1.RecvSubsDelResp(t, deltrans)
@@ -756,7 +946,7 @@ func TestSubDelReqRetryInSubmgr(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -792,8 +982,8 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
 
        // Subs Create
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        // Subs Delete
@@ -801,10 +991,10 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
 
        // E2t: Receive 1st SubsDelReq
-       e2termConn.RecvSubsDelReq(t)
+       e2termConn1.RecvSubsDelReq(t)
 
        // E2t: Receive 2nd SubsDelReq
-       e2termConn.RecvSubsDelReq(t)
+       e2termConn1.RecvSubsDelReq(t)
 
        // Xapp: Receive SubsDelResp
        xappConn1.RecvSubsDelResp(t, deltrans)
@@ -814,7 +1004,7 @@ func TestSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -850,16 +1040,16 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
 
        // Subs Create
        cretrans := xappConn1.SendSubsReq(t, nil, nil)
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        // Xapp: Send SubsDelReq
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
 
        // E2t: Send receive SubsDelReq and send SubsDelFail
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelFail(t, delreq, delmsg)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelFail(t, delreq, delmsg)
 
        // Xapp: Receive SubsDelResp
        xappConn1.RecvSubsDelResp(t, deltrans)
@@ -869,7 +1059,7 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -877,45 +1067,45 @@ func TestSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
 // TestSubReqAndSubDelOkSameAction
 //
 //   stub                          stub
-// +-------+     +---------+    +---------+
-// | xapp  |     | submgr  |    | e2term  |
-// +-------+     +---------+    +---------+
-//     |              |              |
-//     |              |              |
-//     |              |              |
-//     | SubReq1      |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubReq1      |
-//     |              |------------->|
-//     |              |    SubResp1  |
-//     |              |<-------------|
-//     |    SubResp1  |              |
-//     |<-------------|              |
-//     |              |              |
-//     | SubReq2      |              |
-//     |------------->|              |
-//     |              |              |
-//     |    SubResp2  |              |
-//     |<-------------|              |
-//     |              |              |
-//     | SubDelReq 1  |              |
-//     |------------->|              |
-//     |              |              |
-//     | SubDelResp 1 |              |
-//     |<-------------|              |
-//     |              |              |
-//     | SubDelReq 2  |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubDelReq 2  |
-//     |              |------------->|
-//     |              |              |
-//     |              | SubDelReq 2  |
-//     |              |------------->|
-//     |              |              |
-//     | SubDelResp 2 |              |
-//     |<-------------|              |
+// +-------+     +-------+     +---------+    +---------+
+// | xapp2 |     | xapp1 |     | submgr  |    | e2term  |
+// +-------+     +-------+     +---------+    +---------+
+//     |             |              |              |
+//     |             |              |              |
+//     |             |              |              |
+//     |             | SubReq1      |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             |              | SubReq1      |
+//     |             |              |------------->|
+//     |             |              |    SubResp1  |
+//     |             |              |<-------------|
+//     |             |    SubResp1  |              |
+//     |             |<-------------|              |
+//     |             |              |              |
+//     |          SubReq2           |              |
+//     |--------------------------->|              |
+//     |             |              |              |
+//     |          SubResp2          |              |
+//     |<---------------------------|              |
+//     |             |              |              |
+//     |             | SubDelReq 1  |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             | SubDelResp 1 |              |
+//     |             |<-------------|              |
+//     |             |              |              |
+//     |         SubDelReq 2        |              |
+//     |--------------------------->|              |
+//     |             |              |              |
+//     |             |              | SubDelReq 2  |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |             |              | SubDelReq 2  |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |         SubDelResp 2       |              |
+//     |<---------------------------|              |
 //
 //-----------------------------------------------------------------------------
 func TestSubReqAndSubDelOkSameAction(t *testing.T) {
@@ -925,82 +1115,87 @@ func TestSubReqAndSubDelOkSameAction(t *testing.T) {
        rparams1 := &teststube2ap.E2StubSubsReqParams{}
        rparams1.Init()
        cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil)
-       crereq1, cremsg1 := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq1, cremsg1)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1)
 
        //Req2
        rparams2 := &teststube2ap.E2StubSubsReqParams{}
        rparams2.Init()
        cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil)
-       //crereq2, cremsg2 := e2termConn.RecvSubsReq(t)
-       //e2termConn.SendSubsResp(t, crereq2, cremsg2)
+       //crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
+       //e2termConn1.SendSubsResp(t, crereq2, cremsg2)
        e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2)
 
+       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"})
+
        //Del1
        deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1)
-       //e2termConn.RecvSubsDelReq(t)
-       //e2termConn.SendSubsDelResp(t, delreq1, delmsg1)
+       //e2termConn1.RecvSubsDelReq(t)
+       //e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
        xappConn1.RecvSubsDelResp(t, deltrans1)
        //Wait that subs is cleaned
        //mainCtrl.wait_subs_clean(t, e2SubsId1, 10)
 
        //Del2
        deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2)
-       delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq2, delmsg2)
+       delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
        xappConn2.RecvSubsDelResp(t, deltrans2)
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId2, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
 //-----------------------------------------------------------------------------
 // TestSubReqAndSubDelOkSameActionParallel
 //
-//   stub                          stub
-// +-------+     +---------+    +---------+
-// | xapp  |     | submgr  |    | e2term  |
-// +-------+     +---------+    +---------+
-//     |              |              |
-//     |              |              |
-//     |              |              |
-//     | SubReq1      |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubReq1      |
-//     |              |------------->|
-//     | SubReq2      |              |
-//     |------------->|              |
-//     |              |    SubResp1  |
-//     |              |<-------------|
-//     |    SubResp1  |              |
-//     |<-------------|              |
-//     |              |              |
-//     |    SubResp2  |              |
-//     |<-------------|              |
-//     |              |              |
-//     | SubDelReq 1  |              |
-//     |------------->|              |
-//     |              |              |
-//     | SubDelResp 1 |              |
-//     |<-------------|              |
-//     |              |              |
-//     | SubDelReq 2  |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubDelReq 2  |
-//     |              |------------->|
-//     |              |              |
-//     |              | SubDelReq 2  |
-//     |              |------------->|
-//     |              |              |
-//     | SubDelResp 2 |              |
-//     |<-------------|              |
+//   stub          stub                          stub
+// +-------+     +-------+     +---------+    +---------+
+// | xapp2 |     | xapp1 |     | submgr  |    | e2term  |
+// +-------+     +-------+     +---------+    +---------+
+//     |             |              |              |
+//     |             |              |              |
+//     |             |              |              |
+//     |             | SubReq1      |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             |              | SubReq1      |
+//     |             |              |------------->|
+//     |          SubReq2           |              |
+//     |--------------------------->|              |
+//     |             |              |    SubResp1  |
+//     |             |              |<-------------|
+//     |             |    SubResp1  |              |
+//     |             |<-------------|              |
+//     |             |              |              |
+//     |          SubResp2          |              |
+//     |<---------------------------|              |
+//     |             |              |              |
+//     |             | SubDelReq 1  |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             | SubDelResp 1 |              |
+//     |             |<-------------|              |
+//     |             |              |              |
+//     |         SubDelReq 2        |              |
+//     |--------------------------->|              |
+//     |             |              |              |
+//     |             |              | SubDelReq 2  |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |             |              | SubDelReq 2  |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |         SubDelResp 2       |              |
+//     |<---------------------------|              |
 //
 //-----------------------------------------------------------------------------
 func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) {
@@ -1010,7 +1205,7 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) {
        rparams1 := &teststube2ap.E2StubSubsReqParams{}
        rparams1.Init()
        cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil)
-       crereq1, cremsg1 := e2termConn.RecvSubsReq(t)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
 
        //Req2
        rparams2 := &teststube2ap.E2StubSubsReqParams{}
@@ -1018,7 +1213,7 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) {
        cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil)
 
        //Resp1
-       e2termConn.SendSubsResp(t, crereq1, cremsg1)
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1)
 
        //Resp2
@@ -1030,8 +1225,8 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) {
 
        //Del2
        deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2)
-       delreq2, delmsg2 := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq2, delmsg2)
+       delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
        xappConn2.RecvSubsDelResp(t, deltrans2)
 
        //Wait that subs is cleaned
@@ -1039,34 +1234,40 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
 //-----------------------------------------------------------------------------
 // TestSubReqAndSubDelNokSameActionParallel
 //
-//   stub                          stub
-// +-------+     +---------+    +---------+
-// | xapp  |     | submgr  |    | e2term  |
-// +-------+     +---------+    +---------+
-//     |              |              |
-//     |              |              |
-//     |              |              |
-//     | SubReq1      |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubReq1      |
-//     |              |------------->|
-//     | SubReq2      |              |
-//     |------------->|              |
-//     |              |    SubFail1  |
-//     |              |<-------------|
-//     |    SubFail1  |              |
-//     |<-------------|              |
-//     |              |              |
-//     |    SubFail2  |              |
-//     |<-------------|              |
+//   stub          stub                          stub
+// +-------+     +-------+     +---------+    +---------+
+// | xapp2 |     | xapp1 |     | submgr  |    | e2term  |
+// +-------+     +-------+     +---------+    +---------+
+//     |             |              |              |
+//     |             |              |              |
+//     |             |              |              |
+//     |             | SubReq1      |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             |              | SubReq1      |
+//     |             |              |------------->|
+//     |          SubReq2           |              |
+//     |--------------------------->|              |
+//     |             |              |    SubFail1  |
+//     |             |              |<-------------|
+//     |             |              |              |
+//     |             |              | SubDelReq    |
+//     |             |              |------------->|
+//     |             |              |   SubDelResp |
+//     |             |              |<-------------|
+//     |             |              |              |
+//     |             |    SubFail1  |              |
+//     |             |<-------------|              |
+//     |             |              |              |
+//     |          SubFail2          |              |
+//     |<---------------------------|              |
 //
 //-----------------------------------------------------------------------------
 func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) {
@@ -1076,19 +1277,25 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) {
        rparams1 := &teststube2ap.E2StubSubsReqParams{}
        rparams1.Init()
        cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil)
-       crereq1, cremsg1 := e2termConn.RecvSubsReq(t)
+
+       // E2t: Receive SubsReq (first)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
 
        //Req2
        rparams2 := &teststube2ap.E2StubSubsReqParams{}
        rparams2.Init()
-       seqBef2 := mainCtrl.get_msgcounter(t)
+       subepcnt2 := mainCtrl.get_subs_entrypoint_cnt(t, crereq1.RequestId.InstanceId)
        cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil)
-       mainCtrl.wait_msgcounter_change(t, seqBef2, 10)
+       mainCtrl.wait_subs_entrypoint_cnt_change(t, crereq1.RequestId.InstanceId, subepcnt2, 10)
 
-       //E2T Fail
-       fparams := &teststube2ap.E2StubSubsFailParams{}
-       fparams.Set(crereq1)
-       e2termConn.SendSubsFail(t, fparams, cremsg1)
+       // E2t: send SubsFail (first)
+       fparams1 := &teststube2ap.E2StubSubsFailParams{}
+       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)
@@ -1100,37 +1307,37 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) {
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
 //-----------------------------------------------------------------------------
 // TestSubReqAndSubDelNoAnswerSameActionParallel
 //
-//   stub                          stub
-// +-------+     +---------+    +---------+
-// | xapp  |     | submgr  |    | e2term  |
-// +-------+     +---------+    +---------+
-//     |              |              |
-//     |              |              |
-//     |              |              |
-//     | SubReq1      |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubReq1      |
-//     |              |------------->|
-//     | SubReq2      |              |
-//     |------------->|              |
-//     |              |              |
-//     |              | SubReq1      |
-//     |              |------------->|
-//     |              |              |
-//     |              |              |
-//     |              | SubDelReq    |
-//     |              |------------->|
-//     |              |              |
-//     |              |   SubDelResp |
-//     |              |<-------------|
+//   stub          stub                          stub
+// +-------+     +-------+     +---------+    +---------+
+// | xapp2 |     | xapp1 |     | submgr  |    | e2term  |
+// +-------+     +-------+     +---------+    +---------+
+//     |             |              |              |
+//     |             |              |              |
+//     |             |              |              |
+//     |             | SubReq1      |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             |              | SubReq1      |
+//     |             |              |------------->|
+//     |             | SubReq2      |              |
+//     |--------------------------->|              |
+//     |             |              |              |
+//     |             |              | SubReq1      |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |             |              |              |
+//     |             |              | SubDelReq    |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |             |              |   SubDelResp |
+//     |             |              |<-------------|
 //
 //-----------------------------------------------------------------------------
 func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
@@ -1141,27 +1348,27 @@ func TestSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
        rparams1.Init()
        xappConn1.SendSubsReq(t, rparams1, nil)
 
-       e2termConn.RecvSubsReq(t)
+       crereq1, _ := e2termConn1.RecvSubsReq(t)
 
        //Req2
        rparams2 := &teststube2ap.E2StubSubsReqParams{}
        rparams2.Init()
-       seqBef2 := mainCtrl.get_msgcounter(t)
+       subepcnt2 := mainCtrl.get_subs_entrypoint_cnt(t, crereq1.RequestId.InstanceId)
        xappConn2.SendSubsReq(t, rparams2, nil)
-       mainCtrl.wait_msgcounter_change(t, seqBef2, 10)
+       mainCtrl.wait_subs_entrypoint_cnt_change(t, crereq1.RequestId.InstanceId, subepcnt2, 10)
 
        //Req1 (retransmitted)
-       e2termConn.RecvSubsReq(t)
+       e2termConn1.RecvSubsReq(t)
 
-       delreq1, delmsg1 := e2termConn.RecvSubsDelReq(t)
-       e2termConn.SendSubsDelResp(t, delreq1, delmsg1)
+       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
 
        //Wait that subs is cleaned
-       mainCtrl.wait_subs_clean(t, delreq1.RequestId.Seq, 10)
+       mainCtrl.wait_subs_clean(t, delreq1.RequestId.InstanceId, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 15)
 }
 
@@ -1208,23 +1415,21 @@ func TestSubReqPolicyAndSubDelOk(t *testing.T) {
        rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy
        cretrans := xappConn1.SendSubsReq(t, rparams1, nil)
 
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
 
-       waiter := rtmgrHttp.AllocNextEvent(true)
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
        xappConn1.RecvSubsDelResp(t, deltrans)
-       waiter.WaitResult(t)
 
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }
 
@@ -1277,38 +1482,487 @@ func TestSubReqPolicyAndSubDelOk(t *testing.T) {
 func TestSubReqPolicyChangeAndSubDelOk(t *testing.T) {
        CaseBegin("TestSubReqAndSubDelOk")
 
-       waiter := rtmgrHttp.AllocNextEvent(true)
        rparams1 := &teststube2ap.E2StubSubsReqParams{}
        rparams1.Init()
        rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypePolicy
        cretrans := xappConn1.SendSubsReq(t, rparams1, nil)
-       waiter.WaitResult(t)
 
-       crereq, cremsg := e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
 
        //Policy change
-       rparams1.Req.RequestId.Seq = e2SubsId
+       rparams1.Req.RequestId.InstanceId = e2SubsId
        rparams1.Req.ActionSetups[0].SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitW200ms
        xappConn1.SendSubsReq(t, rparams1, cretrans)
 
-       crereq, cremsg = e2termConn.RecvSubsReq(t)
-       e2termConn.SendSubsResp(t, crereq, cremsg)
+       crereq, cremsg = e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId = xappConn1.RecvSubsResp(t, cretrans)
        deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
-       delreq, delmsg := e2termConn.RecvSubsDelReq(t)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
 
-       waiter = rtmgrHttp.AllocNextEvent(true)
-       e2termConn.SendSubsDelResp(t, delreq, delmsg)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
        xappConn1.RecvSubsDelResp(t, deltrans)
-       waiter.WaitResult(t)
 
        //Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, e2SubsId, 10)
 
        xappConn1.TestMsgChanEmpty(t)
        xappConn2.TestMsgChanEmpty(t)
-       e2termConn.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqAndSubDelOkTwoE2termParallel
+//
+//   stub                          stub           stub
+// +-------+     +---------+    +---------+    +---------+
+// | xapp  |     | submgr  |    | e2term1 |    | e2term2 |
+// +-------+     +---------+    +---------+    +---------+
+//     |              |              |              |
+//     |              |              |              |
+//     |              |              |              |
+//     | SubReq1      |              |              |
+//     |------------->|              |              |
+//     |              |              |              |
+//     |              | SubReq1      |              |
+//     |              |------------->|              |
+//     |              |              |              |
+//     | SubReq2      |              |              |
+//     |------------->|              |              |
+//     |              |              |              |
+//     |              | SubReq2      |              |
+//     |              |---------------------------->|
+//     |              |              |              |
+//     |              |    SubResp1  |              |
+//     |              |<-------------|              |
+//     |    SubResp1  |              |              |
+//     |<-------------|              |              |
+//     |              |    SubResp2  |              |
+//     |              |<----------------------------|
+//     |    SubResp2  |              |              |
+//     |<-------------|              |              |
+//     |              |              |              |
+//     |        [SUBS 1 DELETE]      |              |
+//     |              |              |              |
+//     |        [SUBS 2 DELETE]      |              |
+//     |              |              |              |
+//
+//-----------------------------------------------------------------------------
+func TestSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
+       CaseBegin("TestSubReqAndSubDelOkTwoE2termParallel")
+
+       //Req1
+       cretrans1 := xappConn1.NewRmrTransactionId("", "RAN_NAME_1")
+       xappConn1.SendSubsReq(t, nil, cretrans1)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+
+       cretrans2 := xappConn1.NewRmrTransactionId("", "RAN_NAME_11")
+       xappConn1.SendSubsReq(t, nil, cretrans2)
+       crereq2, cremsg2 := e2termConn2.RecvSubsReq(t)
+
+       //Resp1
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
+       e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1)
+
+       //Resp2
+       e2termConn2.SendSubsResp(t, crereq2, cremsg2)
+       e2SubsId2 := xappConn1.RecvSubsResp(t, cretrans2)
+
+       //Del1
+       deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1)
+       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
+       xappConn1.RecvSubsDelResp(t, deltrans1)
+       //Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId1, 10)
+
+       //Del2
+       deltrans2 := xappConn1.SendSubsDelReq(t, nil, e2SubsId2)
+       delreq2, delmsg2 := e2termConn2.RecvSubsDelReq(t)
+       e2termConn2.SendSubsDelResp(t, delreq2, delmsg2)
+       xappConn1.RecvSubsDelResp(t, deltrans2)
+       //Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId2, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       e2termConn2.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqInsertAndSubDelOk
+//
+//   stub                          stub
+// +-------+     +---------+    +---------+
+// | xapp  |     | submgr  |    | e2term  |
+// +-------+     +---------+    +---------+
+//     |              |              |
+//     | SubReq       |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubResp |
+//     |              |<-------------|
+//     |              |              |
+//     |      SubResp |              |
+//     |<-------------|              |
+//     |              |              |
+//     |              |              |
+//     | SubDelReq    |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubDelReq    |
+//     |              |------------->|
+//     |              |              |
+//     |              |   SubDelResp |
+//     |              |<-------------|
+//     |              |              |
+//     |   SubDelResp |              |
+//     |<-------------|              |
+//
+//-----------------------------------------------------------------------------
+func TestSubReqInsertAndSubDelOk(t *testing.T) {
+       CaseBegin("TestInsertSubReqAndSubDelOk")
+
+       rparams1 := &teststube2ap.E2StubSubsReqParams{}
+       rparams1.Init()
+       rparams1.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypeInsert
+       cretrans := xappConn1.SendSubsReq(t, rparams1, nil)
+
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
+       e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
+       deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+       xappConn1.RecvSubsDelResp(t, deltrans)
+
+       //Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqRetransmissionWithSameSubIdDiffXid
+//
+// This case simulates case where xApp restarts and starts sending same
+// subscription requests which have already subscribed successfully
+
+//   stub                          stub
+// +-------+     +---------+    +---------+
+// | xapp  |     | submgr  |    | e2term  |
+// +-------+     +---------+    +---------+
+//     |              |              |
+//     |  SubReq      |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubResp |
+//     |              |<-------------|
+//     |              |              |
+//     |      SubResp |              |
+//     |<-------------|              |
+//     |              |              |
+//     | xApp restart |              |
+//     |              |              |
+//     |  SubReq      |              |
+//     | (retrans with same xApp generated subid but diff xid)
+//     |------------->|              |
+//     |              |              |
+//     |      SubResp |              |
+//     |<-------------|              |
+//     |              |              |
+//     |         [SUBS DELETE]       |
+//     |              |              |
+//
+//-----------------------------------------------------------------------------
+func TestSubReqRetransmissionWithSameSubIdDiffXid(t *testing.T) {
+       CaseBegin("TestSubReqRetransmissionWithSameSubIdDiffXid")
+
+       //Subs Create
+       cretrans := xappConn1.SendSubsReq(t, nil, nil)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
+       e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
+
+       // xApp restart here
+       // --> artificial delay
+       <-time.After(1 * time.Second)
+
+       //Subs Create
+       cretrans = xappConn1.SendSubsReq(t, nil, nil) //Retransmitted SubReq
+       e2SubsId = xappConn1.RecvSubsResp(t, cretrans)
+
+       //Subs Delete
+       deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+       xappConn1.RecvSubsDelResp(t, deltrans)
+
+       //Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqNokAndSubDelOkWithRestartInMiddle
+//
+//   stub                          stub
+// +-------+     +---------+    +---------+
+// | xapp  |     | submgr  |    | e2term  |
+// +-------+     +---------+    +---------+
+//     |              |              |
+//     | SubReq       |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubResp |
+//     |                        <----|
+//     |                             |
+//     |        Submgr restart       |
+//     |                             |
+//     |              |              |
+//     |              | SubDelReq    |
+//     |              |------------->|
+//     |              |              |
+//     |              |   SubDelResp |
+//     |              |<-------------|
+//     |              |              |
+//
+//-----------------------------------------------------------------------------
+
+func TestSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
+       CaseBegin("TestSubReqNokAndSubDelOkWithRestartInMiddle")
+
+       // Remove possible existing subscrition
+       mainCtrl.removeExistingSubscriptions(t)
+
+       mainCtrl.SetResetTestFlag(t, true) // subs.DoNotWaitSubResp will be set TRUE for the subscription
+       xappConn1.SendSubsReq(t, nil, nil)
+       e2termConn1.RecvSubsReq(t)
+       mainCtrl.SetResetTestFlag(t, false)
+
+       resp, _ := xapp.Subscription.QuerySubscriptions()
+       assert.Equal(t, resp[0].Meid, "RAN_NAME_1")
+       assert.Equal(t, resp[0].Endpoint, []string{"localhost:13560"})
+       e2SubsId := uint32(resp[0].SubscriptionID)
+       t.Logf("e2SubsId = %v", e2SubsId)
+
+       mainCtrl.SimulateRestart(t) // This will trigger sending of SubDelReq
+
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+       // Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqAndSubDelOkWithRestartInMiddle
+//
+//   stub                          stub
+// +-------+     +---------+    +---------+
+// | xapp  |     | submgr  |    | e2term  |
+// +-------+     +---------+    +---------+
+//     |              |              |
+//     | SubReq       |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubReq       |
+//     |              |------------->|
+//     |              |              |
+//     |              |      SubResp |
+//     |              |<-------------|
+//     |              |              |
+//     |      SubResp |              |
+//     |<-------------|              |
+//     |              |              |
+//     |                             |
+//     |        Submgr restart       |
+//     |                             |
+//     | SubDelReq    |              |
+//     |------------->|              |
+//     |              |              |
+//     |              | SubDelReq    |
+//     |              |------------->|
+//     |              |              |
+//     |              |   SubDelResp |
+//     |              |<-------------|
+//     |              |              |
+//     |   SubDelResp |              |
+//     |<-------------|              |
+//
+//-----------------------------------------------------------------------------
+
+func TestSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
+       CaseBegin("TestSubReqAndSubDelOkWithRestartInMiddle")
+
+       cretrans := xappConn1.SendSubsReq(t, nil, nil)
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
+       e2SubsId := xappConn1.RecvSubsResp(t, cretrans)
+
+       // Check subscription
+       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"})
+
+       mainCtrl.SimulateRestart(t)
+
+       // Check that subscription is restored correctly after restart
+       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"})
+
+       deltrans := xappConn1.SendSubsDelReq(t, nil, e2SubsId)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+       xappConn1.RecvSubsDelResp(t, deltrans)
+
+       //Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestSubReqAndSubDelOkSameActionWithRestartsInMiddle
+//
+//   stub                          stub
+// +-------+     +-------+     +---------+    +---------+
+// | xapp2 |     | xapp1 |     | submgr  |    | e2term  |
+// +-------+     +-------+     +---------+    +---------+
+//     |             |              |              |
+//     |             |              |              |
+//     |             |              |              |
+//     |             | SubReq1      |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             |              | SubReq1      |
+//     |             |              |------------->|
+//     |             |              |    SubResp1  |
+//     |             |              |<-------------|
+//     |             |    SubResp1  |              |
+//     |             |<-------------|              |
+//     |             |              |              |
+//     |                                           |
+//     |              submgr restart               |
+//     |                                           |
+//     |             |              |              |
+//     |             |              |              |
+//     |          SubReq2           |              |
+//     |--------------------------->|              |
+//     |             |              |              |
+//     |          SubResp2          |              |
+//     |<---------------------------|              |
+//     |             |              |              |
+//     |             | SubDelReq 1  |              |
+//     |             |------------->|              |
+//     |             |              |              |
+//     |             | SubDelResp 1 |              |
+//     |             |<-------------|              |
+//     |             |              |              |
+//     |             |              |              |
+//     |                                           |
+//     |              submgr restart               |
+//     |                                           |
+//     |             |              |              |
+//     |         SubDelReq 2        |              |
+//     |--------------------------->|              |
+//     |             |              |              |
+//     |             |              | SubDelReq 2  |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |             |              | SubDelReq 2  |
+//     |             |              |------------->|
+//     |             |              |              |
+//     |         SubDelResp 2       |              |
+//     |<---------------------------|              |
+//
+//-----------------------------------------------------------------------------
+
+func TestSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
+       CaseBegin("TestSubReqAndSubDelOkSameActionWithRestartsInMiddle")
+
+       //Req1
+       rparams1 := &teststube2ap.E2StubSubsReqParams{}
+       rparams1.Init()
+       cretrans1 := xappConn1.SendSubsReq(t, rparams1, nil)
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
+       e2SubsId1 := xappConn1.RecvSubsResp(t, cretrans1)
+
+       //Req2
+       rparams2 := &teststube2ap.E2StubSubsReqParams{}
+       rparams2.Init()
+       cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil)
+       e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2)
+
+       // Check subscription
+       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"})
+
+       mainCtrl.SimulateRestart(t)
+
+       // Check that subscription is restored correctly after restart
+       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"})
+
+       //Del1
+       deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1)
+       xapp.Logger.Debug("xappConn1.RecvSubsDelResp")
+       xappConn1.RecvSubsDelResp(t, deltrans1)
+       xapp.Logger.Debug("xappConn1.RecvSubsDelResp received")
+
+       mainCtrl.SimulateRestart(t)
+       xapp.Logger.Debug("mainCtrl.SimulateRestart done")
+
+       //Del2
+       deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2)
+       delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
+
+       e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
+       xappConn2.RecvSubsDelResp(t, deltrans2)
+
+       //Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId2, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       xappConn2.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 }