RICPLT-3014 Subscription multiple endpoints

[ric-plt/submgr.git] / pkg / control / registry.go

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index a1fe4b8..5edc3eb 100644 (file)
--- 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,73 +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{
-                               registry:    r,
-                               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.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)
+               xapp.Logger.Debug("Registry: substable=%v", r.register)
                return true
        }
        return false