X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=2750b78e28d45424d6dca1acd28b443c6bd847e0;hb=af91f971681842c22dc0fad165c0cbf7ebaa0e4d;hp=6717612f3b5561de2d52adea348026f0f7d17be0;hpb=1455c85dea3fba44cdcba8a92864be730691a6ec;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 6717612..2750b78 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -19,61 +19,169 @@
 
 package control
 
-import "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+import (
+	"fmt"
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"sync"
+	"time"
+)
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 type Registry struct {
-	register map[uint16]bool
-	counter  uint16
+	mutex       sync.Mutex
+	register    map[uint16]*Subscription
+	subIds      []uint16
+	rtmgrClient *RtmgrClient
 }
 
-// This method should run as a constructor
-func (r *Registry) Initialize(seedsn uint16) {
-	r.register = make(map[uint16]bool)
-	r.counter = seedsn
+func (r *Registry) Initialize() {
+	r.register = make(map[uint16]*Subscription)
+	var i uint16
+	for i = 0; i < 65535; i++ {
+		r.subIds = append(r.subIds, i+1)
+	}
 }
 
-// Reserves and returns the next free sequence number
-func (r *Registry) ReserveSequenceNumber() uint16 {
-	if r.IsValidSequenceNumber(r.counter) {	}
-	sequenceNumber := r.counter
-	r.register[sequenceNumber] = false
-	r.shift()
-	return sequenceNumber
-}
+func (r *Registry) AssignToSubscription(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 
-// This function checks the validity of the given subscription id
-func (r *Registry) IsValidSequenceNumber(sn uint16) bool {
-	xapp.Logger.Debug("Registry map: %v", r.register)
-	if _, ok := r.register[sn]; ok {
-		return true
+	var sequenceNumber uint16
+
+	//
+	// Allocate subscription
+	//
+	if len(r.subIds) > 0 {
+		sequenceNumber = r.subIds[0]
+		r.subIds = r.subIds[1:]
+		if _, ok := r.register[sequenceNumber]; ok == true {
+			r.subIds = append(r.subIds, sequenceNumber)
+			return nil, fmt.Errorf("Registry: Failed to reserves subscription")
+		}
+	} else {
+		return nil, fmt.Errorf("Registry: Failed to reserves subscription no free ids")
+	}
+	subs := &Subscription{
+		registry: r,
+		Seq:      sequenceNumber,
+		Meid:     trans.Meid,
 	}
-	return false
-}
 
-// This function sets the give id as confirmed in the register
-func (r *Registry) setSubscriptionToConfirmed(sn uint16) {
-	r.register[sn] = true
-}
+	//
+	// Add to subscription
+	//
+	subs.mutex.Lock()
+	defer subs.mutex.Unlock()
 
-func (r *Registry) shift() {
-	if r.counter == 65535 {
-		r.counter = 0
+	if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
+		r.subIds = append(r.subIds, sequenceNumber)
+		return nil, fmt.Errorf("Registry: Endpoint existing already in subscription")
+	}
+	epamount := subs.EpList.Size()
+
+	r.mutex.Unlock()
+	//
+	// Subscription route updates
+	//
+	var err error
+	if epamount == 1 {
+		subRouteAction := SubRouteInfo{CREATE, subs.EpList, subs.Seq}
+		err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
 	} else {
-		r.counter++
+		subRouteAction := SubRouteInfo{UPDATE, subs.EpList, subs.Seq}
+		err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+	}
+	r.mutex.Lock()
+
+	if err != nil {
+		r.subIds = append(r.subIds, sequenceNumber)
+		return nil, err
 	}
+	subs.SubReqMsg = subReqMsg
+
+	r.register[sequenceNumber] = subs
+	xapp.Logger.Debug("Registry: Create %s", subs.String())
+	xapp.Logger.Debug("Registry: substable=%v", r.register)
+	return subs, nil
 }
 
-//This function sets the given id as unused in the register
-func (r *Registry) deleteSubscription(sn uint16) {
-	r.register[sn] = false
+func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction, waitRouteClean time.Duration) error {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	subs.mutex.Lock()
+	defer subs.mutex.Unlock()
+
+	delStatus := subs.EpList.DelEndpoint(trans.GetEndpoint())
+	epamount := subs.EpList.Size()
+
+	//
+	// If last endpoint remove from register map
+	//
+	if epamount == 0 {
+		if _, ok := r.register[subs.Seq]; ok {
+			xapp.Logger.Debug("Registry: Delete %s", subs.String())
+			delete(r.register, subs.Seq)
+			xapp.Logger.Debug("Registry: substable=%v", r.register)
+		}
+	}
+	r.mutex.Unlock()
+
+	//
+	// Wait some time before really do route updates
+	//
+	if waitRouteClean > 0 {
+		subs.mutex.Unlock()
+		time.Sleep(waitRouteClean)
+		subs.mutex.Lock()
+	}
+
+	xapp.Logger.Info("Registry: Cleaning %s", subs.String())
+
+	//
+	// Subscription route updates
+	//
+	if delStatus {
+		if epamount == 0 {
+			tmpList := RmrEndpointList{}
+			tmpList.AddEndpoint(trans.GetEndpoint())
+			subRouteAction := SubRouteInfo{DELETE, tmpList, subs.Seq}
+			r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+		} else {
+			subRouteAction := SubRouteInfo{UPDATE, subs.EpList, subs.Seq}
+			r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+		}
+	}
+
+	r.mutex.Lock()
+	//
+	// If last endpoint free seq nro
+	//
+	if epamount == 0 {
+		r.subIds = append(r.subIds, subs.Seq)
+	}
+
+	return nil
 }
 
-//This function releases the given id as unused in the register
-func (r *Registry) releaseSequenceNumber(sn uint16) bool {
-	if r.register[sn] {
-		return false
-	} else {
-		delete(r.register, sn)
-		return true
+func (r *Registry) GetSubscription(sn uint16) *Subscription {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	if _, ok := r.register[sn]; ok {
+		return r.register[sn]
+	}
+	return nil
+}
+
+func (r *Registry) GetSubscriptionFirstMatch(ids []uint16) (*Subscription, error) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	for _, id := range ids {
+		if _, ok := r.register[id]; ok {
+			return r.register[id], nil
+		}
 	}
+	return nil, fmt.Errorf("No valid subscription found with ids %v", ids)
 }