RICPLT-2981 SubFail go asn into use

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

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 6717612..0970a3a 100644 (file)
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -19,61 +19,94 @@
 
 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/xapp-frame/pkg/xapp"
+       "sync"
+)
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 type Registry struct {
-       register map[uint16]bool
-       counter  uint16
+       mutex       sync.Mutex
+       register    map[uint16]*Subscription
+       counter     uint16
+       rtmgrClient *RtmgrClient
 }
 
 // This method should run as a constructor
 func (r *Registry) Initialize(seedsn uint16) {
-       r.register = make(map[uint16]bool)
+       r.register = make(map[uint16]*Subscription)
        r.counter = seedsn
 }
 
 // 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) 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()
+       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
 
-// 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
+                       // 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 false
-}
-
-// This function sets the give id as confirmed in the register
-func (r *Registry) setSubscriptionToConfirmed(sn uint16) {
-       r.register[sn] = true
+       return nil, fmt.Errorf("Registry: Failed to reserves subcription. RmrEndpoint: %s, Meid: %s", endPoint, meid.RanName)
 }
 
-func (r *Registry) shift() {
-       if r.counter == 65535 {
-               r.counter = 0
-       } else {
-               r.counter++
+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
 }
 
-//This function sets the given id as unused in the register
-func (r *Registry) deleteSubscription(sn uint16) {
-       r.register[sn] = false
-}
-
-//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 {
+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
        }
+       return false
 }