X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=9e4eaaa6c2235d2cf507e6f1b0bc4662a66de9ea;hb=795f2c942e017df38ad5cdc3b0ab01c21fd2854a;hp=c9abdb8aa0fd535ce4ae5f25f9efa11fad56936c;hpb=9bcb0a4620d71671f758dce029cb2e3da9ab9dbe;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index c9abdb8..9e4eaaa 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -22,6 +22,7 @@ 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/models"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"sync"
 	"time"
@@ -46,12 +47,25 @@ func (r *Registry) Initialize() {
 	}
 }
 
+func (r *Registry) QueryHandler() (models.SubscriptionList, error) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+
+	resp := models.SubscriptionList{}
+	for _, subs := range r.register {
+		subs.mutex.Lock()
+		resp = append(resp, &models.SubscriptionData{SubscriptionID: int64(subs.ReqId.InstanceId), Meid: subs.Meid.RanName, Endpoint: subs.EpList.StringList()})
+		subs.mutex.Unlock()
+	}
+	return resp, nil
+}
+
 func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
 	if len(r.subIds) > 0 {
-		sequenceNumber := r.subIds[0]
+		subId := r.subIds[0]
 		r.subIds = r.subIds[1:]
-		if _, ok := r.register[sequenceNumber]; ok == true {
-			r.subIds = append(r.subIds, sequenceNumber)
+		if _, ok := r.register[subId]; ok == true {
+			r.subIds = append(r.subIds, subId)
 			return nil, fmt.Errorf("Registry: Failed to reserve subscription exists")
 		}
 		subs := &Subscription{
@@ -61,10 +75,10 @@ func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubs
 			valid:     true,
 		}
 		subs.ReqId.Id = 123
-		subs.ReqId.Seq = sequenceNumber
+		subs.ReqId.InstanceId = subId
 
 		if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
-			r.subIds = append(r.subIds, subs.ReqId.Seq)
+			r.subIds = append(r.subIds, subs.ReqId.InstanceId)
 			return nil, fmt.Errorf("Registry: Endpoint existing already in subscription")
 		}
 
@@ -125,8 +139,10 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.
 	// Find possible existing Policy subscription
 	//
 	if actionType == e2ap.E2AP_ActionTypePolicy {
-		if subs, ok := r.register[subReqMsg.RequestId.Seq]; ok {
+		if subs, ok := r.register[trans.GetSubId()]; ok {
 			xapp.Logger.Debug("CREATE %s. Existing subscription for Policy found", subs.String())
+			// Update message data to subscription
+			subs.SubReqMsg = subReqMsg
 			subs.SetCachedResponse(nil, true)
 			return subs, nil
 		}
@@ -154,23 +170,23 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.
 	// Subscription route updates
 	//
 	if epamount == 1 {
-		subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.Seq)}
+		subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.InstanceId)}
 		err = r.rtmgrClient.SubscriptionRequestCreate(subRouteAction)
 	} else {
-		subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.Seq)}
+		subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.InstanceId)}
 		err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
 	}
 	r.mutex.Lock()
 
 	if err != nil {
 		if newAlloc {
-			r.subIds = append(r.subIds, subs.ReqId.Seq)
+			r.subIds = append(r.subIds, subs.ReqId.InstanceId)
 		}
 		return nil, err
 	}
 
 	if newAlloc {
-		r.register[subs.ReqId.Seq] = subs
+		r.register[subs.ReqId.InstanceId] = subs
 	}
 	xapp.Logger.Debug("CREATE %s", subs.String())
 	xapp.Logger.Debug("Registry: substable=%v", r.register)
@@ -180,6 +196,7 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.
 func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (uint64, error) {
 	var reportFound bool = false
 	var policyFound bool = false
+	var insertFound bool = false
 
 	for _, acts := range subReqMsg.ActionSetups {
 		if acts.ActionType == e2ap.E2AP_ActionTypeReport {
@@ -188,9 +205,12 @@ func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (ui
 		if acts.ActionType == e2ap.E2AP_ActionTypePolicy {
 			policyFound = true
 		}
+		if acts.ActionType == e2ap.E2AP_ActionTypeInsert {
+			insertFound = true
+		}
 	}
-	if reportFound == true && policyFound == true {
-		return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Report and Policy in same RICactions-ToBeSetup-List")
+	if reportFound == true && policyFound == true || reportFound == true && insertFound == true || policyFound == true && insertFound == true {
+		return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Different action types (Report, Policy or Insert) in same RICactions-ToBeSetup-List")
 	}
 	if reportFound == true {
 		return e2ap.E2AP_ActionTypeReport, nil
@@ -198,6 +218,9 @@ func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (ui
 	if policyFound == true {
 		return e2ap.E2AP_ActionTypePolicy, nil
 	}
+	if insertFound == true {
+		return e2ap.E2AP_ActionTypeInsert, nil
+	}
 	return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Invalid action type in RICactions-ToBeSetup-List")
 }
 
@@ -211,70 +234,72 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction
 
 	delStatus := subs.EpList.DelEndpoint(trans.GetEndpoint())
 	epamount := subs.EpList.Size()
-	seqId := subs.ReqId.Seq
+	subId := subs.ReqId.InstanceId
 
 	if delStatus == false {
 		return nil
 	}
 
-	r.mutex.Unlock()
+	go func() {
+		if waitRouteClean > 0 {
+			time.Sleep(waitRouteClean)
+		}
 
-	//
-	// Wait some time before really do route updates
-	//
-	if waitRouteClean > 0 {
-		subs.mutex.Unlock()
-		time.Sleep(waitRouteClean)
 		subs.mutex.Lock()
-	}
+		defer subs.mutex.Unlock()
+		xapp.Logger.Info("CLEAN %s", subs.String())
 
-	xapp.Logger.Info("CLEAN %s", subs.String())
+		if epamount == 0 {
+			//
+			// Subscription route delete
+			//
+			tmpList := xapp.RmrEndpointList{}
+			tmpList.AddEndpoint(trans.GetEndpoint())
+			subRouteAction := SubRouteInfo{tmpList, uint16(subId)}
+			r.rtmgrClient.SubscriptionRequestDelete(subRouteAction)
 
-	//
-	// 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)
-	}
+			//
+			// Subscription release
+			//
+			r.mutex.Lock()
+			defer r.mutex.Unlock()
 
-	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)
+			if _, ok := r.register[subId]; ok {
+				xapp.Logger.Debug("RELEASE %s", subs.String())
+				delete(r.register, subId)
+				xapp.Logger.Debug("Registry: substable=%v", r.register)
+			}
+			r.subIds = append(r.subIds, subId)
+
+		} else if subs.EpList.Size() > 0 {
+			//
+			// Subscription route updates
+			//
+			subRouteAction := SubRouteInfo{subs.EpList, uint16(subId)}
+			r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
 		}
-		r.subIds = append(r.subIds, seqId)
-	}
+
+	}()
 
 	return nil
 }
 
-func (r *Registry) GetSubscription(sn uint32) *Subscription {
+func (r *Registry) GetSubscription(subId uint32) *Subscription {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
-	if _, ok := r.register[sn]; ok {
-		return r.register[sn]
+	if _, ok := r.register[subId]; ok {
+		return r.register[subId]
 	}
 	return nil
 }
 
-func (r *Registry) GetSubscriptionFirstMatch(ids []uint32) (*Subscription, error) {
+func (r *Registry) GetSubscriptionFirstMatch(subIds []uint32) (*Subscription, error) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
-	for _, id := range ids {
-		if _, ok := r.register[id]; ok {
-			return r.register[id], nil
+	for _, subId := range subIds {
+		if _, ok := r.register[subId]; ok {
+			return r.register[subId], nil
 		}
 	}
-	return nil, fmt.Errorf("No valid subscription found with ids %v", ids)
+	return nil, fmt.Errorf("No valid subscription found with subIds %v", subIds)
 }