X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=7ad54c16143572149e6ada308e7abf2a208fc962;hb=57140bc49a267690153d88cbffc8bf5122697b5d;hp=b816b61c5d66e2e4632afe8464a33762f6df9128;hpb=c9eb08a02821033f198fcde1ea60279b19c5c617;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index b816b61..7ad54c1 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -54,7 +54,7 @@ func (r *Registry) QueryHandler() (models.SubscriptionList, error) {
 	resp := models.SubscriptionList{}
 	for _, subs := range r.register {
 		subs.mutex.Lock()
-		resp = append(resp, &models.SubscriptionData{SubscriptionID: int64(subs.ReqId.Seq), Meid: subs.Meid.RanName, Endpoint: subs.EpList.StringList()})
+		resp = append(resp, &models.SubscriptionData{SubscriptionID: int64(subs.ReqId.InstanceId), Meid: subs.Meid.RanName, Endpoint: subs.EpList.StringList()})
 		subs.mutex.Unlock()
 	}
 	return resp, nil
@@ -62,10 +62,10 @@ func (r *Registry) QueryHandler() (models.SubscriptionList, error) {
 
 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{
@@ -75,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")
 		}
 
@@ -87,7 +87,7 @@ func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubs
 	return nil, fmt.Errorf("Registry: Failed to reserve subscription no free ids")
 }
 
-func (r *Registry) findExistingSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) *Subscription {
+func (r *Registry) findExistingSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, bool) {
 
 	for _, subs := range r.register {
 		if subs.IsMergeable(trans, subReqMsg) {
@@ -106,18 +106,19 @@ func (r *Registry) findExistingSubs(trans *TransactionXapp, subReqMsg *e2ap.E2AP
 				subs.mutex.Unlock()
 				continue
 			}
-			// try to add to endpointlist.
+			// Try to add to endpointlist. Adding fails if endpoint is already in the list
 			if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
 				subs.mutex.Unlock()
-				continue
+				xapp.Logger.Debug("Registry: Subs with requesting endpoint found. %s for %s", subs.String(), trans.String())
+				return subs, true
 			}
 			subs.mutex.Unlock()
 
-			xapp.Logger.Debug("Registry: Mergeable subs found %s for %s", subs.String(), trans.String())
-			return subs
+			xapp.Logger.Debug("Registry: Mergeable subs found. %s for %s", subs.String(), trans.String())
+			return subs, false
 		}
 	}
-	return nil
+	return nil, false
 }
 
 func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) {
@@ -140,19 +141,26 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.
 	//
 	if actionType == e2ap.E2AP_ActionTypePolicy {
 		if subs, ok := r.register[trans.GetSubId()]; ok {
-			xapp.Logger.Debug("CREATE %s. Existing subscription for Policy found", subs.String())
+			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
 		}
 	}
 
-	subs := r.findExistingSubs(trans, subReqMsg)
+	subs, endPointFound := r.findExistingSubs(trans, subReqMsg)
 	if subs == nil {
 		subs, err = r.allocateSubs(trans, subReqMsg)
 		if err != nil {
 			return nil, err
 		}
 		newAlloc = true
+	} else if endPointFound == true {
+		// Requesting endpoint is already present in existing subscription. This can happen if xApp is restarted.
+		xapp.Logger.Debug("CREATE: subscription already exists. %s", subs.String())
+		xapp.Logger.Debug("Registry: substable=%v", r.register)
+		return subs, nil
 	}
 
 	//
@@ -168,23 +176,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)
@@ -194,6 +202,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 {
@@ -202,9 +211,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
@@ -212,6 +224,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")
 }
 
@@ -225,7 +240,7 @@ 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
@@ -244,9 +259,9 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction
 			//
 			// Subscription route delete
 			//
-			tmpList := RmrEndpointList{}
+			tmpList := xapp.RmrEndpointList{}
 			tmpList.AddEndpoint(trans.GetEndpoint())
-			subRouteAction := SubRouteInfo{tmpList, uint16(seqId)}
+			subRouteAction := SubRouteInfo{tmpList, uint16(subId)}
 			r.rtmgrClient.SubscriptionRequestDelete(subRouteAction)
 
 			//
@@ -255,18 +270,18 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction
 			r.mutex.Lock()
 			defer r.mutex.Unlock()
 
-			if _, ok := r.register[seqId]; ok {
+			if _, ok := r.register[subId]; ok {
 				xapp.Logger.Debug("RELEASE %s", subs.String())
-				delete(r.register, seqId)
+				delete(r.register, subId)
 				xapp.Logger.Debug("Registry: substable=%v", r.register)
 			}
-			r.subIds = append(r.subIds, seqId)
+			r.subIds = append(r.subIds, subId)
 
 		} else if subs.EpList.Size() > 0 {
 			//
 			// Subscription route updates
 			//
-			subRouteAction := SubRouteInfo{subs.EpList, uint16(seqId)}
+			subRouteAction := SubRouteInfo{subs.EpList, uint16(subId)}
 			r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
 		}
 
@@ -275,22 +290,22 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction
 	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)
 }