Rest interface specific counters defined and used: cRestSubReqFromXapp,cRestSubRespToXapp,cRestSubDelReqFromXapp,cRestSubDelRespToXapp
Signed-off-by: Konstantinos Archangelof <konstantinos.archangelof@nokia.com>
Change-Id: I1666ce9ed79c088054cf9e320f10e325cd735ff0
diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index 5e7d5a7..81df76a 100644
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -2401,11 +2401,11 @@
CaseBegin("TestRESTSubReqAndRouteNok")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cRouteCreateFail, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
const subReqCount int = 1
@@ -2436,15 +2436,15 @@
//Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
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
@@ -2482,15 +2482,15 @@
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cRouteDeleteFail, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
var params *teststube2ap.RESTSubsReqParams = nil
@@ -2515,15 +2515,15 @@
CaseBegin("TestRESTSubMergeDelAndRouteUpdateNok")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cRouteDeleteUpdateFail, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
var params *teststube2ap.RESTSubsReqParams = nil
@@ -2593,14 +2593,14 @@
CaseBegin("TestRESTSubReqRetransmission")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 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
@@ -2653,14 +2653,14 @@
CaseBegin("TestRESTSubDelReqRetransmission")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
var params *teststube2ap.RESTSubsReqParams = nil
@@ -2718,14 +2718,14 @@
CaseBegin("TestRESTSubReqDelReq")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
const subReqCount int = 1
@@ -2763,14 +2763,14 @@
CaseBegin("TestRESTSubReqAndSubDelOkTwoParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
//Req1
@@ -2816,14 +2816,14 @@
CaseBegin("TestRESTSameSubsDiffRan")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -2853,15 +2853,15 @@
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -2934,7 +2934,7 @@
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubReqTimerExpiry, 2},
@@ -2969,7 +2969,7 @@
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubReqTimerExpiry, 2},
@@ -3045,7 +3045,7 @@
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubReqTimerExpiry, 2},
@@ -3115,11 +3115,11 @@
CaseBegin("TestRESTSubReqSubFailRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
})
const subReqCount int = 1
@@ -3179,15 +3179,15 @@
CaseBegin("TestRESTSubDelReqRetryInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 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
@@ -3238,15 +3238,15 @@
CaseBegin("TestRESTSubDelReTwoRetriesNoRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelReReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Req
@@ -3297,14 +3297,14 @@
CaseBegin("TestRESTSubDelReqSubDelFailRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelFailFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Req
@@ -3378,16 +3378,16 @@
CaseBegin("TestRESTSubReqAndSubDelOkSameAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 2},
+ Counter{cRestSubRespToXapp, 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
@@ -3475,14 +3475,14 @@
CaseBegin("TestRESTSubReqAndSubDelOkSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -3572,13 +3572,13 @@
CaseBegin("TestRESTSubReqAndSubDelNoAnswerSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 1},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
const subReqCount int = 1
@@ -3675,14 +3675,14 @@
CaseBegin("TestRESTSubReqAndSubDelNokSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
const subReqCount int = 1
@@ -3732,14 +3732,14 @@
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
const subReqCount int = 1
@@ -3816,14 +3816,14 @@
CaseBegin("TestRESTSubReqPolicyAndSubDelOk")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
const subReqCount int = 1
@@ -3897,14 +3897,14 @@
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
const subReqCount int = 1
@@ -4022,14 +4022,14 @@
CaseBegin("TestRESTInsertSubReqAndSubDelOk")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
const subReqCount int = 1
@@ -4083,7 +4083,7 @@
CaseBegin("TestRESTSubReqNokAndSubDelOkWithRestartInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
@@ -4163,13 +4163,13 @@
CaseBegin("TestRESTSubReqAndSubDelOkWithRestartInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Remove possible existing subscription
@@ -4261,16 +4261,16 @@
CaseBegin("TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 2},
+ Counter{cRestSubRespToXapp, 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
@@ -4469,14 +4469,14 @@
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Req
@@ -4501,14 +4501,14 @@
subReqCount := 19
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, 19},
Counter{cSubRespFromE2, 19},
- Counter{cSubRespToXapp, 19},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 19},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 19},
Counter{cSubDelRespFromE2, 19},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Req
@@ -4532,14 +4532,14 @@
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
- Counter{cSubRespToXapp, uint64(subReqCount)},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, uint64(subReqCount)},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Req
@@ -4565,14 +4565,14 @@
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
- Counter{cSubRespToXapp, uint64(subReqCount)},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, uint64(subReqCount)},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Req
@@ -4598,14 +4598,14 @@
subReqCount := 19
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
- Counter{cSubRespToXapp, uint64(subReqCount)},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, uint64(subReqCount)},
+ Counter{cRestSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
- Counter{cSubDelRespToXapp, 1},
+ Counter{cRestSubDelRespToXapp, 1},
})
// Req
@@ -4630,14 +4630,14 @@
CaseBegin("TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -4676,14 +4676,14 @@
CaseBegin("TestRESTSubReqReportSameActionDiffActionListLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -4727,14 +4727,14 @@
CaseBegin("TestRESTSubReqReportSameActionDiffActionID")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -4772,14 +4772,14 @@
CaseBegin("TestRESTSubReqDiffActionType")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -4816,14 +4816,14 @@
CaseBegin("TestRESTSubReqPolicyAndSubDelOkSameAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -4860,14 +4860,14 @@
CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -4906,14 +4906,14 @@
CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionContents")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -4952,14 +4952,14 @@
CaseBegin("TestRESTSubReqReportSameActionDiffSubsAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{cSubRespToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
+ Counter{cRestSubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{cRestSubDelRespToXapp, 2},
})
// Req1
@@ -5838,10 +5838,10 @@
func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelFailFromE2, 1},
- Counter{cSubRespToXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
})
subReqCount := 1