Code Review
/
ric-plt
/
submgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Debug printout improvements
[ric-plt/submgr.git]
/
pkg
/
control
/
ut_messaging_test.go
diff --git
a/pkg/control/ut_messaging_test.go
b/pkg/control/ut_messaging_test.go
index
5e7d5a7
..
b3f105d
100644
(file)
--- a/
pkg/control/ut_messaging_test.go
+++ b/
pkg/control/ut_messaging_test.go
@@
-2401,11
+2401,12
@@
func TestRESTSubReqAndRouteNok(t *testing.T) {
CaseBegin("TestRESTSubReqAndRouteNok")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndRouteNok")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cRouteCreateFail, 1},
Counter{cRouteCreateFail, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
RestSubFailNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-2436,15
+2437,17
@@
func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
//Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
//Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{cSubRespToXapp, 2},
+ Counter{cRestSubNotifToXapp, 1},
+ Counter{cRestSubFailNotifToXapp, 1},
Counter{cRouteCreateUpdateFail, 1},
Counter{cRouteCreateUpdateFail, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
var params *teststube2ap.RESTSubsReqParams = nil
})
var params *teststube2ap.RESTSubsReqParams = nil
@@
-2482,15
+2485,16
@@
func TestRESTSubDelReqAndRouteDeleteNok(t *testing.T) {
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cRouteDeleteFail, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cRouteDeleteFail, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
var params *teststube2ap.RESTSubsReqParams = nil
})
var params *teststube2ap.RESTSubsReqParams = nil
@@
-2515,15
+2519,16
@@
func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
CaseBegin("TestRESTSubMergeDelAndRouteUpdateNok")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubMergeDelAndRouteUpdateNok")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cRouteDeleteUpdateFail, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cRouteDeleteUpdateFail, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
var params *teststube2ap.RESTSubsReqParams = nil
})
var params *teststube2ap.RESTSubsReqParams = nil
@@
-2593,14
+2598,15
@@
func TestRESTSubReqRetransmission(t *testing.T) {
CaseBegin("TestRESTSubReqRetransmission")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqRetransmission")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 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
})
// 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
+2659,15
@@
func TestRESTSubDelReqRetransmission(t *testing.T) {
CaseBegin("TestRESTSubDelReqRetransmission")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubDelReqRetransmission")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
var params *teststube2ap.RESTSubsReqParams = nil
})
var params *teststube2ap.RESTSubsReqParams = nil
@@
-2718,14
+2725,15
@@
func TestRESTSubReqDelReq(t *testing.T) {
CaseBegin("TestRESTSubReqDelReq")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqDelReq")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-2763,14
+2771,15
@@
func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
CaseBegin("TestRESTSubReqAndSubDelOkTwoParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndSubDelOkTwoParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
//Req1
})
//Req1
@@
-2816,14
+2825,15
@@
func TestRESTSameSubsDiffRan(t *testing.T) {
CaseBegin("TestRESTSameSubsDiffRan")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSameSubsDiffRan")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@
-2853,15
+2863,16
@@
func TestRESTSubReqRetryInSubmgr(t *testing.T) {
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
// 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{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@
-2934,7
+2945,8
@@
func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
// 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},
Counter{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubReqTimerExpiry, 2},
@@
-2969,7
+2981,8
@@
func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
// 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},
Counter{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubReqTimerExpiry, 2},
@@
-3045,7
+3058,8
@@
func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
// 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},
Counter{cSubReqToE2, 1},
Counter{cSubReReqToE2, 1},
Counter{cSubReqTimerExpiry, 2},
@@
-3115,11
+3129,12
@@
func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
CaseBegin("TestRESTSubReqSubFailRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqSubFailRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubFailNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-3179,15
+3194,16
@@
func TestRESTSubDelReqRetryInSubmgr(t *testing.T) {
CaseBegin("TestRESTSubDelReqRetryInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubDelReqRetryInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelReReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelReReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
var params *teststube2ap.RESTSubsReqParams = nil
})
// Req
var params *teststube2ap.RESTSubsReqParams = nil
@@
-3238,15
+3254,16
@@
func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
CaseBegin("TestRESTSubDelReTwoRetriesNoRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubDelReTwoRetriesNoRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelReReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelReReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
})
// Req
@@
-3297,14
+3314,15
@@
func TestRESTSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
CaseBegin("TestRESTSubDelReqSubDelFailRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubDelReqSubDelFailRespInSubmgr")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelFailFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelFailFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
})
// Req
@@
-3378,16
+3396,17
@@
func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
CaseBegin("TestRESTSubReqAndSubDelOkSameAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndSubDelOkSameAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
Counter{cMergedSubscriptions, 1},
Counter{cUnmergedSubscriptions, 1},
Counter{cMergedSubscriptions, 1},
Counter{cUnmergedSubscriptions, 1},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-3475,14
+3494,15
@@
func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
CaseBegin("TestRESTSubReqAndSubDelOkSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndSubDelOkSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
})
params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@
-3572,13
+3592,14
@@
func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
CaseBegin("TestRESTSubReqAndSubDelNoAnswerSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndSubDelNoAnswerSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubReqToE2, 1},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubFailNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-3675,14
+3696,15
@@
func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
CaseBegin("TestRESTSubReqAndSubDelNokSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndSubDelNokSameActionParallel")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubFailNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-3732,14
+3754,15
@@
func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-3816,14
+3839,15
@@
func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
CaseBegin("TestRESTSubReqPolicyAndSubDelOk")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqPolicyAndSubDelOk")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-3897,14
+3921,15
@@
func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
// Init counter check
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-4022,14
+4047,15
@@
func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
CaseBegin("TestRESTInsertSubReqAndSubDelOk")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTInsertSubReqAndSubDelOk")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
const subReqCount int = 1
})
const subReqCount int = 1
@@
-4083,7
+4109,8
@@
func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
CaseBegin("TestRESTSubReqNokAndSubDelOkWithRestartInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqNokAndSubDelOkWithRestartInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
@@
-4163,13
+4190,14
@@
func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
CaseBegin("TestRESTSubReqAndSubDelOkWithRestartInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndSubDelOkWithRestartInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 1},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelReqToE2, 1},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Remove possible existing subscription
})
// Remove possible existing subscription
@@
-4261,16
+4289,17
@@
func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
CaseBegin("TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
Counter{cSubReqToE2, 1},
Counter{cSubRespFromE2, 1},
- Counter{c
SubResp
ToXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
Counter{cMergedSubscriptions, 1},
Counter{cUnmergedSubscriptions, 1},
Counter{cMergedSubscriptions, 1},
Counter{cUnmergedSubscriptions, 1},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
Counter{cSubDelReqToE2, 1},
Counter{cSubDelRespFromE2, 1},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Remove possible existing subscription
})
// Remove possible existing subscription
@@
-4469,14
+4498,15
@@
func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
})
// Req
@@
-4501,14
+4531,15
@@
func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
subReqCount := 19
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
subReqCount := 19
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, 19},
Counter{cSubRespFromE2, 19},
Counter{cSubReqToE2, 19},
Counter{cSubRespFromE2, 19},
- Counter{c
SubResp
ToXapp, 19},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, 19},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, 19},
Counter{cSubDelRespFromE2, 19},
Counter{cSubDelReqToE2, 19},
Counter{cSubDelRespFromE2, 19},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
})
// Req
@@
-4532,14
+4563,15
@@
func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
- Counter{c
SubResp
ToXapp, uint64(subReqCount)},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, uint64(subReqCount)},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
})
// Req
@@
-4565,14
+4597,15
@@
func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
subReqCount := 2
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
- Counter{c
SubResp
ToXapp, uint64(subReqCount)},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, uint64(subReqCount)},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
})
// Req
@@
-4598,14
+4631,15
@@
func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
subReqCount := 19
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
subReqCount := 19
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 1},
+ Counter{cRestSubReqFromXapp, 1},
+ Counter{cRestSubRespToXapp, 1},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
Counter{cSubReqToE2, uint64(subReqCount)},
Counter{cSubRespFromE2, uint64(subReqCount)},
- Counter{c
SubResp
ToXapp, uint64(subReqCount)},
- Counter{cSubDelReqFromXapp, 1},
+ Counter{c
RestSubNotif
ToXapp, uint64(subReqCount)},
+ Counter{c
Rest
SubDelReqFromXapp, 1},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
Counter{cSubDelReqToE2, uint64(subReqCount)},
Counter{cSubDelRespFromE2, uint64(subReqCount)},
- Counter{cSubDelRespToXapp, 1},
+ Counter{c
Rest
SubDelRespToXapp, 1},
})
// Req
})
// Req
@@
-4630,14
+4664,15
@@
func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
CaseBegin("TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-4676,14
+4711,15
@@
func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
CaseBegin("TestRESTSubReqReportSameActionDiffActionListLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqReportSameActionDiffActionListLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-4727,14
+4763,15
@@
func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
CaseBegin("TestRESTSubReqReportSameActionDiffActionID")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqReportSameActionDiffActionID")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-4772,14
+4809,15
@@
func TestRESTSubReqDiffActionType(t *testing.T) {
CaseBegin("TestRESTSubReqDiffActionType")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqDiffActionType")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-4816,14
+4854,15
@@
func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
CaseBegin("TestRESTSubReqPolicyAndSubDelOkSameAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqPolicyAndSubDelOkSameAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-4860,14
+4899,15
@@
func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionLen")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-4906,14
+4946,15
@@
func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionContents")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionContents")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-4952,14
+4993,15
@@
func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
CaseBegin("TestRESTSubReqReportSameActionDiffSubsAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
CaseBegin("TestRESTSubReqReportSameActionDiffSubsAction")
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
- Counter{cSubReqFromXapp, 2},
+ Counter{cRestSubReqFromXapp, 2},
+ Counter{cRestSubRespToXapp, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
Counter{cSubReqToE2, 2},
Counter{cSubRespFromE2, 2},
- Counter{c
SubResp
ToXapp, 2},
- Counter{cSubDelReqFromXapp, 2},
+ Counter{c
RestSubNotif
ToXapp, 2},
+ Counter{c
Rest
SubDelReqFromXapp, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
Counter{cSubDelReqToE2, 2},
Counter{cSubDelRespFromE2, 2},
- Counter{cSubDelRespToXapp, 2},
+ Counter{c
Rest
SubDelRespToXapp, 2},
})
// Req1
})
// Req1
@@
-5838,10
+5880,11
@@
func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
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{cSubDelReqToE2, 1},
Counter{cSubDelFailFromE2, 1},
- Counter{c
SubResp
ToXapp, 1},
+ Counter{c
RestSubFailNotif
ToXapp, 1},
})
subReqCount := 1
})
subReqCount := 1