Merge "Fix for E2 Connection status counters"
authorAnssi Mannila <anssi.mannila@nokia.com>
Tue, 21 Dec 2021 07:20:41 +0000 (07:20 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Tue, 21 Dec 2021 07:20:41 +0000 (07:20 +0000)
1  2 
pkg/control/ut_messaging_test.go

@@@ -46,6 -46,10 +46,10 @@@ func TestSuiteSetup(t *testing.T) 
  }
  func TestRanStatusChangeViaSDLNotification(t *testing.T) {
  
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cE2StateChangedToUp, 3},
+       })
        // Current UT test cases use these ran names
        xappRnibMock.CreateGnb("RAN_NAME_1", entities.ConnectionStatus_DISCONNECTED)
        xappRnibMock.CreateGnb("RAN_NAME_11", entities.ConnectionStatus_DISCONNECTED)
@@@ -57,6 -61,8 +61,8 @@@
        mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
        mainCtrl.SetE2State(t, "RAN_NAME_2_CONNECTED")
        mainCtrl.SetE2State(t, "RAN_NAME_11_CONNECTED")
+       mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -83,6 -89,8 +89,8 @@@ func TestRESTSubReqAfterE2ConnBreak(t *
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
                Counter{cRestReqRejDueE2Down, 1},
+               Counter{cE2StateChangedToDown, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
  
        // E2 disconnect after E2term has received response
        // Restore E2 connection for following test cases
        mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
  
-       mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
        //os.Exit(0)
  }
  
@@@ -135,6 -143,8 +143,8 @@@ func TestRESTSubReqE2ConnBreak(t *testi
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
                Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cE2StateChangedToDown, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
  
        // Req
@@@ -212,6 -222,8 +222,8 @@@ func TestRESTSubscriptionDeleteAfterE2C
                Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cRestSubDelRespToXapp, 1},
+               Counter{cE2StateChangedToDown, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
  
        // Req
@@@ -289,6 -301,7 +301,7 @@@ func TestRESTOtherE2ConnectionChanges(
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
  
        // Req
        e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
  
-       // Submgr should not react any other connection state changes than CONNECTED and DISCONNECTED
+       // Submgr should not react to any other connection state changes than CONNECTED and DISCONNECTED
        mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED_SETUP_FAILED")
        mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTING")
        mainCtrl.SetE2State(t, "RAN_NAME_1_SHUTTING_DOWN")
@@@ -675,6 -688,7 +688,6 @@@ func TestSubDelReqAndRouteDeleteNok(t *
        xappConn2.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 -
        mainCtrl.VerifyCounterValues(t)
  }
  
@@@ -3295,7 -3309,7 +3308,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)
  
@@@ -5315,14 -5329,14 +5328,14 @@@ func TestRESTSubReqAndSubDelOkSameActio
  //     | RESTSubDelReq   |              |
  //     |---------------->|              |
  //     |                 |              |
 +//     |   RESTSubDelResp|              |
 +//     |<----------------|              |
  //     |                 | SubDelReq    |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   SubDelResp |
  //     |                 |<-------------|
  //     |                 |              |
 -//     |   RESTSubDelResp|              |
 -//     |<----------------|              |
  //
  //-----------------------------------------------------------------------------
  
@@@ -5336,18 -5350,6 +5349,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)
        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
  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)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
@@@ -6025,7 -6013,7 +6038,7 @@@ func TestRESTSubReqReportSameActionDiff
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubResp | ASN.1 decode fails
 -//     |                 |<-------------|
 +//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
  //     | 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
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubResp | Unknown instanceId
 -//     |                 |<-------------|
 +//     |                 |<-------------| No valid subscription found with subIds [0]
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | Duplicated action
 -//     |                 |<-------------|
 +//     |                 |<-------------| No valid subscription found with subIds [0]
  //     | RESTNotif (fail)|              |
  //     |<----------------|              |
  //     |                 | SubDelReq    |
  //     |                 |              |
  //     |                 |   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
  
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
  
 -      // Unknown instanceId in this response which will result resending original request
 +      // Unknown instanceId in this response which will result resending original request
        orgInstanceId := crereq.RequestId.InstanceId
        crereq.RequestId.InstanceId = 0
        e2termConn1.SendSubsResp(t, crereq, cremsg)
  
        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
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      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
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      SubFail | ASN.1 decode fails
 -//     |                 |<-------------|
 +//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
  //     |                 |              |
  //     |                 | SubReq       |
  //     |                 |------------->|
  //     | 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
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      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    |
  //     |                 |              |
  //     |                 |   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 in this response which will result resending original request
        fparams := &teststube2ap.E2StubSubsFailParams{}
        fparams.Set(crereq)
        fparams.Fail.RequestId.InstanceId = 0
  
        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)
  
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |      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)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 | 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)
        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)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   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)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   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)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   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)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   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)
        // E2t: Receive 1st SubsDelReq
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
  
 -      // Unknown instanceId in this response which will result resending original request
 +      // Unknown instanceId in this response which will result resending original request
        delreq.RequestId.InstanceId = 0
        e2termConn1.SendSubsDelFail(t, delreq, delmsg)
  
        // E2t: Receive 2nd SubsDelReq
        delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
  
 -      // Subscription does not exist in in E2 Node.
 +      // 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
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
  //     |                 |------------->|
  //     |                 |              |
  //     |                 |   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)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------
@@@ -7117,8 -6881,8 +7130,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) {
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
  
        waitSubsCleanup(t, e2SubsId, 10)
 -
 -      mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
 +      mainCtrl.VerifyCounterValues(t)
  }
  
  //-----------------------------------------------------------------------------