X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=ea3ffd9ee7b016162f8f38a4f0c417f7a911fb97;hb=b43397e236303243729347b327d9ace8262469d9;hp=eb6d6d4345007155dc057ad0e9211b2f60f0ce09;hpb=08c8fbd6d2d26e17b87aac8438d035813170bc91;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go index eb6d6d4..ea3ffd9 100644 --- a/pkg/control/ut_ctrl_submgr_test.go +++ b/pkg/control/ut_ctrl_submgr_test.go @@ -28,6 +28,8 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststub" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" @@ -48,7 +50,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 { @@ -56,11 +60,13 @@ func createSubmgrControl(srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc) *te mainCtrl.RmrControl.Init("SUBMGRCTL", srcId, rtgSvc) mainCtrl.c = NewControl() mainCtrl.c.UTTesting = true - mainCtrl.c.LoggerLevel = int(xapp.Logger.GetLevel()) + 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.e2SubsDb = CreateMock() // This overrides real E2 Subscription database for testing - mainCtrl.c.restSubsDb = CreateRestSubsDbMock() // This overrides real REST Subscription 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() @@ -73,7 +79,7 @@ func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) { mainCtrl.c.registry.subIds = nil // Initialize subIds slice and subscription map mainCtrl.c.registry.Initialize() - restDuplicateCtrl.Init() + mainCtrl.c.restDuplicateCtrl.Init() // Read subIds and subscriptions from database subIds, register, err := mainCtrl.c.ReadAllSubscriptionsFromSdl() if err != nil { @@ -281,6 +287,20 @@ func (mc *testingSubmgrControl) wait_msgcounter_change(t *testing.T, orig uint64 return 0, false } +func (mc *testingSubmgrControl) VerifyAllClean(t *testing.T) { + // Verify that all resources are freed + assert.Equal(t, 0, len(mainCtrl.c.registry.register)) + if len(mainCtrl.c.registry.register) > 0 { + fmt.Printf("registry.register: %v\n", mainCtrl.c.registry.register) + } + assert.Equal(t, 0, len(mainCtrl.c.registry.restSubscriptions)) + if len(mainCtrl.c.registry.restSubscriptions) > 0 { + fmt.Printf("registry.restSubscriptions: %v\n", mainCtrl.c.registry.restSubscriptions) + } + verifyRESTKeyCount(t, 0) + verifyE2KeyCount(t, 0) +} + func (mc *testingSubmgrControl) GetMetrics(t *testing.T) (string, error) { req, err := http.NewRequest("GET", "http://localhost:8080/ric/v1/metrics", nil) if err != nil { @@ -300,6 +320,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 { @@ -312,50 +343,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 + // 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 { @@ -386,7 +416,6 @@ func (mc *testingSubmgrControl) GetCurrentCounterValues(t *testing.T, chekedCoun if len(retCounterMap) != len(chekedCountersMap) { mc.TestError(t, "Error: len(retCounterMap) != len(chekedCountersMap)") - } return retCounterMap } @@ -455,3 +484,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) + } +}