mainCtrl.c.restDuplicateCtrl.Init()
// Read subIds and subscriptions from database
- go mainCtrl.c.ReadE2Subscriptions() // This needs to be run in own go routine when called from here <<--- improve this
+ mainCtrl.c.ReadE2Subscriptions()
mc.TestLog(t, "mainCtrl.c.registry.register:")
- /*
- for subId, subs := range mainCtrl.c.registry.register {
- mc.TestLog(t, " subId=%v", subId)
- mc.TestLog(t, " subs.SubRespRcvd=%v", subs.SubRespRcvd)
- mc.TestLog(t, " subs=%v\n", subs)
- }
- */
+ for subId, subs := range mainCtrl.c.registry.register {
+ mc.TestLog(t, " subId=%v", subId)
+ mc.TestLog(t, " subs.SubRespRcvd=%v", subs.SubRespRcvd)
+ mc.TestLog(t, " subs=%v\n", subs)
+ }
+
// Read REST subIds and REST subscriptions from database
mainCtrl.c.ReadRESTSubscriptions()
mc.TestLog(t, "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) // This needs to be run in own go routine when called from here
}
func (mc *testingSubmgrControl) MakeTransactionNil(t *testing.T, subId uint32) {
mainCtrl.c.registry.Initialize()
}
-func PringSubscriptionQueryResult(resp models.SubscriptionList) {
+func PrintSubscriptionQueryResult(resp models.SubscriptionList) {
for _, item := range resp {
fmt.Printf("item.SubscriptionID=%v\n", item.SubscriptionID)
fmt.Printf("item.Meid=%v\n", item.Meid)
break
}
}
+ xapp.Logger.Debug("VerifyAllClean. Adding 100ms more delay to complete")
<-time.After(time.Millisecond * 100)
- xapp.Logger.Debug("VerifyAllClean delay plus 100ms")
}
assert.Equal(t, 0, len(mainCtrl.c.registry.register))
for i := 0; i < 100; i++ {
if len(mainCtrl.c.restDuplicateCtrl.ongoingRequestMap) != 0 {
<-time.After(time.Millisecond * 100)
- xapp.Logger.Debug("WaitOngoingRequestMapEmpty delay plus 100ms")
+ xapp.Logger.Debug("WaitOngoingRequestMapEmpty. Adding 100ms more delay to complete")
+ }
+ }
+}
+
+func (mc *testingSubmgrControl) WaitRESTSubscriptionDelete(restSubsId string) {
+ for i := 0; i < 100; i++ {
+ restSubscription, _ := mainCtrl.c.registry.GetRESTSubscription(restSubsId, false)
+ if restSubscription != nil {
+ xapp.Logger.Debug("WaitRESTSubscriptionDelete. Adding 100ms more delay to complete")
+ <-time.After(time.Millisecond * 100)
}
}
}