X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=d7f801102036a1a79d9d3c19f09c9ce6c05023fc;hb=afbf95f5756a7b781859beb1e68b41f7319ed208;hp=1c6ab3d745d35e73a4c6885c1b7afdcb3f7c9d18;hpb=1c72bbc4fc5a8ad674dff70abd4713f369ecb43b;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 1c6ab3d..d7f8011 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -21,32 +21,93 @@ package control
 
 import (
 	"fmt"
+	"sync"
+	"time"
+
 	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"sync"
-	"time"
 )
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
 
+type RESTSubscription struct {
+	xAppRmrEndPoint  string
+	Meid             string
+	InstanceIds      []uint32
+	SubReqOngoing    bool
+	SubDelReqOngoing bool
+}
+
+func (r *RESTSubscription) AddInstanceId(instanceId uint32) {
+	r.InstanceIds = append(r.InstanceIds, instanceId)
+}
+
+func (r *RESTSubscription) SetProcessed() {
+	r.SubReqOngoing = false
+}
+
+func (r *RESTSubscription) DeleteInstanceId(instanceId uint32) {
+	r.InstanceIds = r.InstanceIds[1:]
+}
+
 type Registry struct {
-	mutex       sync.Mutex
-	register    map[uint32]*Subscription
-	subIds      []uint32
-	rtmgrClient *RtmgrClient
+	mutex             sync.Mutex
+	register          map[uint32]*Subscription
+	subIds            []uint32
+	rtmgrClient       *RtmgrClient
+	restSubscriptions map[string]*RESTSubscription
 }
 
 func (r *Registry) Initialize() {
 	r.register = make(map[uint32]*Subscription)
+	r.restSubscriptions = make(map[string]*RESTSubscription)
+
 	var i uint32
 	for i = 1; i < 65535; i++ {
 		r.subIds = append(r.subIds, i)
 	}
 }
 
+func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *string, maid *string) (*RESTSubscription, error) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	newRestSubscription := RESTSubscription{}
+	newRestSubscription.xAppRmrEndPoint = *xAppRmrEndPoint
+	newRestSubscription.Meid = *maid
+	newRestSubscription.SubReqOngoing = true
+	newRestSubscription.SubDelReqOngoing = false
+	r.restSubscriptions[*restSubId] = &newRestSubscription
+	xapp.Logger.Info("Registry: Created REST subscription successfully. restSubId=%v, subscriptionCount=%v, e2apCubscriptionCount=%v", *restSubId, len(r.restSubscriptions), len(r.register))
+	return &newRestSubscription, nil
+}
+
+func (r *Registry) DeleteRESTSubscription(restSubId *string) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	delete(r.restSubscriptions, *restSubId)
+	xapp.Logger.Info("Registry: Deleted REST subscription successfully. restSubId=%v, subscriptionCount=%v", *restSubId, len(r.restSubscriptions))
+}
+
+func (r *Registry) GetRESTSubscription(restSubId string) (*RESTSubscription, error) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	if restSubscription, ok := r.restSubscriptions[restSubId]; ok {
+		// Subscription deletion is not allowed if prosessing subscription request in not ready
+		if restSubscription.SubDelReqOngoing == false && restSubscription.SubReqOngoing == false {
+			restSubscription.SubDelReqOngoing = true
+			r.restSubscriptions[restSubId] = restSubscription
+			return restSubscription, nil
+		} else {
+			return restSubscription, fmt.Errorf("Registry: REST delete request is still ongoing for the endpoint=%v, restSubId=%v, SubDelReqOngoing=%v, SubReqOngoing=%v", restSubscription, restSubId, restSubscription.SubDelReqOngoing, restSubscription.SubReqOngoing)
+		}
+		return restSubscription, nil
+	}
+	return nil, fmt.Errorf("Registry: No valid subscription found with restSubId=%v", restSubId)
+}
+
 func (r *Registry) QueryHandler() (models.SubscriptionList, error) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()