Test and debug interface improvements part 2

[ric-plt/submgr.git] / pkg / control / sdl_restSubsDb.go

diff --git a/pkg/control/sdl_restSubsDb.go b/pkg/control/sdl_restSubsDb.go
index e9a7d2f..ac85d98 100644 (file)
--- a/pkg/control/sdl_restSubsDb.go
+++ b/pkg/control/sdl_restSubsDb.go
@@ -30,6 +30,8 @@ import (
 const restSubSdlNs = "submgr_restSubsDb"
 
 type RESTSubscriptionInfo struct {
+       Created          string
+       XAppServiceName  string
        XAppRmrEndPoint  string
        Meid             string
        InstanceIds      []uint32
@@ -46,6 +48,8 @@ func CreateRESTSdl() Sdlnterface {
 func (c *Control) WriteRESTSubscriptionToSdl(restSubId string, restSubs *RESTSubscription) error {
 
        var restSubscriptionInfo RESTSubscriptionInfo
+       restSubscriptionInfo.Created = restSubs.Created
+       restSubscriptionInfo.XAppServiceName = restSubs.xAppServiceName
        restSubscriptionInfo.XAppRmrEndPoint = restSubs.xAppRmrEndPoint
        restSubscriptionInfo.Meid = restSubs.Meid
        restSubscriptionInfo.InstanceIds = restSubs.InstanceIds
@@ -96,7 +100,7 @@ func (c *Control) ReadRESTSubscriptionFromSdl(restSubId string) (*RESTSubscripti
 
                restSubs = c.CreateRESTSubscription(restSubscriptionInfo, &jsonSubscriptionInfo)
 
-               restDuplicateCtrl.SetMd5sumFromLastOkRequest(restSubId, restSubs.lastReqMd5sum)
+               c.restDuplicateCtrl.SetMd5sumFromLastOkRequest(restSubId, restSubs.lastReqMd5sum)
        }
        return restSubs, nil
 }
@@ -104,6 +108,8 @@ func (c *Control) ReadRESTSubscriptionFromSdl(restSubId string) (*RESTSubscripti
 func (c *Control) CreateRESTSubscription(restSubscriptionInfo *RESTSubscriptionInfo, jsonSubscriptionInfo *string) *RESTSubscription {
 
        restSubs := &RESTSubscription{}
+       restSubs.Created = restSubscriptionInfo.Created
+       restSubs.xAppServiceName = restSubscriptionInfo.XAppServiceName
        restSubs.xAppRmrEndPoint = restSubscriptionInfo.XAppRmrEndPoint
        restSubs.Meid = restSubscriptionInfo.Meid
        restSubs.InstanceIds = restSubscriptionInfo.InstanceIds
@@ -176,3 +182,14 @@ func (c *Control) RemoveAllRESTSubscriptionsFromSdl() error {
        }
        return nil
 }
+
+func (c *Control) GetRESTKeyCount() (int, error) {
+
+       // Get all keys
+       keys, err := c.restSubsDb.GetAll(restSubSdlNs)
+       if err != nil {
+               c.UpdateCounter(cSDLReadFailure)
+               return 0, fmt.Errorf("SDL: GetRESTKeyCount(), GetAll(). Error while reading E2 subscriptions  keys from DBAAS %s\n", err.Error())
+       }
+       return len(keys), nil
+}