X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=e07116c5c67eda60515a51d592783845abe94515;hb=6d629ad71687993ee08b6193e957439f5c87aa22;hp=396daded93335e834879b7442a2f6a0f0786e5d5;hpb=cc7d9e0cf982acb7448e23e8c8d16b9aaaf133fb;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/registry.go b/pkg/control/registry.go index 396dade..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) } } @@ -61,7 +60,7 @@ func (r *Registry) QueryHandler() (models.SubscriptionList, error) { 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 { subId := r.subIds[0] r.subIds = r.subIds[1:] @@ -70,25 +69,32 @@ func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubs 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.InstanceId = subId + if resetTestFlag == true { + subs.DoNotWaitSubResp = true + } if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false { 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,7 +148,7 @@ 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) @@ -149,13 +156,19 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. } } - 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 } // @@ -197,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 { @@ -205,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 @@ -215,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() @@ -247,7 +267,7 @@ 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(subId)} r.rtmgrClient.SubscriptionRequestDelete(subRouteAction) @@ -264,7 +284,6 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction xapp.Logger.Debug("Registry: substable=%v", r.register) } r.subIds = append(r.subIds, subId) - } else if subs.EpList.Size() > 0 { // // Subscription route updates @@ -272,12 +291,30 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction subRouteAction := SubRouteInfo{subs.EpList, uint16(subId)} r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) } - }() return nil } +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()