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
Updating RMR version to 4.8.5
[ric-plt/submgr.git]
/
pkg
/
control
/
sdl_restSubsDb_test.go
diff --git
a/pkg/control/sdl_restSubsDb_test.go
b/pkg/control/sdl_restSubsDb_test.go
index
ac3c8e3
..
5e1db60
100644
(file)
--- a/
pkg/control/sdl_restSubsDb_test.go
+++ b/
pkg/control/sdl_restSubsDb_test.go
@@
-89,17
+89,19
@@
func CreateRESTSubscription(t *testing.T) *RESTSubscription {
t.Log("TEST: Creating REST subscription")
restSubscription := &RESTSubscription{}
t.Log("TEST: Creating REST subscription")
restSubscription := &RESTSubscription{}
+ restSubscription.xAppServiceName = "localhost"
restSubscription.xAppRmrEndPoint = "localhost:13560"
restSubscription.Meid = "RAN_NAME_1"
restSubscription.SubReqOngoing = true
restSubscription.SubDelReqOngoing = false
restSubscription.xAppIdToE2Id = make(map[int64]int64)
restSubscription.xAppRmrEndPoint = "localhost:13560"
restSubscription.Meid = "RAN_NAME_1"
restSubscription.SubReqOngoing = true
restSubscription.SubDelReqOngoing = false
restSubscription.xAppIdToE2Id = make(map[int64]int64)
- restSubscription.
Md5sum = "856e9546f6f7b65a13a86996f2d168
6a"
+ restSubscription.
lastReqMd5sum = "856e9546f6f7b65b13a86956f2e16f
6a"
return restSubscription
}
func PrintRESTSubscriptionData(t *testing.T, restSubs *RESTSubscription) {
t.Log("TEST: RESTSubscription data")
return restSubscription
}
func PrintRESTSubscriptionData(t *testing.T, restSubs *RESTSubscription) {
t.Log("TEST: RESTSubscription data")
+ t.Logf("TEST: restSubs.xAppServiceName = %v", restSubs.xAppServiceName)
t.Logf("TEST: restSubs.xAppRmrEndPoint = %v", restSubs.xAppRmrEndPoint)
t.Logf("TEST: restSubs.Meid = %v", restSubs.Meid)
t.Logf("TEST: restSubs.InstanceIds = %v", restSubs.InstanceIds)
t.Logf("TEST: restSubs.xAppRmrEndPoint = %v", restSubs.xAppRmrEndPoint)
t.Logf("TEST: restSubs.Meid = %v", restSubs.Meid)
t.Logf("TEST: restSubs.InstanceIds = %v", restSubs.InstanceIds)
@@
-120,6
+122,17
@@
func TestWriteRESTSubscriptionToSdl(t *testing.T) {
t.Errorf("TEST: %s", err.Error())
}
restSubsDbMock.AddRestSubIdsInDb(restSubId)
t.Errorf("TEST: %s", err.Error())
}
restSubsDbMock.AddRestSubIdsInDb(restSubId)
+ verifyRESTKeyCount(t, 1)
+}
+
+func verifyRESTKeyCount(t *testing.T, expectedCount int) {
+
+ count, err := mainCtrl.c.GetRESTKeyCount()
+ if err != nil {
+ t.Errorf("TEST: %s", err.Error())
+ } else {
+ assert.Equal(t, expectedCount, count)
+ }
}
func TestReadRESTSubscriptionFromSdl(t *testing.T) {
}
func TestReadRESTSubscriptionFromSdl(t *testing.T) {
@@
-369,13
+382,17
@@
func TestRemoveAllRESTSubscriptionsFromSdlFail(t *testing.T) {
t.Log("TEST: All subscription removed from db")
}
t.Log("TEST: All subscription removed from db")
}
-func (m *RestSubsDbMock) Set(pairs ...interface{}) error {
+func (m *RestSubsDbMock) Set(
ns string,
pairs ...interface{}) error {
var key string
var val string
m.marshalLock.Lock()
defer m.marshalLock.Unlock()
var key string
var val string
m.marshalLock.Lock()
defer m.marshalLock.Unlock()
+ if ns != restSubSdlNs {
+ return fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+ }
+
if sdlRestShouldReturnError == true {
return GetSdlRestError()
}
if sdlRestShouldReturnError == true {
return GetSdlRestError()
}
@@
-412,8
+429,13
@@
func (m *RestSubsDbMock) Set(pairs ...interface{}) error {
return nil
}
return nil
}
-func (m *RestSubsDbMock) Get(keys []string) (map[string]interface{}, error) {
+func (m *RestSubsDbMock) Get(
ns string,
keys []string) (map[string]interface{}, error) {
retMap := make(map[string]interface{})
retMap := make(map[string]interface{})
+
+ if ns != restSubSdlNs {
+ return nil, fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+ }
+
if len(keys) == 0 {
return nil, fmt.Errorf("Get() error: len(key) == 0\n")
}
if len(keys) == 0 {
return nil, fmt.Errorf("Get() error: len(key) == 0\n")
}
@@
-432,7
+454,11
@@
func (m *RestSubsDbMock) Get(keys []string) (map[string]interface{}, error) {
return retMap, nil
}
return retMap, nil
}
-func (m *RestSubsDbMock) GetAll() ([]string, error) {
+func (m *RestSubsDbMock) GetAll(ns string) ([]string, error) {
+
+ if ns != restSubSdlNs {
+ return nil, fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+ }
if sdlRestShouldReturnError == true {
return nil, GetSdlRestError()
if sdlRestShouldReturnError == true {
return nil, GetSdlRestError()
@@
-445,7
+471,12
@@
func (m *RestSubsDbMock) GetAll() ([]string, error) {
return keys, nil
}
return keys, nil
}
-func (m *RestSubsDbMock) Remove(keys []string) error {
+func (m *RestSubsDbMock) Remove(ns string, keys []string) error {
+
+ if ns != restSubSdlNs {
+ return fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+ }
+
if len(keys) == 0 {
return fmt.Errorf("Remove() error: len(key) == 0\n")
}
if len(keys) == 0 {
return fmt.Errorf("Remove() error: len(key) == 0\n")
}
@@
-460,7
+491,11
@@
func (m *RestSubsDbMock) Remove(keys []string) error {
return nil
}
return nil
}
-func (m *RestSubsDbMock) RemoveAll() error {
+func (m *RestSubsDbMock) RemoveAll(ns string) error {
+
+ if ns != restSubSdlNs {
+ return fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+ }
for key := range m.restSubsDb {
for key := range m.restSubsDb {