X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsdl_restSubsDb.go;h=ac85d98ed8f393c17f049413a3fe659ab10e668b;hb=84662c4f3e2273152fc849f74880108b6346bcad;hp=e9a7d2f86e22ffaae304c0fa1b9e27dbb8594b17;hpb=f0bb66c95fa3f03ae956cc719cc776ed2f2f3bd4;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/sdl_restSubsDb.go b/pkg/control/sdl_restSubsDb.go
index e9a7d2f..ac85d98 100644
--- 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
+}