X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=87279041274e23e857aa7e9c294ff6d661fcf0c0;hb=3d80b72cb374aec809740f3bec895d4b37a4fc2f;hp=038c20ac88c7aaf56f670e553423baf9469e87fc;hpb=fe2cdabf98e8d1028bbe1713daa187e538f042a0;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go index 038c20a..8727904 100644 --- a/pkg/control/ut_ctrl_submgr_test.go +++ b/pkg/control/ut_ctrl_submgr_test.go @@ -48,15 +48,23 @@ 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 { mainCtrl = &testingSubmgrControl{} mainCtrl.RmrControl.Init("SUBMGRCTL", srcId, rtgSvc) mainCtrl.c = NewControl() + mainCtrl.c.UTTesting = true + mainCtrl.c.LoggerLevel = 4 + mainCtrl.c.e2ap.SetASN1DebugPrintStatus(mainCtrl.c.LoggerLevel) + xapp.Logger.Debug("Test: LoggerLevel %v", mainCtrl.c.LoggerLevel) xapp.Logger.Debug("Replacing real db with test db") - mainCtrl.c.db = CreateMock() // This overrides real database for testing + mainCtrl.c.e2SubsDb = CreateMock() // This overrides real E2 Subscription database for testing + mainCtrl.c.restSubsDb = CreateRestSubsDbMock() // This overrides real REST Subscription database for testing + mainCtrl.c.e2IfStateDb = CreateXappRnibIfMock() // This overrides real RNIB database for testing xapp.SetReadyCB(mainCtrl.ReadyCB, nil) go xapp.RunWithParams(mainCtrl.c, false) mainCtrl.WaitCB() @@ -69,22 +77,14 @@ func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) { mainCtrl.c.registry.subIds = nil // Initialize subIds slice and subscription map mainCtrl.c.registry.Initialize() + mainCtrl.c.restDuplicateCtrl.Init() // Read subIds and subscriptions from database subIds, register, err := mainCtrl.c.ReadAllSubscriptionsFromSdl() if err != nil { mc.TestError(t, "%v", err) } else { - mainCtrl.c.registry.register = nil mainCtrl.c.registry.subIds = subIds mainCtrl.c.registry.register = register - - mc.TestLog(t, "register:") - for subId, subs := range register { - mc.TestLog(t, " subId=%v", subId) - mc.TestLog(t, " subs.SubRespRcvd=%v", subs.SubRespRcvd) - mc.TestLog(t, " subs=%v\n", subs) - } - mc.TestLog(t, "mainCtrl.c.registry.register:") for subId, subs := range mainCtrl.c.registry.register { mc.TestLog(t, " subId=%v", subId) @@ -92,11 +92,30 @@ func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) { mc.TestLog(t, " subs=%v\n", subs) } } + restSubscriptions, err := mainCtrl.c.ReadAllRESTSubscriptionsFromSdl() + if err != nil { + mc.TestError(t, "%v", err) + } else { + mainCtrl.c.registry.restSubscriptions = restSubscriptions + mc.TestLog(t, "mainCtrl.c.registry.restSubscriptions:") + for restSubId, restSubs := range mainCtrl.c.registry.restSubscriptions { + mc.TestLog(t, " restSubId=%v", restSubId) + mc.TestLog(t, " restSubs=%v\n", restSubs) + } + } + go mainCtrl.c.HandleUncompletedSubscriptions(mainCtrl.c.registry.register) } +func (mc *testingSubmgrControl) MakeTransactionNil(t *testing.T, subId uint32) { + + mc.TestLog(t, "Makin transaction nil for SubId=%v", subId) + subs := mainCtrl.c.registry.GetSubscription(subId) + subs.TheTrans = nil +} + func (mc *testingSubmgrControl) SetResetTestFlag(t *testing.T, status bool) { - mc.TestLog(t, "ResetTestFlag set to %v=", status) + mc.TestLog(t, "ResetTestFlag set to %v", status) mainCtrl.c.ResetTestFlag = status } @@ -127,7 +146,7 @@ func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool } time.Sleep(100 * time.Millisecond) } - mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt) + mc.TestError(t, "(submgr) no registry empty within %d secs: %d, register: %v", secs, cnt, mc.c.registry.register) return false } @@ -285,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 { @@ -297,32 +327,49 @@ 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) } } + // 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 := allCountersBeforeMap[currentCounter.Name]; ok == true { + if currentCounter.Value != beforeCounter.Value { + mc.TestError(t, "Error: unexpected counter added: counterName %v, current value %v, expected value %v", + currentCounter.Name, currentCounter.Value, beforeCounter.Value) + } + } + } + } + // 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 { @@ -353,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 } @@ -422,3 +468,13 @@ func (mc *testingSubmgrControl) sendPostRequest(t *testing.T, addr string, path mc.TestLog(t, "%s", respBody) return } + +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (mc *testingSubmgrControl) SetE2State(t *testing.T, ranNameState string) { + + if err := mc.c.e2IfStateDb.XappRnibStoreAndPublish("RAN_CONNECTION_STATUS_CHANGE", ranNameState, "key1", "data1"); err != nil { + t.Errorf("XappRnibStoreAndPublish failed: %v", err) + } +}