X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=5edc3eb7182893bd6d145445db72bf24da8bf17b;hb=422d018f94aedd9f4c001176b5ff06c786de28eb;hp=2c5bd8c7d46e886e7d4b74eea1eae0f99d587ed7;hpb=0388dd945789dae802aaa93c5062e3ae4c45ddf1;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 2c5bd8c..5edc3eb 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -21,6 +21,7 @@ package control
 
 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"
 )
@@ -31,81 +32,76 @@ import (
 type Registry struct {
 	mutex       sync.Mutex
 	register    map[uint16]*Subscription
-	counter     uint16
+	subIds      []uint16
 	rtmgrClient *RtmgrClient
 }
 
 // This method should run as a constructor
-func (r *Registry) Initialize(seedsn uint16) {
+func (r *Registry) Initialize() {
 	r.register = make(map[uint16]*Subscription)
-	r.counter = seedsn
+	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) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid) (*Subscription, error) {
-	// Check is current SequenceNumber valid
-	// Allocate next SequenceNumber value and retry N times
+func (r *Registry) AssignToSubscription(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
-	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 len(r.subIds) > 0 {
+		sequenceNumber := r.subIds[0]
+		r.subIds = r.subIds[1:]
 		if _, ok := r.register[sequenceNumber]; ok == false {
 			subs := &Subscription{
-				Seq:         sequenceNumber,
-				Active:      false,
-				RmrEndpoint: endPoint,
-				Meid:        meid,
-				Trans:       nil,
+				registry: r,
+				Seq:      sequenceNumber,
+				Meid:     trans.Meid,
 			}
-			r.register[sequenceNumber] = subs
-
-			// Update routing
-			r.mutex.Unlock()
-			err := subs.UpdateRoute(CREATE, r.rtmgrClient)
-			r.mutex.Lock()
+			err := subs.AddEndpoint(trans.GetEndpoint())
 			if err != nil {
-				if _, ok := r.register[sequenceNumber]; ok {
-					delete(r.register, 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
 		}
 	}
-	return nil, fmt.Errorf("Registry: Failed to reserves subcription. RmrEndpoint: %s, Meid: %s", endPoint, meid.RanName)
+	return nil, fmt.Errorf("Registry: Failed to reserves subscription")
 }
 
 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 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)
+}
+
 func (r *Registry) DelSubscription(sn uint16) bool {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 	if _, ok := r.register[sn]; ok {
 		subs := r.register[sn]
+		xapp.Logger.Debug("Registry: Delete %s", subs.String())
+		r.subIds = append(r.subIds, 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)
-		}
+		xapp.Logger.Debug("Registry: substable=%v", r.register)
 		return true
 	}
 	return false