X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=e514cb0faf306b87334dc6ca31e700f90afa69d0;hb=3cdd2e0c0d042b816f6d35f68a93f97fbbe7efc1;hp=9ec0e8411fb4474b8c71832a3529784a395280a7;hpb=5112239fe7bf1a53f43d8898d2862921594b1f80;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go
index 9ec0e84..e514cb0 100644
--- a/pkg/control/ut_ctrl_submgr_test.go
+++ b/pkg/control/ut_ctrl_submgr_test.go
@@ -55,8 +55,12 @@ func createSubmgrControl(srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc) *te
 	mainCtrl = &testingSubmgrControl{}
 	mainCtrl.RmrControl.Init("SUBMGRCTL", srcId, rtgSvc)
 	mainCtrl.c = NewControl()
+	mainCtrl.c.UTTesting = true
+	mainCtrl.c.LoggerLevel = int(xapp.Logger.GetLevel())
+	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
 	xapp.SetReadyCB(mainCtrl.ReadyCB, nil)
 	go xapp.RunWithParams(mainCtrl.c, false)
 	mainCtrl.WaitCB()
@@ -69,22 +73,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,6 +88,18 @@ 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)
 }
 
@@ -134,7 +142,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
 }
 
@@ -309,6 +317,8 @@ func (mc *testingSubmgrControl) GetCounterValuesBefore(t *testing.T) {
 }
 
 func (mc *testingSubmgrControl) VerifyCounterValues(t *testing.T) {
+
+	// Check that expected counters are added ok
 	currentCountersMap := mc.GetCurrentCounterValues(t, toBeAddedCountersMap)
 	for _, toBeAddedCounter := range toBeAddedCountersMap {
 		if currentCounter, ok := currentCountersMap[toBeAddedCounter.Name]; ok == true {
@@ -327,6 +337,22 @@ func (mc *testingSubmgrControl) VerifyCounterValues(t *testing.T) {
 		}
 	}
 
+	// Check that not any unexpected counter are added
+	for _, currentCounter := range currentCountersMap {
+		if _, ok := toBeAddedCountersMap[currentCounter.Name]; ok == false {
+			if beforeCounter, ok := countersBeforeMap[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)
+				}
+			} 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)