From 3d80b72cb374aec809740f3bec895d4b37a4fc2f Mon Sep 17 00:00:00 2001 From: Anssi Mannila Date: Fri, 12 Nov 2021 13:17:15 +0200 Subject: [PATCH] Unut test counter check code fixed - Missing counters added in UT cases to be checked - One Bug fix added in code. Incorrect response in repeated delete request from xApp. Change-Id: I83599d3db6f130451d9c33a0732274bb5ab51d50 Signed-off-by: Anssi Mannila --- config/submgr-config.yaml | 2 +- e2ap/pkg/e2ap_wrapper/packer_e2ap.go | 4 ++-- pkg/control/control.go | 9 +++++--- pkg/control/metrics_test.go | 6 +++++ pkg/control/registry.go | 1 + pkg/control/ut_ctrl_submgr_test.go | 43 ++++++++++++++++++++++------------- pkg/control/ut_messaging_test.go | 44 ++++++++++++++++++++++++++---------- 7 files changed, 75 insertions(+), 34 deletions(-) diff --git a/config/submgr-config.yaml b/config/submgr-config.yaml index 4851734..87bffbf 100644 --- a/config/submgr-config.yaml +++ b/config/submgr-config.yaml @@ -22,7 +22,7 @@ "e2tRecvMsgTimeout_ms": 2000 "e2tMaxSubReqTryCount": 2 "e2tMaxSubDelReqTryCount": 2 - "checkE2State:" "true" + "checkE2State": "true" "readSubsFromDb": "true" "dbTryCount": 200 "dbRetryForever": "true" diff --git a/e2ap/pkg/e2ap_wrapper/packer_e2ap.go b/e2ap/pkg/e2ap_wrapper/packer_e2ap.go index dcf84ab..73d121f 100644 --- a/e2ap/pkg/e2ap_wrapper/packer_e2ap.go +++ b/e2ap/pkg/e2ap_wrapper/packer_e2ap.go @@ -1120,10 +1120,10 @@ func (e2apMsg *e2apMsgPackerSubscriptionDeleteFailure) String() string { //----------------------------------------------------------------------------- func SetASN1DebugPrintStatus(logLevel int) { if logLevel >= 4 { - fmt.Println("Setting ASN1 debug prints ON") + //fmt.Println("ASN1 debug prints ON") C.allowASN1DebugPrints(true) } else { - fmt.Println("Setting ASN1 debug prints OFF") + //fmt.Println("ASN1 debug prints OFF") C.allowASN1DebugPrints(false) } } diff --git a/pkg/control/control.go b/pkg/control/control.go index 08000b0..7de724e 100755 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -238,7 +238,7 @@ func (c *Control) ReadConfigParameters(f string) { xapp.Logger.Debug("ReadConfigParameters") c.LoggerLevel = int(xapp.Logger.GetLevel()) - xapp.Logger.Debug("LoggerLevel= %v", c.LoggerLevel) + xapp.Logger.Info("LoggerLevel = %v", c.LoggerLevel) c.e2ap.SetASN1DebugPrintStatus(c.LoggerLevel) // viper.GetDuration returns nanoseconds @@ -633,6 +633,7 @@ func (c *Control) handleSubscriptionRequest(trans *TransactionXapp, subReqMsg *e break } } else { + // Timer expiry err = fmt.Errorf("E2 subscription response timeout") errorInfo.SetInfo(err.Error(), "", models.SubscriptionInstanceTimeoutTypeE2Timeout) if subs.PolicyUpdate == true { @@ -641,6 +642,7 @@ func (c *Control) handleSubscriptionRequest(trans *TransactionXapp, subReqMsg *e } xapp.Logger.Error("XAPP-SubReq E2 subscription failed %s", idstring(err, trans, subs)) + c.registry.RemoveFromSubscription(subs, trans, waitRouteCleanup_ms, c) return nil, &errorInfo, err } @@ -746,8 +748,8 @@ func (c *Control) RESTSubscriptionDeleteHandler(restSubId string) int { return common.UnsubscribeBadRequestCode } else if restSubscription.SubDelReqOngoing == true { // Previous request for same restSubId still ongoing - c.UpdateCounter(cRestSubDelFailToXapp) - return common.UnsubscribeBadRequestCode + c.UpdateCounter(cRestSubDelRespToXapp) + return common.UnsubscribeNoContentCode } } } @@ -1116,6 +1118,7 @@ func (c *Control) handleSubscriptionCreate(subs *Subscription, parentTrans *Tran case *PackSubscriptionRequestErrortEvent, *SDLWriteErrortEvent: subRfMsg, valid = subs.SetCachedResponse(event, false) default: + // Timer expiry if subs.PolicyUpdate == false { xapp.Logger.Debug("SUBS-SubReq: internal delete due default event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans)) removeSubscriptionFromDb = true diff --git a/pkg/control/metrics_test.go b/pkg/control/metrics_test.go index b72a9ce..313811c 100644 --- a/pkg/control/metrics_test.go +++ b/pkg/control/metrics_test.go @@ -33,6 +33,7 @@ func TestAddAllCountersOnce(t *testing.T) { Counter{cRestSubReqFromXapp, 1}, Counter{cRestSubRespToXapp, 1}, Counter{cRestSubFailToXapp, 1}, + Counter{cRestReqRejDueE2Down, 1}, Counter{cRestSubNotifToXapp, 1}, Counter{cRestSubFailNotifToXapp, 1}, Counter{cSubReqToE2, 1}, @@ -59,6 +60,8 @@ func TestAddAllCountersOnce(t *testing.T) { Counter{cSDLWriteFailure, 1}, Counter{cSDLReadFailure, 1}, Counter{cSDLRemoveFailure, 1}, + Counter{cE2StateChangedToUp, 1}, + Counter{cE2StateChangedToDown, 1}, }) mainCtrl.c.UpdateCounter(cSubReqFromXapp) @@ -67,6 +70,7 @@ func TestAddAllCountersOnce(t *testing.T) { mainCtrl.c.UpdateCounter(cRestSubReqFromXapp) mainCtrl.c.UpdateCounter(cRestSubRespToXapp) mainCtrl.c.UpdateCounter(cRestSubFailToXapp) + mainCtrl.c.UpdateCounter(cRestReqRejDueE2Down) mainCtrl.c.UpdateCounter(cRestSubNotifToXapp) mainCtrl.c.UpdateCounter(cRestSubFailNotifToXapp) mainCtrl.c.UpdateCounter(cSubReqToE2) @@ -93,6 +97,8 @@ func TestAddAllCountersOnce(t *testing.T) { mainCtrl.c.UpdateCounter(cSDLWriteFailure) mainCtrl.c.UpdateCounter(cSDLReadFailure) mainCtrl.c.UpdateCounter(cSDLRemoveFailure) + mainCtrl.c.UpdateCounter(cE2StateChangedToUp) + mainCtrl.c.UpdateCounter(cE2StateChangedToDown) mainCtrl.VerifyCounterValues(t) } diff --git a/pkg/control/registry.go b/pkg/control/registry.go index 8c79540..07affbd 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -455,6 +455,7 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction } func (r *Registry) RouteDelete(subs *Subscription, trans *TransactionXapp, c *Control) { + tmpList := xapp.RmrEndpointList{} tmpList.AddEndpoint(trans.GetEndpoint()) subRouteAction := SubRouteInfo{tmpList, uint16(subs.ReqId.InstanceId)} diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go index 3a11983..8727904 100644 --- a/pkg/control/ut_ctrl_submgr_test.go +++ b/pkg/control/ut_ctrl_submgr_test.go @@ -48,7 +48,9 @@ type Counter struct { type CountersToBeAdded []Counter -var countersBeforeMap map[string]Counter +var allCountersMap map[string]Counter +var allCountersBeforeMap map[string]Counter +var toBeAddedCountersBeforeMap map[string]Counter var toBeAddedCountersMap map[string]Counter func createSubmgrControl(srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc) *testingSubmgrControl { @@ -302,6 +304,17 @@ func (mc *testingSubmgrControl) GetMetrics(t *testing.T) (string, error) { return string(respBody[:]), nil } +func (mc *testingSubmgrControl) InitAllCounterMap() { + counterOpts := GetMetricsOpts() + + allCountersMap = make(map[string]Counter) + for _, counterOpt := range counterOpts { + //fmt.Printf("counterOpt.Name: '%v'\n", counterOpt.Name) + counter := Counter{counterOpt.Name, 0} + allCountersMap[counterOpt.Name] = counter + } +} + func (mc *testingSubmgrControl) CounterValuesToBeVeriefied(t *testing.T, countersToBeAdded CountersToBeAdded) { if len(toBeAddedCountersMap) == 0 { @@ -314,25 +327,26 @@ func (mc *testingSubmgrControl) CounterValuesToBeVeriefied(t *testing.T, counter } func (mc *testingSubmgrControl) GetCounterValuesBefore(t *testing.T) { - countersBeforeMap = make(map[string]Counter) - countersBeforeMap = mc.GetCurrentCounterValues(t, toBeAddedCountersMap) + toBeAddedCountersBeforeMap = make(map[string]Counter) + toBeAddedCountersBeforeMap = mc.GetCurrentCounterValues(t, toBeAddedCountersMap) + allCountersBeforeMap = make(map[string]Counter) + allCountersBeforeMap = mc.GetCurrentCounterValues(t, allCountersMap) } func (mc *testingSubmgrControl) VerifyCounterValues(t *testing.T) { // Check that expected counters are added ok + // Get current values of counters exected to be added currentCountersMap := mc.GetCurrentCounterValues(t, toBeAddedCountersMap) for _, toBeAddedCounter := range toBeAddedCountersMap { if currentCounter, ok := currentCountersMap[toBeAddedCounter.Name]; ok == true { - if beforeCounter, ok := countersBeforeMap[toBeAddedCounter.Name]; ok == true { + if beforeCounter, ok := toBeAddedCountersBeforeMap[toBeAddedCounter.Name]; ok == true { if currentCounter.Value != beforeCounter.Value+toBeAddedCounter.Value { mc.TestError(t, "Error in expected counter value: counterName %v, current value %v, expected value %v", currentCounter.Name, currentCounter.Value, beforeCounter.Value+toBeAddedCounter.Value) - - //fmt.Printf("beforeCounter.Value=%v, toBeAddedCounter.Value=%v, \n",beforeCounter.Value, toBeAddedCounter.Value) } } else { - mc.TestError(t, "Counter %v not in countersBeforeMap", toBeAddedCounter.Name) + mc.TestError(t, "Counter %v not in toBeAddedCountersBeforeMap", toBeAddedCounter.Name) } } else { mc.TestError(t, "Counter %v not in currentCountersMap", toBeAddedCounter.Name) @@ -340,24 +354,22 @@ func (mc *testingSubmgrControl) VerifyCounterValues(t *testing.T) { } // Check that not any unexpected counter are added (this is not working correctly!) + // Get current values of all counters + currentCountersMap = mc.GetCurrentCounterValues(t, allCountersMap) for _, currentCounter := range currentCountersMap { if _, ok := toBeAddedCountersMap[currentCounter.Name]; ok == false { - if beforeCounter, ok := countersBeforeMap[currentCounter.Name]; ok == true { + if beforeCounter, ok := allCountersBeforeMap[currentCounter.Name]; ok == true { if currentCounter.Value != beforeCounter.Value { - mc.TestError(t, "Error: unexpected counter value added: counterName %v, current value %v, expected value %v", - currentCounter.Name, beforeCounter.Value, beforeCounter.Value) - - //fmt.Printf("beforeCounter.Value=%v, toBeAddedCounter.Value=%v, \n",beforeCounter.Value, toBeAddedCounter.Value) + mc.TestError(t, "Error: unexpected counter added: counterName %v, current value %v, expected value %v", + currentCounter.Name, currentCounter.Value, beforeCounter.Value) } - } else { - mc.TestError(t, "Counter %v not in countersBeforeMap", beforeCounter.Name) } } } // Make map empty - //fmt.Printf("toBeAddedCountersMap=%v\n",toBeAddedCountersMap) toBeAddedCountersMap = make(map[string]Counter) + allCountersBeforeMap = make(map[string]Counter) } func (mc *testingSubmgrControl) GetCurrentCounterValues(t *testing.T, chekedCountersMap map[string]Counter) map[string]Counter { @@ -388,7 +400,6 @@ func (mc *testingSubmgrControl) GetCurrentCounterValues(t *testing.T, chekedCoun if len(retCounterMap) != len(chekedCountersMap) { mc.TestError(t, "Error: len(retCounterMap) != len(chekedCountersMap)") - } return retCounterMap } diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go index 5cc7458..19680e8 100644 --- a/pkg/control/ut_messaging_test.go +++ b/pkg/control/ut_messaging_test.go @@ -39,6 +39,7 @@ func TestSuiteSetup(t *testing.T) { // like this:git log // SetPackerIf(e2ap_wrapper.NewAsn1E2APPacker()) + mainCtrl.InitAllCounterMap() SetPackerIf(e2ap_wrapper.NewUtAsn1E2APPacker()) mainCtrl.c.restDuplicateCtrl.Init() @@ -95,6 +96,7 @@ func TestRESTSubReqAfterE2ConnBreak(t *testing.T) { mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED") mainCtrl.VerifyCounterValues(t) + //os.Exit(1) } //----------------------------------------------------------------------------- @@ -726,6 +728,7 @@ func TestSubMergeDelAndRouteUpdateNok(t *testing.T) { // Init counter check mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cSubReqFromXapp, 2}, + Counter{cMergedSubscriptions, 1}, Counter{cSubReqToE2, 1}, Counter{cSubRespFromE2, 1}, Counter{cSubRespToXapp, 2}, @@ -734,6 +737,7 @@ func TestSubMergeDelAndRouteUpdateNok(t *testing.T) { Counter{cSubDelReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, Counter{cSubDelRespToXapp, 2}, + Counter{cUnmergedSubscriptions, 1}, }) //Req1 @@ -1260,6 +1264,7 @@ func TestSubReqRetryInSubmgr(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cSubReqFromXapp, 1}, Counter{cSubReqToE2, 1}, + Counter{cSubReqTimerExpiry, 1}, Counter{cSubReReqToE2, 1}, Counter{cSubRespFromE2, 1}, Counter{cSubRespToXapp, 1}, @@ -2777,6 +2782,7 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 2}, + Counter{cMergedSubscriptions, 1}, Counter{cRestSubRespToXapp, 2}, Counter{cSubReqToE2, 1}, Counter{cSubRespFromE2, 1}, @@ -2786,6 +2792,7 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) { Counter{cSubDelReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, Counter{cRestSubDelRespToXapp, 2}, + Counter{cUnmergedSubscriptions, 1}, }) var params *teststube2ap.RESTSubsReqParams = nil @@ -2941,6 +2948,7 @@ func TestRESTSubReqRetransmissionV2(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 3}, + Counter{cDuplicateE2SubReq, 2}, Counter{cRestSubRespToXapp, 3}, Counter{cSubReqToE2, 1}, Counter{cSubRespFromE2, 1}, @@ -3025,6 +3033,7 @@ func TestRESTSubReqRetransmissionV3(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 3}, + Counter{cDuplicateE2SubReq, 2}, Counter{cRestSubRespToXapp, 3}, Counter{cSubReqToE2, 1}, Counter{cSubRespFromE2, 1}, @@ -3129,6 +3138,7 @@ func TestRESTSubReqRetransmissionV4(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 3}, + Counter{cDuplicateE2SubReq, 2}, Counter{cRestSubRespToXapp, 3}, Counter{cSubReqToE2, 2}, Counter{cSubRespFromE2, 2}, @@ -3250,6 +3260,7 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 3}, + Counter{cDuplicateE2SubReq, 2}, Counter{cRestSubRespToXapp, 3}, Counter{cSubReqToE2, 2}, Counter{cSubRespFromE2, 2}, @@ -3382,6 +3393,7 @@ func TestRESTSubReqRetransmissionV6(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 3}, + Counter{cDuplicateE2SubReq, 1}, Counter{cRestSubRespToXapp, 3}, Counter{cSubReqToE2, 3}, Counter{cSubRespFromE2, 3}, @@ -3453,7 +3465,7 @@ func TestRESTSubDelReqRetransmission(t *testing.T) { Counter{cRestSubDelReqFromXapp, 2}, Counter{cSubDelReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, - Counter{cRestSubDelRespToXapp, 1}, + Counter{cRestSubDelRespToXapp, 2}, }) var params *teststube2ap.RESTSubsReqParams = nil @@ -3517,6 +3529,7 @@ func TestRESTSubReqDelReq(t *testing.T) { Counter{cSubRespFromE2, 1}, Counter{cRestSubNotifToXapp, 1}, Counter{cRestSubDelReqFromXapp, 2}, + Counter{cRestSubDelFailToXapp, 1}, Counter{cSubDelReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, Counter{cRestSubDelRespToXapp, 1}, @@ -3641,7 +3654,6 @@ func TestRESTSameSubsDiffRan(t *testing.T) { waitSubsCleanup(t, e2SubsId2, 10) mainCtrl.VerifyCounterValues(t) - } func TestRESTSubReqRetryInSubmgr(t *testing.T) { @@ -3652,6 +3664,7 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) { Counter{cRestSubReqFromXapp, 1}, Counter{cRestSubRespToXapp, 1}, Counter{cSubReqToE2, 1}, + Counter{cSubReqTimerExpiry, 1}, Counter{cSubReReqToE2, 1}, Counter{cSubRespFromE2, 1}, Counter{cRestSubNotifToXapp, 1}, @@ -3737,10 +3750,10 @@ func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) { Counter{cSubReqToE2, 1}, Counter{cSubReReqToE2, 1}, Counter{cSubReqTimerExpiry, 2}, + Counter{cRestSubFailNotifToXapp, 1}, Counter{cSubDelReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, }) - params := xappConn1.GetRESTSubsReqReportParams(subReqCount) restSubId := xappConn1.SendRESTSubsReq(t, params) xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId) @@ -3772,10 +3785,11 @@ func TestREST2eTermNotRespondingToSubReq(t *testing.T) { Counter{cSubReqToE2, 1}, Counter{cSubReReqToE2, 1}, Counter{cSubReqTimerExpiry, 2}, + Counter{cSubDelReReqToE2, 1}, + Counter{cRestSubFailNotifToXapp, 1}, Counter{cSubDelReqToE2, 1}, Counter{cSubDelReqTimerExpiry, 2}, }) - params := xappConn1.GetRESTSubsReqReportParams(subReqCount) restSubId := xappConn1.SendRESTSubsReq(t, params) xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId) @@ -3849,6 +3863,7 @@ func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) { Counter{cSubReqToE2, 1}, Counter{cSubReReqToE2, 1}, Counter{cSubReqTimerExpiry, 2}, + Counter{cRestSubFailNotifToXapp, 1}, Counter{cSubDelReqToE2, 1}, Counter{cSubDelReReqToE2, 1}, Counter{cSubDelReqTimerExpiry, 2}, @@ -3915,6 +3930,7 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) { Counter{cSubFailFromE2, 1}, Counter{cRestSubFailNotifToXapp, 1}, Counter{cRestSubDelReqFromXapp, 1}, + Counter{cRestSubDelRespToXapp, 1}, }) const subReqCount int = 1 @@ -3983,6 +3999,7 @@ func TestRESTSubDelReqRetryInSubmgr(t *testing.T) { Counter{cRestSubNotifToXapp, 1}, Counter{cRestSubDelReqFromXapp, 1}, Counter{cSubDelReqToE2, 1}, + Counter{cSubDelReqTimerExpiry, 1}, Counter{cSubDelReReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, Counter{cRestSubDelRespToXapp, 1}, @@ -4043,6 +4060,7 @@ func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) { Counter{cRestSubNotifToXapp, 1}, Counter{cRestSubDelReqFromXapp, 1}, Counter{cSubDelReqToE2, 1}, + Counter{cSubDelReqTimerExpiry, 1}, Counter{cSubDelReReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, Counter{cRestSubDelRespToXapp, 1}, @@ -4339,7 +4357,7 @@ func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) { // | RESTSubReq2 | | // |------------------------------>| | // | | | | -// | RESTSubDelResp2 | | +// | RESTSubResp2 | | // |<------------------------------| | // | | | SubReq1 | // | | |------------->| @@ -4375,15 +4393,17 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 2}, + Counter{cMergedSubscriptions, 1}, Counter{cRestSubRespToXapp, 2}, Counter{cSubReqToE2, 1}, + Counter{cSubReqTimerExpiry, 2}, + Counter{cSubReReqToE2, 1}, Counter{cRestSubFailNotifToXapp, 2}, Counter{cRestSubDelReqFromXapp, 2}, Counter{cSubDelReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, Counter{cRestSubDelRespToXapp, 2}, }) - const subReqCount int = 1 // Req1 @@ -4475,6 +4495,7 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) { mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{ Counter{cRestSubReqFromXapp, 2}, + Counter{cMergedSubscriptions, 1}, Counter{cRestSubRespToXapp, 2}, Counter{cSubReqToE2, 1}, Counter{cSubFailFromE2, 1}, @@ -4971,6 +4992,7 @@ func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) { Counter{cSubDelReqFromXapp, 1}, Counter{cSubDelReqToE2, 1}, Counter{cSubDelRespFromE2, 1}, + Counter{cRestSubFailNotifToXapp, 1}, }) const subReqCount int = 1 @@ -5054,9 +5076,9 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) { Counter{cRestSubNotifToXapp, 1}, Counter{cRestSubDelReqFromXapp, 1}, Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, Counter{cRestSubDelRespToXapp, 1}, }) - // Remove possible existing subscription mainCtrl.removeExistingSubscriptions(t) @@ -6759,6 +6781,7 @@ func TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction(t *testing.T) { Counter{cRestSubReqFromXapp, 2}, Counter{cRestSubRespToXapp, 2}, Counter{cSubReqToE2, 2}, + Counter{cSubReqTimerExpiry, 1}, Counter{cSubRespFromE2, 1}, Counter{cRestSubNotifToXapp, 1}, Counter{cRestSubFailNotifToXapp, 1}, @@ -6865,9 +6888,10 @@ func TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) { Counter{cSubReqToE2, 2}, Counter{cSubRespFromE2, 1}, Counter{cRestSubNotifToXapp, 1}, - Counter{cRestSubNotifToXapp, 1}, + Counter{cRestSubFailNotifToXapp, 1}, Counter{cRestSubDelReqFromXapp, 1}, Counter{cSubDelReqToE2, 1}, + Counter{cSubDelRespFromE2, 1}, Counter{cRestSubDelRespToXapp, 1}, }) @@ -6914,10 +6938,6 @@ func TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) { // Check subscription queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"}) - xapp.Logger.Debug("Here 1") - //<-time.After(3 * time.Second) - xapp.Logger.Debug("Here 2") - // Delete subscription xappConn1.SendRESTSubsDelReq(t, &restSubId) delreq, delmsg := e2termConn1.RecvSubsDelReq(t) -- 2.16.6