X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_messaging_test.go;h=b3f105d93e072babd9f167146b5d2a6eaf27016f;hb=316d8a176feac5e67dcaa360c0f5996e87b32904;hp=92ff1785ca80b98f3ca3e9433197ffc4e1b12d4e;hpb=c9ef0ba044f66201c34f42e3bb459e0ae4e6855b;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index 92ff178..b3f105d 100644
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -30,14 +30,56 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestRESTSubReqAndDeleteOkWithE2apUtWrapper(t *testing.T) {
-
+func TestSuiteSetup(t *testing.T) {
 	// The effect of this call shall endure thgough the UT suite!
 	// If this causes any issues, the previout interface can be restored
-	// like this:
+	// like this:git log
 	// SetPackerIf(e2ap_wrapper.NewAsn1E2APPacker())
 
 	SetPackerIf(e2ap_wrapper.NewUtAsn1E2APPacker())
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTSubReqAndDeleteOkWithE2apUtWrapper
+//
+//   stub                             stub          stub
+// +-------+        +---------+    +---------+   +---------+
+// | xapp  |        | submgr  |    | e2term  |   |  rtmgr  |
+// +-------+        +---------+    +---------+   +---------+
+//     |                 |              |             |
+//     | RESTSubReq      |              |             |
+//     |---------------->|              |             |
+//     |                 | RouteCreate  |             |
+//     |                 |--------------------------->|  // The order of these events may vary
+//     |                 |              |             |
+//     |     RESTSubResp |              |             |  // The order of these events may vary
+//     |<----------------|              |             |
+//     |                 | RouteResponse|             |
+//     |                 |<---------------------------|  // The order of these events may vary
+//     |                 |              |             |
+//     |                 | SubReq       |             |
+//     |                 |------------->|             |  // The order of these events may vary
+//     |                 |              |             |
+//     |                 |      SubResp |             |
+//     |                 |<-------------|             |
+//     |      RESTNotif1 |              |             |
+//     |<----------------|              |             |
+//     |                 |              |             |
+//     | RESTSubDelReq   |              |             |
+//     |---------------->|              |             |
+//     |                 | SubDelReq    |             |
+//     |                 |------------->|             |
+//     |                 |              |             |
+//     |   RESTSubDelResp|              |             |
+//     |<----------------|              |             |
+//     |                 |              |             |
+//     |                 |   SubDelResp |             |
+//     |                 |<-------------|             |
+//     |                 |              |             |
+//     |                 |              |             |
+//
+//-----------------------------------------------------------------------------
+func TestRESTSubReqAndDeleteOkWithE2apUtWrapper(t *testing.T) {
 
 	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, nil)
 
@@ -46,6 +88,114 @@ func TestRESTSubReqAndDeleteOkWithE2apUtWrapper(t *testing.T) {
 	waitSubsCleanup(t, e2SubsId, 10)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqAndE1apDeleteReqPackingError
+//
+//   stub                             stub          stub
+// +-------+        +---------+    +---------+   +---------+
+// | xapp  |        | submgr  |    | e2term  |   |  rtmgr  |
+// +-------+        +---------+    +---------+   +---------+
+//     |                 |              |             |
+//     | RESTSubReq      |              |             |
+//     |---------------->|              |             |
+//     |                 | RouteCreate  |             |
+//     |                 |--------------------------->|  // The order of these events may vary
+//     |                 |              |             |
+//     |     RESTSubResp |              |             |  // The order of these events may vary
+//     |<----------------|              |             |
+//     |                 | RouteResponse|             |
+//     |                 |<---------------------------|  // The order of these events may vary
+//     |                 |              |             |
+//     |                 | SubReq       |             |
+//     |                 |------------->|             |  // The order of these events may vary
+//     |                 |              |             |
+//     |                 |      SubResp |             |
+//     |                 |<-------------|             |
+//     |      RESTNotif1 |              |             |
+//     |<----------------|              |             |
+//     |                 |              |             |
+//     | RESTSubDelReq   |              |             |
+//     |---------------->|              |             |
+//     |                 |              |             |
+//     |   RESTSubDelResp|              |             |
+//     |<----------------|              |             |
+//     |                 |              |             |
+//     |                 |              |             |
+//
+//-----------------------------------------------------------------------------
+func TestRESTSubReqAndE1apDeleteReqPackingError(t *testing.T) {
+
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, nil)
+
+	e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_DEL_REQ, false)
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+	defer e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_DEL_REQ, true)
+
+	waitSubsCleanup(t, e2SubsId, 10)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTSubReqAndE1apDeleteRespUnpackingError
+//
+//   stub                             stub          stub
+// +-------+        +---------+    +---------+   +---------+
+// | xapp  |        | submgr  |    | e2term  |   |  rtmgr  |
+// +-------+        +---------+    +---------+   +---------+
+//     |                 |              |             |
+//     | RESTSubReq      |              |             |
+//     |---------------->|              |             |
+//     |                 | RouteCreate  |             |
+//     |                 |--------------------------->|  // The order of these events may vary
+//     |                 |              |             |
+//     |     RESTSubResp |              |             |  // The order of these events may vary
+//     |<----------------|              |             |
+//     |                 | RouteResponse|             |
+//     |                 |<---------------------------|  // The order of these events may vary
+//     |                 |              |             |
+//     |                 | SubReq       |             |
+//     |                 |------------->|             |  // The order of these events may vary
+//     |                 |              |             |
+//     |                 |      SubResp |             |
+//     |                 |<-------------|             |
+//     |      RESTNotif1 |              |             |
+//     |<----------------|              |             |
+//     |                 |              |             |
+//     | RESTSubDelReq   |              |             |
+//     |---------------->|              |             |
+//     |                 | SubDelReq    |             |
+//     |                 |------------->|             |
+//     |                 |              |             |
+//     |   RESTSubDelResp|              |             |
+//     |<----------------|              |             | // The order of these events may vary
+//     |                 |              |             |
+//     |                 |   SubDelResp |             |
+//     |                 |<-------------|             | // 1.st NOK
+//     |                 |              |             |
+//     |                 | SubDelReq    |             |
+//     |                 |------------->|             |
+//     |                 |              |             |
+//     |                 |   SubDelResp |             |
+//     |                 |<-------------|             | // 2.nd NOK
+//
+//-----------------------------------------------------------------------------
+
+func TestRESTSubReqAndE1apDeleteRespUnpackingError(t *testing.T) {
+
+	restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, nil)
+
+	xappConn1.SendRESTSubsDelReq(t, &restSubId)
+	e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_DEL_RESP, false)
+	delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
+	e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+	defer e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_DEL_RESP, true)
+
+	waitSubsCleanup(t, e2SubsId, 10)
+}
+
 //-----------------------------------------------------------------------------
 // TestSubReqAndRouteNok
 //
@@ -2251,11 +2401,12 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndRouteNok")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cRouteCreateFail, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubFailNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	const subReqCount int = 1
@@ -2286,15 +2437,17 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
 
 	//Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 2},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubFailNotifToXapp, 1},
 		Counter{cRouteCreateUpdateFail, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	var params *teststube2ap.RESTSubsReqParams = nil
@@ -2332,15 +2485,16 @@ func TestRESTSubDelReqAndRouteDeleteNok(t *testing.T) {
 
 	// Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cRouteDeleteFail, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	var params *teststube2ap.RESTSubsReqParams = nil
@@ -2365,15 +2519,16 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
 	CaseBegin("TestRESTSubMergeDelAndRouteUpdateNok")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cRouteDeleteUpdateFail, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	var params *teststube2ap.RESTSubsReqParams = nil
@@ -2443,14 +2598,15 @@ func TestRESTSubReqRetransmission(t *testing.T) {
 	CaseBegin("TestRESTSubReqRetransmission")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 	// Retry/duplicate will get the same way as the first request.  Submgr cannot detect duplicate RESTRequests
 	// Contianed duplicate messages from same xapp will not be merged. Here we use xappConn2 to simulate sending
@@ -2503,14 +2659,15 @@ func TestRESTSubDelReqRetransmission(t *testing.T) {
 	CaseBegin("TestRESTSubDelReqRetransmission")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	var params *teststube2ap.RESTSubsReqParams = nil
@@ -2568,14 +2725,15 @@ func TestRESTSubReqDelReq(t *testing.T) {
 	CaseBegin("TestRESTSubReqDelReq")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	const subReqCount int = 1
@@ -2613,14 +2771,15 @@ func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndSubDelOkTwoParallel")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	//Req1
@@ -2666,14 +2825,15 @@ func TestRESTSameSubsDiffRan(t *testing.T) {
 	CaseBegin("TestRESTSameSubsDiffRan")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -2703,15 +2863,16 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
 
 	// Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubReReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -2784,7 +2945,8 @@ func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
 
 	// Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubReReqToE2, 1},
 		Counter{cSubReqTimerExpiry, 2},
@@ -2819,7 +2981,8 @@ func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
 
 	// Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubReReqToE2, 1},
 		Counter{cSubReqTimerExpiry, 2},
@@ -2895,7 +3058,8 @@ func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
 
 	// Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubReReqToE2, 1},
 		Counter{cSubReqTimerExpiry, 2},
@@ -2965,11 +3129,12 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
 	CaseBegin("TestRESTSubReqSubFailRespInSubmgr")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubFailFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubFailNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 	})
 
 	const subReqCount int = 1
@@ -3029,15 +3194,16 @@ func TestRESTSubDelReqRetryInSubmgr(t *testing.T) {
 	CaseBegin("TestRESTSubDelReqRetryInSubmgr")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelReReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 	// Req
 	var params *teststube2ap.RESTSubsReqParams = nil
@@ -3088,15 +3254,16 @@ func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
 	CaseBegin("TestRESTSubDelReTwoRetriesNoRespInSubmgr")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelReReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Req
@@ -3147,14 +3314,15 @@ func TestRESTSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
 	CaseBegin("TestRESTSubDelReqSubDelFailRespInSubmgr")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelFailFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Req
@@ -3228,16 +3396,17 @@ func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndSubDelOkSameAction")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
 		Counter{cMergedSubscriptions, 1},
 		Counter{cUnmergedSubscriptions, 1},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -3325,14 +3494,15 @@ func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndSubDelOkSameActionParallel")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -3422,13 +3592,14 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndSubDelNoAnswerSameActionParallel")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 1},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubFailNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	const subReqCount int = 1
@@ -3525,14 +3696,15 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndSubDelNokSameActionParallel")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubFailFromE2, 1},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubFailNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	const subReqCount int = 1
@@ -3582,14 +3754,15 @@ func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
 
 	// Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	const subReqCount int = 1
@@ -3666,14 +3839,15 @@ func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
 	CaseBegin("TestRESTSubReqPolicyAndSubDelOk")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	const subReqCount int = 1
@@ -3747,14 +3921,15 @@ func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
 
 	// Init counter check
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	const subReqCount int = 1
@@ -3872,14 +4047,15 @@ func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
 	CaseBegin("TestRESTInsertSubReqAndSubDelOk")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	const subReqCount int = 1
@@ -3933,7 +4109,8 @@ func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
 	CaseBegin("TestRESTSubReqNokAndSubDelOkWithRestartInMiddle")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
@@ -4013,13 +4190,14 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndSubDelOkWithRestartInMiddle")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 1},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Remove possible existing subscription
@@ -4111,16 +4289,17 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 	CaseBegin("TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cSubRespToXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
 		Counter{cMergedSubscriptions, 1},
 		Counter{cUnmergedSubscriptions, 1},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Remove possible existing subscription
@@ -4319,14 +4498,15 @@ func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
 	subReqCount := 2
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Req
@@ -4351,14 +4531,15 @@ func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
 	subReqCount := 19
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, 19},
 		Counter{cSubRespFromE2, 19},
-		Counter{cSubRespToXapp, 19},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, 19},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 19},
 		Counter{cSubDelRespFromE2, 19},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Req
@@ -4382,14 +4563,15 @@ func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
 	subReqCount := 2
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, uint64(subReqCount)},
 		Counter{cSubRespFromE2, uint64(subReqCount)},
-		Counter{cSubRespToXapp, uint64(subReqCount)},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, uint64(subReqCount)},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, uint64(subReqCount)},
 		Counter{cSubDelRespFromE2, uint64(subReqCount)},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Req
@@ -4415,14 +4597,15 @@ func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
 	subReqCount := 2
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, uint64(subReqCount)},
 		Counter{cSubRespFromE2, uint64(subReqCount)},
-		Counter{cSubRespToXapp, uint64(subReqCount)},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, uint64(subReqCount)},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, uint64(subReqCount)},
 		Counter{cSubDelRespFromE2, uint64(subReqCount)},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Req
@@ -4448,14 +4631,15 @@ func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
 	subReqCount := 19
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubReqToE2, uint64(subReqCount)},
 		Counter{cSubRespFromE2, uint64(subReqCount)},
-		Counter{cSubRespToXapp, uint64(subReqCount)},
-		Counter{cSubDelReqFromXapp, 1},
+		Counter{cRestSubNotifToXapp, uint64(subReqCount)},
+		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, uint64(subReqCount)},
 		Counter{cSubDelRespFromE2, uint64(subReqCount)},
-		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
 	})
 
 	// Req
@@ -4480,14 +4664,15 @@ func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
 	CaseBegin("TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -4526,14 +4711,15 @@ func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
 	CaseBegin("TestRESTSubReqReportSameActionDiffActionListLen")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -4577,14 +4763,15 @@ func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
 	CaseBegin("TestRESTSubReqReportSameActionDiffActionID")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -4622,14 +4809,15 @@ func TestRESTSubReqDiffActionType(t *testing.T) {
 	CaseBegin("TestRESTSubReqDiffActionType")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -4666,14 +4854,15 @@ func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
 	CaseBegin("TestRESTSubReqPolicyAndSubDelOkSameAction")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -4710,14 +4899,15 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
 	CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionLen")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -4756,14 +4946,15 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
 	CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionContents")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -4802,14 +4993,15 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
 	CaseBegin("TestRESTSubReqReportSameActionDiffSubsAction")
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 2},
+		Counter{cRestSubReqFromXapp, 2},
+		Counter{cRestSubRespToXapp, 2},
 		Counter{cSubReqToE2, 2},
 		Counter{cSubRespFromE2, 2},
-		Counter{cSubRespToXapp, 2},
-		Counter{cSubDelReqFromXapp, 2},
+		Counter{cRestSubNotifToXapp, 2},
+		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 2},
 		Counter{cSubDelRespFromE2, 2},
-		Counter{cSubDelRespToXapp, 2},
+		Counter{cRestSubDelRespToXapp, 2},
 	})
 
 	// Req1
@@ -5688,10 +5880,11 @@ func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
 func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
 
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
-		Counter{cSubReqFromXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelFailFromE2, 1},
-		Counter{cSubRespToXapp, 1},
+		Counter{cRestSubFailNotifToXapp, 1},
 	})
 
 	subReqCount := 1