X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=e07116c5c67eda60515a51d592783845abe94515;hb=6d629ad71687993ee08b6193e957439f5c87aa22;hp=25709605a29c1a56c8d5d333abc19af599eba112;hpb=b31b13f2e2603404d57c2f81260a6e2727aaeb97;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/registry.go b/pkg/control/registry.go index 2570960..e07116c 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -22,7 +22,6 @@ package control import ( "fmt" "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" - "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/xapptweaks" "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" @@ -43,8 +42,8 @@ type Registry struct { 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) + for i = 1; i < 65535; i++ { + r.subIds = append(r.subIds, i) } } @@ -55,40 +54,47 @@ 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 } -func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) { +func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool) (*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{ - registry: r, - Meid: trans.Meid, - SubReqMsg: subReqMsg, - valid: true, + registry: r, + Meid: trans.Meid, + SubReqMsg: subReqMsg, + valid: true, + RetryFromXapp: false, + SubRespRcvd: false, + DeleteFromDb: false, + NoRespToXapp: false, + DoNotWaitSubResp: false, } subs.ReqId.Id = 123 - subs.ReqId.Seq = sequenceNumber + subs.ReqId.InstanceId = subId + if resetTestFlag == true { + subs.DoNotWaitSubResp = true + } 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") } - return subs, nil } 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) { @@ -107,21 +113,22 @@ 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) { +func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool) (*Subscription, error) { var err error var newAlloc bool r.mutex.Lock() @@ -141,19 +148,27 @@ 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) + subs, err = r.allocateSubs(trans, subReqMsg, resetTestFlag) 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. + subs.RetryFromXapp = true + xapp.Logger.Debug("CREATE: subscription already exists. %s", subs.String()) + //xapp.Logger.Debug("Registry: substable=%v", r.register) + return subs, nil } // @@ -169,23 +184,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) @@ -195,6 +210,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 { @@ -203,9 +219,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 @@ -213,11 +232,14 @@ 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") } // TODO: Works with concurrent calls, but check if can be improved -func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *TransactionXapp, waitRouteClean time.Duration) error { +func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *TransactionXapp, waitRouteClean time.Duration, c *Control) error { r.mutex.Lock() defer r.mutex.Unlock() @@ -226,7 +248,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 @@ -245,9 +267,9 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction // // Subscription route delete // - tmpList := xapptweaks.RmrEndpointList{} + tmpList := xapp.RmrEndpointList{} tmpList.AddEndpoint(trans.GetEndpoint()) - subRouteAction := SubRouteInfo{tmpList, uint16(seqId)} + subRouteAction := SubRouteInfo{tmpList, uint16(subId)} r.rtmgrClient.SubscriptionRequestDelete(subRouteAction) // @@ -256,42 +278,59 @@ 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) } - }() return nil } -func (r *Registry) GetSubscription(sn uint32) *Subscription { +func (r *Registry) UpdateSubscriptionToDb(subs *Subscription, c *Control) { + r.mutex.Lock() + defer r.mutex.Unlock() + subs.mutex.Lock() + defer subs.mutex.Unlock() + + epamount := subs.EpList.Size() + if epamount == 0 { + if _, ok := r.register[subs.ReqId.InstanceId]; ok { + // Not merged subscription is being deleted + c.RemoveSubscriptionFromDb(subs) + + } + } else if subs.EpList.Size() > 0 { + // Endpoint of merged subscription is being deleted + c.WriteSubscriptionToDb(subs) + } +} + +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) }