X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=2c5bd8c7d46e886e7d4b74eea1eae0f99d587ed7;hb=a189c866d786c2dbde19d34d9dd2404e17b3e407;hp=3ac15f1b1278f6452dd88c2c687202d1361eb89d;hpb=bf2f4122f6bf89fc572f6c4cad5f0c4108a996e0;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 3ac15f1..2c5bd8c 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -20,19 +20,19 @@
 package control
 
 import (
+	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"sync"
 )
 
-type Subscription struct {
-	Seq       uint16
-	Confirmed bool
-}
-
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 type Registry struct {
-	register map[uint16]*Subscription
-	counter  uint16
-	mutex    sync.Mutex
+	mutex       sync.Mutex
+	register    map[uint16]*Subscription
+	counter     uint16
+	rtmgrClient *RtmgrClient
 }
 
 // This method should run as a constructor
@@ -42,59 +42,71 @@ func (r *Registry) Initialize(seedsn uint16) {
 }
 
 // Reserves and returns the next free sequence number
-func (r *Registry) ReserveSequenceNumber() (uint16, bool) {
+func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid) (*Subscription, error) {
 	// Check is current SequenceNumber valid
+	// Allocate next SequenceNumber value and retry N times
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
-	sequenceNumber := r.counter
-	if _, ok := r.register[sequenceNumber]; ok {
-		xapp.Logger.Error("Invalid SeqenceNumber sequenceNumber: %v", sequenceNumber)
-		return sequenceNumber, false
-	}
-	r.register[sequenceNumber] = &Subscription{sequenceNumber, false}
+	var subs *Subscription = nil
+	var retrytimes uint16 = 1000
+	for ; subs == nil && retrytimes > 0; retrytimes-- {
+		sequenceNumber := r.counter
+		if r.counter == 65535 {
+			r.counter = 0
+		} else {
+			r.counter++
+		}
+		if _, ok := r.register[sequenceNumber]; ok == false {
+			subs := &Subscription{
+				Seq:         sequenceNumber,
+				Active:      false,
+				RmrEndpoint: endPoint,
+				Meid:        meid,
+				Trans:       nil,
+			}
+			r.register[sequenceNumber] = subs
 
-	// Allocate next SequenceNumber value
-	if r.counter == 65535 {
-		r.counter = 0
-	} else {
-		r.counter++
+			// Update routing
+			r.mutex.Unlock()
+			err := subs.UpdateRoute(CREATE, r.rtmgrClient)
+			r.mutex.Lock()
+			if err != nil {
+				if _, ok := r.register[sequenceNumber]; ok {
+					delete(r.register, sequenceNumber)
+				}
+				return nil, err
+			}
+			return subs, nil
+		}
 	}
-	return sequenceNumber, true
+	return nil, fmt.Errorf("Registry: Failed to reserves subcription. RmrEndpoint: %s, Meid: %s", endPoint, meid.RanName)
 }
 
-// This function checks the validity of the given subscription id
-func (r *Registry) IsValidSequenceNumber(sn uint16) bool {
+func (r *Registry) GetSubscription(sn uint16) *Subscription {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 	xapp.Logger.Debug("Registry map: %v", r.register)
 	if _, ok := r.register[sn]; ok {
-		return true
+		return r.register[sn]
 	}
-	return false
+	return nil
 }
 
-// This function sets the give id as confirmed in the register
-func (r *Registry) setSubscriptionToConfirmed(sn uint16) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-	r.register[sn].Confirmed = true
-}
-
-//This function sets the given id as unused in the register
-func (r *Registry) deleteSubscription(sn uint16) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-	r.register[sn].Confirmed = false
-}
-
-//This function releases the given id as unused in the register
-func (r *Registry) releaseSequenceNumber(sn uint16) bool {
+func (r *Registry) DelSubscription(sn uint16) bool {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 	if _, ok := r.register[sn]; ok {
+		subs := r.register[sn]
 		delete(r.register, sn)
+
+		// Update routing
+		r.mutex.Unlock()
+		err := subs.UpdateRoute(DELETE, r.rtmgrClient)
+		r.mutex.Lock()
+		if err != nil {
+			xapp.Logger.Error("Registry: Failed to del route. SubId: %d, RmrEndpoint: %s", subs.Seq, subs.RmrEndpoint)
+		}
 		return true
-	} else {
-		return false
 	}
+	return false
 }