RICPLT-3007 Replace msg Mtype numbers with variables defined in xapp frame

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

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 3d70d63..a1fe4b8 100644 (file)
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -20,31 +20,19 @@
 package control
 
 import (
+       "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "sync"
 )
 
-type Subscription struct {
-       Seq    uint16
-       Active bool
-}
-
-func (s *Subscription) Confirmed() {
-       s.Active = true
-}
-
-func (s *Subscription) UnConfirmed() {
-       s.Active = false
-}
-
-func (s *Subscription) IsConfirmed() bool {
-       return s.Active
-}
-
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 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
@@ -54,7 +42,7 @@ func (r *Registry) Initialize(seedsn uint16) {
 }
 
 // Reserves and returns the next free sequence number
-func (r *Registry) ReserveSubscription() *Subscription {
+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()
@@ -69,14 +57,32 @@ func (r *Registry) ReserveSubscription() *Subscription {
                        r.counter++
                }
                if _, ok := r.register[sequenceNumber]; ok == false {
-                       r.register[sequenceNumber] = &Subscription{sequenceNumber, false}
-                       return r.register[sequenceNumber]
+                       subs := &Subscription{
+                               registry:    r,
+                               Seq:         sequenceNumber,
+                               Active:      false,
+                               RmrEndpoint: *endPoint,
+                               Meid:        meid,
+                               Trans:       nil,
+                       }
+                       r.register[sequenceNumber] = subs
+
+                       // Update routing
+                       r.mutex.Unlock()
+                       err := subs.UpdateRoute(CREATE)
+                       r.mutex.Lock()
+                       if err != nil {
+                               if _, ok := r.register[sequenceNumber]; ok {
+                                       delete(r.register, sequenceNumber)
+                               }
+                               return nil, err
+                       }
+                       return subs, nil
                }
        }
-       return nil
+       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) GetSubscription(sn uint16) *Subscription {
        r.mutex.Lock()
        defer r.mutex.Unlock()
@@ -87,39 +93,12 @@ func (r *Registry) GetSubscription(sn uint16) *Subscription {
        return nil
 }
 
-// This function checks the validity of the given subscription id
-func (r *Registry) IsValidSequenceNumber(sn uint16) bool {
-       r.mutex.Lock()
-       defer r.mutex.Unlock()
-       xapp.Logger.Debug("Registry map: %v", r.register)
-       if _, ok := r.register[sn]; ok {
-               return true
-       }
-       return false
-}
-
-// 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()
-}
-
-//This function sets the given id as unused in the register
-func (r *Registry) setSubscriptionToUnConfirmed(sn uint16) {
-       r.mutex.Lock()
-       defer r.mutex.Unlock()
-       r.register[sn].UnConfirmed()
-}
-
-//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 {
                delete(r.register, sn)
                return true
-       } else {
-               return false
        }
+       return false
 }