X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=f253424cc465d5029c655c2d5cede3ed15e65989;hb=c92b421ec9f89e77df36422987e478ed8db85299;hp=8403c9337716a52f68c62b8706c3ce724a9c3b7e;hpb=3944a22bb267f649fff113682a6ba4253007392d;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go index 8403c93..f253424 100644 --- a/pkg/control/ut_ctrl_submgr_test.go +++ b/pkg/control/ut_ctrl_submgr_test.go @@ -20,6 +20,9 @@ package control import ( + "fmt" + "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" "testing" "time" @@ -29,20 +32,76 @@ import ( // //----------------------------------------------------------------------------- type testingSubmgrControl struct { - testingRmrControl + teststub.RmrControl c *Control } -func createSubmgrControl(desc string, rtfile string, port string) *testingSubmgrControl { +func createSubmgrControl(srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc) *testingSubmgrControl { mainCtrl = &testingSubmgrControl{} - mainCtrl.testingRmrControl.init(desc, rtfile, port) + mainCtrl.RmrControl.Init("SUBMGRCTL", srcId, rtgSvc) mainCtrl.c = NewControl() + xapp.Logger.Debug("Replacing real db with test db") + mainCtrl.c.db = CreateMock() // This overrides real database for testing xapp.SetReadyCB(mainCtrl.ReadyCB, nil) go xapp.RunWithParams(mainCtrl.c, false) mainCtrl.WaitCB() + mainCtrl.c.ReadyCB(nil) return mainCtrl } +func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) { + mc.TestLog(t, "Simulating submgr restart") + mainCtrl.c.registry.subIds = nil + // Initialize subIds slice and subscription map + mainCtrl.c.registry.Initialize() + // 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 + + fmt.Println("register:") + for subId, subs := range register { + fmt.Println(" subId", subId) + fmt.Println(" subs.SubRespRcvd", subs.SubRespRcvd) + fmt.Printf(" subs %v\n", subs) + } + + fmt.Println("mainCtrl.c.registry.register:") + for subId, subs := range mainCtrl.c.registry.register { + fmt.Println(" subId", subId) + fmt.Println(" subs.SubRespRcvd", subs.SubRespRcvd) + fmt.Printf(" subs %v\n", subs) + } + } + go mainCtrl.c.HandleUncompletedSubscriptions(mainCtrl.c.registry.register) +} + +func (mc *testingSubmgrControl) SetResetTestFlag(t *testing.T, status bool) { + mc.TestLog(t, "ResetTestFlag set to %v", status) + mainCtrl.c.ResetTestFlag = status +} + +func (mc *testingSubmgrControl) removeExistingSubscriptions(t *testing.T) { + + mc.TestLog(t, "Removing existing subscriptions") + mainCtrl.c.RemoveAllSubscriptionsFromSdl() + mainCtrl.c.registry.subIds = nil + // Initialize subIds slice and subscription map + mainCtrl.c.registry.Initialize() +} + +func PringSubscriptionQueryResult(resp models.SubscriptionList) { + for _, item := range resp { + fmt.Printf("item.SubscriptionID %v\n", item.SubscriptionID) + fmt.Printf("item.Meid %v\n", item.Meid) + fmt.Printf("item.Endpoint %v\n", item.Endpoint) + } +} + func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool { cnt := int(0) i := 1 @@ -53,33 +112,54 @@ func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool } time.Sleep(500 * time.Millisecond) } - testError(t, "(general) no registry empty within %d secs: %d", secs, cnt) + mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt) return false } -func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId int, secs int) bool { +func (mc *testingSubmgrControl) get_registry_next_subid(t *testing.T) uint32 { + mc.c.registry.mutex.Lock() + defer mc.c.registry.mutex.Unlock() + return mc.c.registry.subIds[0] +} + +func (mc *testingSubmgrControl) wait_registry_next_subid_change(t *testing.T, origSubId uint32, secs int) (uint32, bool) { + i := 1 + for ; i <= secs*2; i++ { + mc.c.registry.mutex.Lock() + currSubId := mc.c.registry.subIds[0] + mc.c.registry.mutex.Unlock() + if currSubId != origSubId { + return currSubId, true + } + time.Sleep(500 * time.Millisecond) + } + mc.TestError(t, "(submgr) no subId change within %d secs", secs) + return 0, false +} + +func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, secs int) bool { var subs *Subscription i := 1 for ; i <= secs*2; i++ { - subs = mc.c.registry.GetSubscription(uint16(e2SubsId)) + subs = mc.c.registry.GetSubscription(e2SubsId) if subs == nil { return true } time.Sleep(500 * time.Millisecond) } if subs != nil { - testError(t, "(general) no clean within %d secs: %s", secs, subs.String()) + mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, subs.String()) } else { - testError(t, "(general) no clean within %d secs: subs(N/A)", secs) + mc.TestError(t, "(submgr) no clean within %d secs: subs(N/A)", secs) } return false } -func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId int, secs int) bool { - var trans *Transaction +func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uint32, secs int) bool { + var trans TransactionIf i := 1 for ; i <= secs*2; i++ { - subs := mc.c.registry.GetSubscription(uint16(e2SubsId)) + subs := mc.c.registry.GetSubscription(e2SubsId) if subs == nil { return true } @@ -90,47 +170,58 @@ func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId int time.Sleep(500 * time.Millisecond) } if trans != nil { - testError(t, "(general) no clean within %d secs: %s", secs, trans.String()) + mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, trans.String()) } else { - testError(t, "(general) no clean within %d secs: trans(N/A)", secs) + mc.TestError(t, "(submgr) no clean within %d secs: trans(N/A)", secs) } return false } -func (mc *testingSubmgrControl) get_subid(t *testing.T) uint16 { - mc.c.registry.mutex.Lock() - defer mc.c.registry.mutex.Unlock() - return mc.c.registry.subIds[0] +func (mc *testingSubmgrControl) get_subs_entrypoint_cnt(t *testing.T, origSubId uint32) int { + subs := mc.c.registry.GetSubscription(origSubId) + if subs == nil { + mc.TestError(t, "(submgr) no subs %d exists during entrypoint cnt get", origSubId) + return -1 + } + return subs.EpList.Size() } -func (mc *testingSubmgrControl) wait_subid_change(t *testing.T, origSubId uint16, secs int) (uint16, bool) { +func (mc *testingSubmgrControl) wait_subs_entrypoint_cnt_change(t *testing.T, origSubId uint32, orig int, secs int) (int, bool) { + + subs := mc.c.registry.GetSubscription(origSubId) + if subs == nil { + mc.TestError(t, "(submgr) no subs %d exists during entrypoint cnt wait", origSubId) + return -1, true + } + i := 1 for ; i <= secs*2; i++ { - mc.c.registry.mutex.Lock() - currSubId := mc.c.registry.subIds[0] - mc.c.registry.mutex.Unlock() - if currSubId != origSubId { - return currSubId, true + curr := subs.EpList.Size() + if curr != orig { + return curr, true } time.Sleep(500 * time.Millisecond) } - testError(t, "(general) no subId change within %d secs", secs) + mc.TestError(t, "(submgr) no subs %d entrypoint cnt change within %d secs", origSubId, secs) return 0, false } +// +// Counter check for received message. Note might not be yet handled +// func (mc *testingSubmgrControl) get_msgcounter(t *testing.T) uint64 { - return mc.c.msgCounter + return mc.c.CntRecvMsg } func (mc *testingSubmgrControl) wait_msgcounter_change(t *testing.T, orig uint64, secs int) (uint64, bool) { i := 1 for ; i <= secs*2; i++ { - curr := mc.c.msgCounter + curr := mc.c.CntRecvMsg if curr != orig { return curr, true } time.Sleep(500 * time.Millisecond) } - testError(t, "(general) no msg counter change within %d secs", secs) + mc.TestError(t, "(submgr) no msg counter change within %d secs", secs) return 0, false }