X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Fregistry.go;h=6abdcdb63afc46b223e5206e371f0e97706e3034;hb=3944a22bb267f649fff113682a6ba4253007392d;hp=5edc3eb7182893bd6d145445db72bf24da8bf17b;hpb=422d018f94aedd9f4c001176b5ff06c786de28eb;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 5edc3eb..6abdcdb 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -24,6 +24,7 @@ import (
 	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"sync"
+	"time"
 )
 
 //-----------------------------------------------------------------------------
@@ -36,7 +37,6 @@ type Registry struct {
 	rtmgrClient *RtmgrClient
 }
 
-// This method should run as a constructor
 func (r *Registry) Initialize() {
 	r.register = make(map[uint16]*Subscription)
 	var i uint16
@@ -45,32 +45,170 @@ func (r *Registry) Initialize() {
 	}
 }
 
-// Reserves and returns the next free sequence number
-func (r *Registry) AssignToSubscription(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
+func (r *Registry) allocateSubs(trans *Transaction, 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 == false {
-			subs := &Subscription{
-				registry: r,
-				Seq:      sequenceNumber,
-				Meid:     trans.Meid,
+		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,
+			Seq:       sequenceNumber,
+			Meid:      trans.Meid,
+			SubReqMsg: subReqMsg,
+			valid:     true,
+		}
+
+		if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
+			r.subIds = append(r.subIds, subs.Seq)
+			return nil, fmt.Errorf("Registry: Endpoint existing already in subscription")
+		}
+
+		return subs, nil
+	}
+	return nil, fmt.Errorf("Registry: Failed to reserve subscription no free ids")
+}
+
+func (r *Registry) findExistingSubs(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) *Subscription {
+	for _, subs := range r.register {
+		if subs.IsSame(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
 			}
-			err := subs.AddEndpoint(trans.GetEndpoint())
-			if err != nil {
-				return nil, err
+			// try to add to endpointlist.
+			if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
+				subs.mutex.Unlock()
+				continue
 			}
-			subs.SubReqMsg = subReqMsg
+			subs.mutex.Unlock()
+
+			//Race collision during parallel incoming and deleted
+			xapp.Logger.Debug("Registry: Identical subs found %s for %s", subs.String(), trans.String())
+			return subs
+		}
+	}
+	return nil
+}
+
+func (r *Registry) AssignToSubscription(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
+	var err error
+	var newAlloc bool
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+
+	subs := r.findExistingSubs(trans, subReqMsg)
+
+	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{CREATE, subs.EpList, subs.Seq}
+		err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+	} else {
+		subRouteAction := SubRouteInfo{UPDATE, subs.EpList, subs.Seq}
+		err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+	}
+	r.mutex.Lock()
+
+	if err != nil {
+		if newAlloc {
+			r.subIds = append(r.subIds, subs.Seq)
+		}
+		return nil, err
+	}
+
+	if newAlloc {
+		r.register[subs.Seq] = subs
+	}
+	xapp.Logger.Debug("Registry: Create %s", subs.String())
+	xapp.Logger.Debug("Registry: substable=%v", r.register)
+	return subs, nil
+}
+
+// TODO: Needs better logic when there is concurrent calls
+func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction, waitRouteClean time.Duration) error {
 
-			r.register[sequenceNumber] = subs
-			xapp.Logger.Debug("Registry: Create %s", subs.String())
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	subs.mutex.Lock()
+	defer subs.mutex.Unlock()
+
+	delStatus := subs.EpList.DelEndpoint(trans.GetEndpoint())
+	epamount := subs.EpList.Size()
+
+	//
+	// If last endpoint remove from register map
+	//
+	if epamount == 0 {
+		if _, ok := r.register[subs.Seq]; ok {
+			xapp.Logger.Debug("Registry: Delete %s", subs.String())
+			delete(r.register, subs.Seq)
 			xapp.Logger.Debug("Registry: substable=%v", r.register)
-			return subs, nil
 		}
 	}
-	return nil, fmt.Errorf("Registry: Failed to reserves subscription")
+	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("Registry: Cleaning %s", subs.String())
+
+	//
+	// Subscription route updates
+	//
+	if delStatus {
+		if epamount == 0 {
+			tmpList := RmrEndpointList{}
+			tmpList.AddEndpoint(trans.GetEndpoint())
+			subRouteAction := SubRouteInfo{DELETE, tmpList, subs.Seq}
+			r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+		} else {
+			subRouteAction := SubRouteInfo{UPDATE, subs.EpList, subs.Seq}
+			r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+		}
+	}
+
+	r.mutex.Lock()
+	//
+	// If last endpoint free seq nro
+	//
+	if epamount == 0 {
+		r.subIds = append(r.subIds, subs.Seq)
+	}
+
+	return nil
 }
 
 func (r *Registry) GetSubscription(sn uint16) *Subscription {
@@ -92,17 +230,3 @@ func (r *Registry) GetSubscriptionFirstMatch(ids []uint16) (*Subscription, error
 	}
 	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
-	}
-	return false
-}