X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Fregistry.go;h=e00062b7b4ea9140b7516ee90aa023ce4bc17fda;hb=83ada00338d2c9fa47d48c406b4a46b9d7888aff;hp=1adb4f7253d8dc945ec317f121f843b65256e862;hpb=0d064ecdb5239a875857b5910f7f6e83f827d7a6;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 1adb4f7..e00062b 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -20,142 +20,218 @@
 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"
+	"time"
 )
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-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
+type Registry struct {
+	mutex       sync.Mutex
+	register    map[uint32]*Subscription
+	subIds      []uint32
+	rtmgrClient *RtmgrClient
 }
 
-func (s *Subscription) Confirmed() {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	s.Active = true
+func (r *Registry) Initialize() {
+	r.register = make(map[uint32]*Subscription)
+	var i uint32
+	for i = 0; i < 65535; i++ {
+		r.subIds = append(r.subIds, i+1)
+	}
 }
 
-func (s *Subscription) UnConfirmed() {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	s.Active = false
-}
+func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
+	if len(r.subIds) > 0 {
+		sequenceNumber := r.subIds[0]
+		r.subIds = r.subIds[1:]
+		if _, ok := r.register[sequenceNumber]; ok == true {
+			r.subIds = append(r.subIds, sequenceNumber)
+			return nil, fmt.Errorf("Registry: Failed to reserve subscription exists")
+		}
+		subs := &Subscription{
+			registry:  r,
+			Meid:      trans.Meid,
+			SubReqMsg: subReqMsg,
+			valid:     true,
+		}
+		subs.ReqId.Id = 123
+		subs.ReqId.Seq = sequenceNumber
 
-func (s *Subscription) IsConfirmed() bool {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.Active
-}
+		if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
+			r.subIds = append(r.subIds, subs.ReqId.Seq)
+			return nil, fmt.Errorf("Registry: Endpoint existing already in subscription")
+		}
 
-func (s *Subscription) SetTransaction(trans *Transaction) bool {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	if s.Trans == nil {
-		s.Trans = trans
-		return true
+		return subs, nil
 	}
-	return false
+	return nil, fmt.Errorf("Registry: Failed to reserve subscription no free ids")
 }
 
-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
+func (r *Registry) findExistingSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) *Subscription {
+
+	for _, subs := range r.register {
+		if subs.IsMergeable(trans, subReqMsg) {
+
+			//
+			// check if there has been race conditions
+			//
+			subs.mutex.Lock()
+			//subs has been set to invalid
+			if subs.valid == false {
+				subs.mutex.Unlock()
+				continue
+			}
+			// If size is zero, entry is to be deleted
+			if subs.EpList.Size() == 0 {
+				subs.mutex.Unlock()
+				continue
+			}
+			// try to add to endpointlist.
+			if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
+				subs.mutex.Unlock()
+				continue
+			}
+			subs.mutex.Unlock()
+
+			xapp.Logger.Debug("Registry: Mergeable subs found %s for %s", subs.String(), trans.String())
+			return subs
+		}
 	}
-	return false
+	return nil
 }
 
-func (s *Subscription) GetTransaction() *Transaction {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.Trans
-}
+func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
+	var err error
+	var newAlloc bool
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 
-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}
-}
+	subs := r.findExistingSubs(trans, subReqMsg)
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type Registry struct {
-	register map[uint16]*Subscription
-	counter  uint16
-	mutex    sync.Mutex
-}
+	if subs == nil {
+		subs, err = r.allocateSubs(trans, subReqMsg)
+		if err != nil {
+			return nil, err
+		}
+		newAlloc = true
+	}
+
+	//
+	// Add to subscription
+	//
+	subs.mutex.Lock()
+	defer subs.mutex.Unlock()
+
+	epamount := subs.EpList.Size()
+
+	r.mutex.Unlock()
+	//
+	// Subscription route updates
+	//
+	if epamount == 1 {
+		subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.Seq)}
+		err = r.rtmgrClient.SubscriptionRequestCreate(subRouteAction)
+	} else {
+		subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.Seq)}
+		err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+	}
+	r.mutex.Lock()
 
-// This method should run as a constructor
-func (r *Registry) Initialize(seedsn uint16) {
-	r.register = make(map[uint16]*Subscription)
-	r.counter = seedsn
+	if err != nil {
+		if newAlloc {
+			r.subIds = append(r.subIds, subs.ReqId.Seq)
+		}
+		return nil, err
+	}
+
+	if newAlloc {
+		r.register[subs.ReqId.Seq] = subs
+	}
+	xapp.Logger.Debug("CREATE %s", subs.String())
+	xapp.Logger.Debug("Registry: substable=%v", r.register)
+	return subs, nil
 }
 
-// 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
+// TODO: Works with concurrent calls, but check if can be improved
+func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *TransactionXapp, waitRouteClean time.Duration) 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 _, ok := r.register[sequenceNumber]; ok == false {
-			r.register[sequenceNumber] = &Subscription{
-				Seq:         sequenceNumber,
-				Active:      false,
-				RmrEndpoint: endPoint,
-				Meid:        meid,
-				Trans:       nil,
-			}
-			return r.register[sequenceNumber]
+	subs.mutex.Lock()
+	defer subs.mutex.Unlock()
+
+	delStatus := subs.EpList.DelEndpoint(trans.GetEndpoint())
+	epamount := subs.EpList.Size()
+	seqId := subs.ReqId.Seq
+
+	if delStatus == false {
+		return nil
+	}
+
+	r.mutex.Unlock()
+
+	//
+	// Wait some time before really do route updates
+	//
+	if waitRouteClean > 0 {
+		subs.mutex.Unlock()
+		time.Sleep(waitRouteClean)
+		subs.mutex.Lock()
+	}
+
+	xapp.Logger.Info("CLEAN %s", subs.String())
+
+	//
+	// Subscription route updates
+	//
+	if epamount == 0 {
+		tmpList := RmrEndpointList{}
+		tmpList.AddEndpoint(trans.GetEndpoint())
+		subRouteAction := SubRouteInfo{tmpList, uint16(seqId)}
+		r.rtmgrClient.SubscriptionRequestDelete(subRouteAction)
+	} else if subs.EpList.Size() > 0 {
+		subRouteAction := SubRouteInfo{subs.EpList, uint16(seqId)}
+		r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+	}
+
+	r.mutex.Lock()
+	//
+	// If last endpoint, release and free seqid
+	//
+	if epamount == 0 {
+		if _, ok := r.register[seqId]; ok {
+			xapp.Logger.Debug("RELEASE %s", subs.String())
+			delete(r.register, seqId)
+			xapp.Logger.Debug("Registry: substable=%v", r.register)
 		}
+		r.subIds = append(r.subIds, seqId)
 	}
+
 	return nil
 }
 
-func (r *Registry) GetSubscription(sn uint16) *Subscription {
+func (r *Registry) GetSubscription(sn uint32) *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 []uint32) (*Subscription, error) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
-	if _, ok := r.register[sn]; ok {
-		delete(r.register, sn)
-		return true
-	} else {
-		return false
+	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)
 }