Code Review
/
ric-plt
/
submgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add fix for policy change transaction key already tracked
[ric-plt/submgr.git]
/
pkg
/
control
/
ut_ctrl_submgr_test.go
diff --git
a/pkg/control/ut_ctrl_submgr_test.go
b/pkg/control/ut_ctrl_submgr_test.go
index
8403c93
..
9fb852a
100644
(file)
--- a/
pkg/control/ut_ctrl_submgr_test.go
+++ b/
pkg/control/ut_ctrl_submgr_test.go
@@
-20,6
+20,7
@@
package control
import (
package control
import (
+ "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststub"
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
"testing"
"time"
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
"testing"
"time"
@@
-29,17
+30,18
@@
import (
//
//-----------------------------------------------------------------------------
type testingSubmgrControl struct {
//
//-----------------------------------------------------------------------------
type testingSubmgrControl struct {
- test
ing
RmrControl
+ test
stub.
RmrControl
c *Control
}
c *Control
}
-func createSubmgrControl(
desc string,
rtfile string, port string) *testingSubmgrControl {
+func createSubmgrControl(rtfile string, port string) *testingSubmgrControl {
mainCtrl = &testingSubmgrControl{}
mainCtrl = &testingSubmgrControl{}
- mainCtrl.
testingRmrControl.init(desc
, rtfile, port)
+ mainCtrl.
RmrControl.Init("SUBMGRCTL"
, rtfile, port)
mainCtrl.c = NewControl()
xapp.SetReadyCB(mainCtrl.ReadyCB, nil)
go xapp.RunWithParams(mainCtrl.c, false)
mainCtrl.WaitCB()
mainCtrl.c = NewControl()
xapp.SetReadyCB(mainCtrl.ReadyCB, nil)
go xapp.RunWithParams(mainCtrl.c, false)
mainCtrl.WaitCB()
+ mainCtrl.c.ReadyCB(nil)
return mainCtrl
}
return mainCtrl
}
@@
-53,33
+55,33
@@
func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool
}
time.Sleep(500 * time.Millisecond)
}
}
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
}
return false
}
-func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId
int
, secs int) bool {
+func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId
uint32
, secs int) bool {
var subs *Subscription
i := 1
for ; i <= secs*2; i++ {
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 {
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 {
} 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
}
}
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++ {
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
}
if subs == nil {
return true
}
@@
-90,20
+92,20
@@
func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId int
time.Sleep(500 * time.Millisecond)
}
if trans != nil {
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 {
} 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
}
}
return false
}
-func (mc *testingSubmgrControl) get_subid(t *testing.T) uint
16
{
+func (mc *testingSubmgrControl) get_subid(t *testing.T) uint
32
{
mc.c.registry.mutex.Lock()
defer mc.c.registry.mutex.Unlock()
return mc.c.registry.subIds[0]
}
mc.c.registry.mutex.Lock()
defer mc.c.registry.mutex.Unlock()
return mc.c.registry.subIds[0]
}
-func (mc *testingSubmgrControl) wait_subid_change(t *testing.T, origSubId uint
16, secs int) (uint16
, bool) {
+func (mc *testingSubmgrControl) wait_subid_change(t *testing.T, origSubId uint
32, secs int) (uint32
, bool) {
i := 1
for ; i <= secs*2; i++ {
mc.c.registry.mutex.Lock()
i := 1
for ; i <= secs*2; i++ {
mc.c.registry.mutex.Lock()
@@
-114,23
+116,23
@@
func (mc *testingSubmgrControl) wait_subid_change(t *testing.T, origSubId uint16
}
time.Sleep(500 * time.Millisecond)
}
}
time.Sleep(500 * time.Millisecond)
}
-
testError(t, "(general
) no subId change within %d secs", secs)
+
mc.TestError(t, "(submgr
) no subId change within %d secs", secs)
return 0, false
}
func (mc *testingSubmgrControl) get_msgcounter(t *testing.T) uint64 {
return 0, false
}
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++ {
}
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)
}
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
}
return 0, false
}