X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=bd81127bf2baccb21c09635c616e164260290066;hb=b642a19e7527f03458f1b6ca47bca132019aa2cf;hp=3a0e0e4a4f5fb6da4f8609c80a7e4c6952e1847c;hpb=47518ae7612cbfb1562fa1f74b9023389d8cfd61;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go
index 3a0e0e4..bd81127 100644
--- a/pkg/control/ut_ctrl_submgr_test.go
+++ b/pkg/control/ut_ctrl_submgr_test.go
@@ -69,6 +69,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()
 	// Read subIds and subscriptions from database
 	subIds, register, err := mainCtrl.c.ReadAllSubscriptionsFromSdl()
 	if err != nil {
@@ -95,8 +96,15 @@ func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) {
 	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
 }
 
@@ -120,12 +128,12 @@ func PringSubscriptionQueryResult(resp models.SubscriptionList) {
 func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool {
 	cnt := int(0)
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		cnt = len(mc.c.registry.register)
 		if cnt == 0 {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt)
 	return false
@@ -139,14 +147,14 @@ func (mc *testingSubmgrControl) get_registry_next_subid(t *testing.T) uint32 {
 
 func (mc *testingSubmgrControl) wait_registry_next_subid_change(t *testing.T, origSubId uint32, secs int) (uint32, bool) {
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; 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)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no subId change within %d secs", secs)
 	return 0, false
@@ -155,12 +163,12 @@ func (mc *testingSubmgrControl) wait_registry_next_subid_change(t *testing.T, or
 func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, secs int) bool {
 	var subs *Subscription
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		subs = mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	if subs != nil {
 		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, subs.String())
@@ -170,10 +178,35 @@ func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, s
 	return false
 }
 
+func (mc *testingSubmgrControl) wait_multi_subs_clean(t *testing.T, e2SubsIds []uint32, secs int) bool {
+
+	purgedSubscriptions := 0
+
+	for i := 1; i <= secs*10; i++ {
+		purgedSubscriptions = 0
+		for k := 0; k <= len(e2SubsIds); i++ {
+			subs := mc.c.registry.GetSubscription(e2SubsIds[k])
+			if subs == nil {
+				mc.TestLog(t, "(submgr) subscriber purged for esSubsId %v", e2SubsIds[k])
+				purgedSubscriptions += 1
+				if purgedSubscriptions == len(e2SubsIds) {
+					return true
+				}
+			}
+		}
+		mc.TestLog(t, "(submgr) subscriptions pending purging %v/%v after %d msecs", purgedSubscriptions, len(e2SubsIds), i+500)
+		time.Sleep(100 * time.Millisecond)
+	}
+
+	mc.TestError(t, "(submgr) no clean within %d secs: subs(N/A) - %v/%v subscriptions found still", secs, purgedSubscriptions, len(e2SubsIds))
+
+	return false
+}
+
 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++ {
+	for ; i <= secs*10; i++ {
 		subs := mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
@@ -182,7 +215,7 @@ func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uin
 		if trans == nil {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	if trans != nil {
 		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, trans.String())
@@ -210,12 +243,12 @@ func (mc *testingSubmgrControl) wait_subs_entrypoint_cnt_change(t *testing.T, or
 	}
 
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		curr := subs.EpList.Size()
 		if curr != orig {
 			return curr, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no subs %d entrypoint cnt change within %d secs", origSubId, secs)
 	return 0, false
@@ -230,12 +263,12 @@ func (mc *testingSubmgrControl) get_msgcounter(t *testing.T) uint64 {
 
 func (mc *testingSubmgrControl) wait_msgcounter_change(t *testing.T, orig uint64, secs int) (uint64, bool) {
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		curr := mc.c.CntRecvMsg
 		if curr != orig {
 			return curr, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no msg counter change within %d secs", secs)
 	return 0, false