X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=5edc3eb7182893bd6d145445db72bf24da8bf17b;hb=refs%2Fchanges%2F86%2F2286%2F4;hp=1adb4f7253d8dc945ec317f121f843b65256e862;hpb=0d064ecdb5239a875857b5910f7f6e83f827d7a6;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 1adb4f7..5edc3eb 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -20,142 +20,89 @@
 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"
-	"strconv"
 	"sync"
 )
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type Subscription struct {
-	mutex  sync.Mutex
-	Seq    uint16
-	Active bool
-	//
-	Meid        *xapp.RMRMeid
-	RmrEndpoint // xapp endpoint
-	Trans       *Transaction
-}
-
-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
-}
-
-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
-	}
-	return false
-}
-
-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
-}
-
-func (s *Subscription) GetTransaction() *Transaction {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.Trans
-}
-
-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
+	mutex       sync.Mutex
+	register    map[uint16]*Subscription
+	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 {
-	// 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 {
-			r.register[sequenceNumber] = &Subscription{
-				Seq:         sequenceNumber,
-				Active:      false,
-				RmrEndpoint: endPoint,
-				Meid:        meid,
-				Trans:       nil,
+			subs := &Subscription{
+				registry: r,
+				Seq:      sequenceNumber,
+				Meid:     trans.Meid,
+			}
+			err := subs.AddEndpoint(trans.GetEndpoint())
+			if err != nil {
+				return nil, err
 			}
-			return r.register[sequenceNumber]
+			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
+	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
 }
 
-//This function releases the given id as unused in the register
-func (r *Registry) releaseSequenceNumber(sn uint16) bool {
+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
-	} else {
-		return false
 	}
+	return false
 }