RICPLT-2571 Make code change for MEID support

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

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index c349921..1adb4f7 100644 (file)
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -19,58 +19,143 @@
 
 package control
 
-import "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+import (
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+       "strconv"
+       "sync"
+)
 
-type Registry struct {
-       register map[uint16]bool
-       counter  uint16
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type Subscription struct {
+       mutex  sync.Mutex
+       Seq    uint16
+       Active bool
+       //
+       Meid        *xapp.RMRMeid
+       RmrEndpoint // xapp endpoint
+       Trans       *Transaction
 }
 
-// This method should run as a constructor
-func (r *Registry) Initialize(seedsn uint16) {
-       r.register = make(map[uint16]bool)
-       r.counter = seedsn
+func (s *Subscription) String() string {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       return strconv.FormatUint(uint64(s.Seq), 10) + "/" + s.RmrEndpoint.String() + "/" + s.Meid.RanName
 }
 
-// Reserves and returns the next free sequence number
-func (r *Registry) ReserveSequenceNumber() uint16 {
-       if r.IsValidSequenceNumber(r.counter){
+func (s *Subscription) Confirmed() {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       s.Active = true
+}
+
+func (s *Subscription) UnConfirmed() {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       s.Active = false
+}
 
+func (s *Subscription) IsConfirmed() bool {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       return s.Active
+}
+
+func (s *Subscription) SetTransaction(trans *Transaction) bool {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       if s.Trans == nil {
+               s.Trans = trans
+               return true
        }
-       sequenceNumber := r.counter
-       r.register[sequenceNumber] = false
-       r.shift()
-       return sequenceNumber
+       return false
 }
 
-// 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 {
+func (s *Subscription) UnSetTransaction(trans *Transaction) bool {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       if trans == nil || trans == s.Trans {
+               s.Trans = nil
                return true
        }
        return false
 }
 
-// This function sets the give id as confirmed in the register
-func (r *Registry) setSubscriptionToConfirmed(sn uint16) {
-       r.register[sn] = true
+func (s *Subscription) GetTransaction() *Transaction {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       return s.Trans
 }
 
-func (r *Registry) shift() {
-       if r.counter == 65535 {
-               r.counter = 0
-       } else {
-               r.counter++
+func (s *Subscription) SubRouteInfo(act Action) SubRouteInfo {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       return SubRouteInfo{act, s.RmrEndpoint.Addr, s.RmrEndpoint.Port, s.Seq}
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type Registry struct {
+       register map[uint16]*Subscription
+       counter  uint16
+       mutex    sync.Mutex
+}
+
+// This method should run as a constructor
+func (r *Registry) Initialize(seedsn uint16) {
+       r.register = make(map[uint16]*Subscription)
+       r.counter = seedsn
+}
+
+// Reserves and returns the next free sequence number
+func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid) *Subscription {
+       // 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 {
+                       r.register[sequenceNumber] = &Subscription{
+                               Seq:         sequenceNumber,
+                               Active:      false,
+                               RmrEndpoint: endPoint,
+                               Meid:        meid,
+                               Trans:       nil,
+                       }
+                       return r.register[sequenceNumber]
+               }
        }
+       return 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) 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 releases the given id as unused in the register
-//func (r *Registry) releaseSequenceNumber(sn uint16) {
-//     delete(r.register, sn)
-//}
\ No newline at end of file
+func (r *Registry) releaseSequenceNumber(sn uint16) bool {
+       r.mutex.Lock()
+       defer r.mutex.Unlock()
+       if _, ok := r.register[sn]; ok {
+               delete(r.register, sn)
+               return true
+       } else {
+               return false
+       }
+}