Merge "Unit test improvement - Fixed dealy replaced with waiting function in one...

diff --combined pkg/control/ut_messaging_test.go
index 4117aff,2a3ad96..2c90513
--- 1/pkg/control/ut_messaging_test.go
--- 2/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@@ -675,6 -675,7 +675,6 @@@ func TestSubDelReqAndRouteDeleteNok(t *
        xappConn2.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 -
        mainCtrl.VerifyCounterValues(t)
  }
  
@@@ -3295,7 -3296,7 +3295,7 @@@ func TestRESTSubReqRetransmissionV5(t *
  
        mainCtrl.WaitOngoingRequestMapEmpty()
  
 -      // Send modified  requst, this time with e2 subscriptions.
 +      // Send modified  request, this time with e2 subscriptions.
        params2 := xappConn1.GetRESTSubsReqReportParams(subReqCount + 1)
        params2.SetSubscriptionID(&restSubId)
  
@@@ -5258,12 -5259,9 +5258,9 @@@ func TestRESTSubReqAndSubDelOkSameActio
        <-time.After(time.Second * 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)
- 
+       mainCtrl.WaitRESTSubscriptionDelete(restSubId1)
        // Above wait does not work correctly anymore as this delay makes this test case work
-       //<-time.After(time.Second * 1)
  
        mainCtrl.SimulateRestart(t)
        xapp.Logger.Debug("mainCtrl.SimulateRestart done 2")
@@@ -5318,14 -5316,14 +5315,14 @@@
  //     | RESTSubDelReq   |              |
  //     |---------------->|              |
  //     |                 |              |
 +//     |   RESTSubDelResp|              |
 +//     |<----------------|              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelResp |
  //     |                 |<-------------|
  //     |                 |              |
 -//     |   RESTSubDelResp|              |
 -//     |<----------------|              |
  //
  //-----------------------------------------------------------------------------
  
@@@ -5339,18 -5337,6 +5336,18 @@@ func TestRESTReportSubReqAndSubDelOk(t 
  func RESTReportSubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
        xapp.Logger.Debug("TEST: TestRESTReportSubReqAndSubDelOk with testIndex %v", testIndex)
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, uint64(subReqCount)},
 +              Counter{cSubRespFromE2, uint64(subReqCount)},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, uint64(subReqCount)},
 +              Counter{cSubDelRespFromE2, uint64(subReqCount)},
 +      })
 +
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
@@@ -5388,11 -5374,10 +5385,11 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  /*
 -func TestRESTPolicySubReqAndSubDelOk(t *testing.T) {  was in comments already
 +func TestRESTPolicySubReqAndSubDelOk(t *testing.T) {  //Was in comments already. Next case is not run!
        CaseBegin("TestRESTPolicySubReqAndSubDelOk")
  
        subReqCount := 2
@@@ -5407,18 -5392,6 +5404,18 @@@
  func RESTPolicySubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
        xapp.Logger.Debug("TEST: TestRESTPolicySubReqAndSubDelOk with testIndex %v", testIndex)
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, uint64(subReqCount)},
 +              Counter{cSubRespFromE2, uint64(subReqCount)},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, uint64(subReqCount)},
 +              Counter{cSubDelRespFromE2, uint64(subReqCount)},
 +      })
 +
        // Req
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
@@@ -5449,7 -5422,6 +5446,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
@@@ -6028,7 -6000,7 +6025,7 @@@ func TestRESTSubReqReportSameActionDiff
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubResp | ASN.1 decode fails
 -//     |                 |<-------------|
 +//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
@@@ -6038,27 -6010,11 +6035,27 @@@
  //     | RESTNotif (fail)|              |
  //     |<----------------|              |
  //     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //
  //-----------------------------------------------------------------------------
  
  func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseDecodeFail")
 +
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubReqTimerExpiry, 1},
 +              Counter{cSubReReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cSubFailFromE2, 1},
 +              Counter{cRestSubFailNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +      })
 +
        const subReqCount int = 1
  
        // Req
@@@ -6091,7 -6047,6 +6088,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6112,13 -6067,13 +6109,13 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubResp | Unknown instanceId
 -//     |                 |<-------------|
 +//     |                 |<-------------| No valid subscription found with subIds [0]
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | Duplicated action
 -//     |                 |<-------------|
 +//     |                 |<-------------| No valid subscription found with subIds [0]
  //     | RESTNotif (fail)|              |
  //     |<----------------|              |
  //     |                 | SubDelReq    |
@@@ -6126,30 -6081,11 +6123,30 @@@
  //     |                 |              |
  //     |                 |   SubDelResp |
  //     |                 |<-------------|
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //
  //-----------------------------------------------------------------------------
  
  func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseUnknownInstanceId")
 +
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubReqTimerExpiry, 2},
 +              Counter{cSubReReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cSubFailFromE2, 1},
 +              Counter{cRestSubFailNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelRespFromE2, 1},
 +      })
 +
        const subReqCount int = 1
  
        // Req
@@@ -6158,7 -6094,7 +6155,7 @@@
  
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
  
 -      // Unknown instanceId in this response which will result resending original request
 +      // Unknown instanceId 0 in this response which will result resending original request
        orgInstanceId := crereq.RequestId.InstanceId
        crereq.RequestId.InstanceId = 0
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@@ -6167,7 -6103,7 +6164,7 @@@
  
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
  
 -      // Subscription already created in E2 Node.
 +      // Subscription already created in E2 Node. E2 Node responds with failure but there is also same unknown instanceId 0
        fparams := &teststube2ap.E2StubSubsFailParams{}
        fparams.Set(crereq)
        fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
@@@ -6188,7 -6124,6 +6185,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6209,51 -6144,30 +6206,51 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubResp | No transaction for the response
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | Duplicated action
 -//     |                 |<-------------|
 +//     |                 |<-------------|Ongoing transaction not found. This will result timer expiry and sending delete
  //     | RESTNotif (fail)|              |
  //     |<----------------|              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelResp |
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelResp |
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found.
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseNoTransaction")
 +
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubReqTimerExpiry, 2},
 +              Counter{cSubReReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cSubFailFromE2, 1},
 +              Counter{cRestSubFailNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 2},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelRespFromE2, 2},
 +      })
 +
        const subReqCount int = 1
  
        // Req
@@@ -6295,7 -6209,6 +6292,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6316,7 -6229,7 +6313,7 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | ASN.1 decode fails
 -//     |                 |<-------------|
 +//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
@@@ -6326,25 -6239,10 +6323,25 @@@
  //     | RESTNotif (fail)|              |
  //     |<----------------|              |
  //     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureDecodeFail")
 +
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubReqTimerExpiry, 1},
 +              Counter{cSubReReqToE2, 1},
 +              Counter{cSubFailFromE2, 2},
 +              Counter{cRestSubFailNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +      })
 +
        const subReqCount int = 1
  
        // Req
@@@ -6378,7 -6276,6 +6375,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6399,13 -6296,13 +6396,13 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | Unknown instanceId
 -//     |                 |<-------------|
 +//     |                 |<-------------| No valid subscription found with subIds [0]. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | Duplicated action
 -//     |                 |<-------------|
 +//     |                 |<-------------|No valid subscription found with subIds [0]. This will result timer expiry and sending delete
  //     | RESTNotif (fail)|              |
  //     |<----------------|              |
  //     |                 | SubDelReq    |
@@@ -6413,36 -6310,19 +6410,36 @@@
  //     |                 |              |
  //     |                 |   SubDelResp |
  //     |                 |<-------------|
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureUnknownInstanceId")
        const subReqCount int = 1
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubReqTimerExpiry, 2},
 +              Counter{cSubReReqToE2, 1},
 +              Counter{cSubFailFromE2, 2},
 +              Counter{cRestSubFailNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelRespFromE2, 1},
 +      })
 +
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
  
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
  
 -      // Unknown instanceId in this response which will result resending original request
 +      // Unknown instanceId 0 in this response which will result resending original request
        fparams := &teststube2ap.E2StubSubsFailParams{}
        fparams.Set(crereq)
        fparams.Fail.RequestId.InstanceId = 0
@@@ -6452,7 -6332,7 +6449,7 @@@
  
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
  
 -      // Subscription already created in E2 Node.
 +      // Subscription already created in E2 Node. E2 Node responds with failure but there is also same unknown instanceId 0
        fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
        e2termConn1.SendSubsFail(t, fparams, cremsg)
  
@@@ -6471,7 -6351,6 +6468,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6492,51 -6371,26 +6489,51 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | No transaction for the response
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | Duplicated action
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and sending delete
  //     | RESTNotif (fail)|              |
  //     |<----------------|              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelResp |
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
 +//     |                 |              |
 +//     |                 | SubDelReq    |
 +//     |                 |------------->|
 +//     |                 |              |
 +//     |                 |   SubDelResp |
 +//     |                 |<-------------| Ongoing transaction not found.
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureNoTransaction")
        const subReqCount int = 1
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubReqTimerExpiry, 2},
 +              Counter{cSubReReqToE2, 1},
 +              Counter{cSubFailFromE2, 2},
 +              Counter{cRestSubFailNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 2},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelRespFromE2, 2},
 +      })
 +
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
@@@ -6577,7 -6431,6 +6574,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6600,37 -6453,20 +6597,37 @@@
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
 -//     |                 |   SubDelResp | ASN.1 decode fails
 -//     |                 |<-------------|
 +//     |                 |   SubDelResp | ASN.1 decode fails.
 +//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
 -//     |                 |   SubDelFail | Subscription does exist any more
 +//     |                 |   SubDelFail | Subscription does exist any more in E2 node
  //     |                 |<-------------|
  //     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseDecodeFail")
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 1},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelFailFromE2, 1},
 +              Counter{cSubDelRespFromE2, 1},
 +      })
 +
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
@@@ -6642,7 -6478,7 +6639,7 @@@
        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)
 +      e2termConn1.SendInvalidE2Asn1Resp(t, delmsg, xapp.RIC_SUB_DEL_RESP)
  
        // E2t: Receive 2nd SubsDelReq and send SubsDelResp
        delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
@@@ -6657,7 -6493,6 +6654,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6681,35 -6516,18 +6678,35 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelResp | Unknown instanceId
 -//     |                 |<-------------|
 +//     |                 |<-------------| No valid subscription found with subIds [0]. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
 -//     |                 |   SubDelFail | Subscription does exist any more
 +//     |                 |   SubDelFail | Subscription does exist any more in E2 node
  //     |                 |<-------------|
 -//
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId")
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 1},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelRespFromE2, 1},
 +              Counter{cSubDelFailFromE2, 1},
 +      })
 +
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
@@@ -6737,7 -6555,6 +6734,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6761,35 -6578,18 +6758,35 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelResp | No transaction for the response
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
 -//     |                 |   SubDelFail | Subscription does exist any more
 -//     |                 |<-------------|
 -//
 +//     |                 |   SubDelFail | Subscription does exist any more in E2 node
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseNoTransaction")
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 2},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelRespFromE2, 1},
 +              Counter{cSubDelFailFromE2, 1},
 +      })
 +
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
@@@ -6818,7 -6618,6 +6815,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6842,34 -6641,18 +6839,34 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelFail | ASN.1 decode fails
 -//     |                 |<-------------|
 +//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
 -//     |                 |   SubDelFail | Subscription does exist any more
 +//     |                 |   SubDelFail | Subscription does exist any more in E2 node
  //     |                 |<-------------|
 -//
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteFailureDecodeFail")
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 1},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelFailFromE2, 2},
 +      })
 +
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
@@@ -6896,7 -6679,6 +6893,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6920,34 -6702,18 +6917,34 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelFail | Unknown instanceId
 -//     |                 |<-------------|
 +//     |                 |<-------------| No valid subscription found with subIds [0]. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
 -//     |                 |   SubDelFail | Subscription does exist any more
 -//     |                 |<-------------|
 -//
 +//     |                 |   SubDelFail | Subscription does exist any more in E2 node
 +//     |                 |<-------------| No valid subscription found with subIds [0].
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId")
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 1},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelFailFromE2, 2},
 +      })
 +
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
@@@ -6958,14 -6724,14 +6955,14 @@@
        // E2t: Receive 1st SubsDelReq
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
  
 -      // Unknown instanceId in this response which will result resending original request
 +      // Unknown instanceId 0 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.
 +      // Subscription does not exist in in E2 Node. E2 Node responds with failure but there is also same unknown instanceId 0
        e2termConn1.SendSubsDelFail(t, delreq, delmsg)
  
        // Wait that subs is cleaned
@@@ -6975,7 -6741,6 +6972,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -6999,34 -6764,18 +6996,34 @@@
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelFail | No transaction for the response
 -//     |                 |<-------------|
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
 -//     |                 |   SubDelFail | Subscription does exist any more
 -//     |                 |<-------------|
 -//
 +//     |                 |   SubDelFail | Subscription does exist any more in E2 node
 +//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry
 +//     |                 |              |
 +//     |           [SUBS DELETE]        |
 +//     |                 |              |
  //-----------------------------------------------------------------------------
  func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
        xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteFailureNoTransaction")
  
 +      mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 +              Counter{cRestSubReqFromXapp, 1},
 +              Counter{cRestSubRespToXapp, 1},
 +              Counter{cSubReqToE2, 1},
 +              Counter{cSubRespFromE2, 1},
 +              Counter{cRestSubNotifToXapp, 1},
 +              Counter{cRestSubDelReqFromXapp, 1},
 +              Counter{cRestSubDelRespToXapp, 1},
 +              Counter{cSubDelReqToE2, 1},
 +              Counter{cSubDelReqTimerExpiry, 2},
 +              Counter{cSubDelReReqToE2, 1},
 +              Counter{cSubDelFailFromE2, 2},
 +      })
 +
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
@@@ -7055,7 -6804,6 +7052,7 @@@
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -7120,8 -6868,8 +7117,8 @@@ func TestRESTSubReqFailAsn1PackSubReqEr
  
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
 -      mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  func TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction(t *testing.T) {
@@@ -7179,8 -6927,9 +7176,8 @@@
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
  
        waitSubsCleanup(t, e2SubsId, 10)
 -
 -      mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------