X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=07affbd491ad8bc9ef456649cb5fedbfa2d68b7b;hb=3d80b72cb374aec809740f3bec895d4b37a4fc2f;hp=671cf5197a832d6cebfd7475a6ef8bec6d8c9912;hpb=268d715e3bceab8f7955d89945141efdb2c3b368;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/registry.go b/pkg/control/registry.go index 671cf51..07affbd 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -20,7 +20,9 @@ package control import ( + "encoding/json" "fmt" + "strings" "sync" "time" @@ -40,13 +42,29 @@ type RESTSubscription struct { xAppIdToE2Id map[int64]int64 SubReqOngoing bool SubDelReqOngoing bool - Md5sum string + lastReqMd5sum string } func (r *RESTSubscription) AddE2InstanceId(instanceId uint32) { + + for _, v := range r.InstanceIds { + if v == instanceId { + return + } + + } + r.InstanceIds = append(r.InstanceIds, instanceId) } +func (r *RESTSubscription) AddMd5Sum(md5sum string) { + if md5sum != "" { + r.lastReqMd5sum = md5sum + } else { + xapp.Logger.Error("EMPTY md5sum attempted to be add to subscrition") + } +} + func (r *RESTSubscription) DeleteE2InstanceId(instanceId uint32) { r.InstanceIds = r.InstanceIds[1:] } @@ -63,9 +81,11 @@ func (r *RESTSubscription) DeleteXappIdToE2Id(xAppEventInstanceID int64) { delete(r.xAppIdToE2Id, xAppEventInstanceID) } -func (r *RESTSubscription) SetProcessed() { +func (r *RESTSubscription) SetProcessed(err error) { r.SubReqOngoing = false - r.Md5sum = "" + if err != nil { + r.lastReqMd5sum = "" + } } type Registry struct { @@ -86,7 +106,17 @@ func (r *Registry) Initialize() { } } -func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *string, maid *string) (*RESTSubscription, error) { +func (r *Registry) GetAllRestSubscriptions() []byte { + r.mutex.Lock() + defer r.mutex.Unlock() + restSubscriptionsJson, err := json.Marshal(r.restSubscriptions) + if err != nil { + xapp.Logger.Error("GetAllRestSubscriptions(): %v", err) + } + return restSubscriptionsJson +} + +func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *string, maid *string) *RESTSubscription { r.mutex.Lock() defer r.mutex.Unlock() newRestSubscription := RESTSubscription{} @@ -96,15 +126,15 @@ func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *st newRestSubscription.SubDelReqOngoing = false r.restSubscriptions[*restSubId] = &newRestSubscription newRestSubscription.xAppIdToE2Id = make(map[int64]int64) - xapp.Logger.Info("Registry: Created REST subscription successfully. restSubId=%v, subscriptionCount=%v, e2apSubscriptionCount=%v", *restSubId, len(r.restSubscriptions), len(r.register)) - return &newRestSubscription, nil + xapp.Logger.Debug("Registry: Created REST subscription successfully. restSubId=%v, subscriptionCount=%v, e2apSubscriptionCount=%v", *restSubId, len(r.restSubscriptions), len(r.register)) + return &newRestSubscription } func (r *Registry) DeleteRESTSubscription(restSubId *string) { r.mutex.Lock() defer r.mutex.Unlock() delete(r.restSubscriptions, *restSubId) - xapp.Logger.Info("Registry: Deleted REST subscription successfully. restSubId=%v, subscriptionCount=%v", *restSubId, len(r.restSubscriptions)) + xapp.Logger.Debug("Registry: Deleted REST subscription successfully. restSubId=%v, subscriptionCount=%v", *restSubId, len(r.restSubscriptions)) } func (r *Registry) GetRESTSubscription(restSubId string, IsDelReqOngoing bool) (*RESTSubscription, error) { @@ -121,7 +151,6 @@ func (r *Registry) GetRESTSubscription(restSubId string, IsDelReqOngoing bool) ( } else { return restSubscription, fmt.Errorf("Registry: REST request is still ongoing for the endpoint=%v, restSubId=%v, SubDelReqOngoing=%v, SubReqOngoing=%v", restSubscription, restSubId, restSubscription.SubDelReqOngoing, restSubscription.SubReqOngoing) } - return restSubscription, nil } return nil, fmt.Errorf("Registry: No valid subscription found with restSubId=%v", restSubId) } @@ -139,7 +168,7 @@ func (r *Registry) QueryHandler() (models.SubscriptionList, error) { return resp, nil } -func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool) (*Subscription, error) { +func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool, rmrRoutecreated bool) (*Subscription, error) { if len(r.subIds) > 0 { subId := r.subIds[0] r.subIds = r.subIds[1:] @@ -150,8 +179,12 @@ func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubs subs := &Subscription{ registry: r, Meid: trans.Meid, + RMRRouteCreated: rmrRoutecreated, SubReqMsg: subReqMsg, + OngoingReqCount: 0, + OngoingDelCount: 0, valid: true, + PolicyUpdate: false, RetryFromXapp: false, SubRespRcvd: false, DeleteFromDb: false, @@ -160,9 +193,7 @@ func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubs } subs.ReqId.Id = subReqMsg.RequestId.Id subs.ReqId.InstanceId = subId - if resetTestFlag == true { - subs.DoNotWaitSubResp = true - } + r.SetResetTestFlag(resetTestFlag, subs) if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false { r.subIds = append(r.subIds, subs.ReqId.InstanceId) @@ -207,9 +238,10 @@ func (r *Registry) findExistingSubs(trans *TransactionXapp, subReqMsg *e2ap.E2AP return nil, false } -func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool, c *Control) (*Subscription, error) { +func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool, c *Control, createRMRRoute bool) (*Subscription, ErrorInfo, error) { var err error var newAlloc bool + errorInfo := ErrorInfo{} r.mutex.Lock() defer r.mutex.Unlock() @@ -218,9 +250,9 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. // actionType, err := r.CheckActionTypes(subReqMsg) if err != nil { - xapp.Logger.Info("CREATE %s", err) + xapp.Logger.Debug("CREATE %s", err) err = fmt.Errorf("E2 content validation failed") - return nil, err + return nil, errorInfo, err } // @@ -231,17 +263,19 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. xapp.Logger.Debug("CREATE %s. Existing subscription for Policy found.", subs.String()) // Update message data to subscription subs.SubReqMsg = subReqMsg + subs.PolicyUpdate = true subs.SetCachedResponse(nil, true) - return subs, nil + r.SetResetTestFlag(resetTestFlag, subs) + return subs, errorInfo, nil } } subs, endPointFound := r.findExistingSubs(trans, subReqMsg) if subs == nil { - if subs, err = r.allocateSubs(trans, subReqMsg, resetTestFlag); err != nil { + if subs, err = r.allocateSubs(trans, subReqMsg, resetTestFlag, createRMRRoute); err != nil { xapp.Logger.Error("%s", err.Error()) err = fmt.Errorf("subscription not allocated") - return nil, err + return nil, errorInfo, err } newAlloc = true } else if endPointFound == true { @@ -249,7 +283,7 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. subs.RetryFromXapp = true xapp.Logger.Debug("CREATE subReqMsg.InstanceId=%v. Same subscription %s already exists.", subReqMsg.InstanceId, subs.String()) c.UpdateCounter(cDuplicateE2SubReq) - return subs, nil + return subs, errorInfo, nil } // @@ -259,16 +293,20 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. defer subs.mutex.Unlock() epamount := subs.EpList.Size() - xapp.Logger.Info("AssignToSubscription subs.EpList.Size()=%v", subs.EpList.Size()) + xapp.Logger.Debug("AssignToSubscription subs.EpList.Size()=%v", subs.EpList.Size()) r.mutex.Unlock() // // Subscription route updates // - if epamount == 1 { - err = r.RouteCreate(subs, c) + if createRMRRoute == true { + if epamount == 1 { + errorInfo, err = r.RouteCreate(subs, c) + } else { + errorInfo, err = r.RouteCreateUpdate(subs, c) + } } else { - err = r.RouteCreateUpdate(subs, c) + xapp.Logger.Debug("RMR route not created: createRMRRoute=%v", createRMRRoute) } r.mutex.Lock() @@ -278,7 +316,7 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. } // Delete already added endpoint for the request subs.EpList.DelEndpoint(trans.GetEndpoint()) - return nil, err + return nil, errorInfo, err } if newAlloc { @@ -286,31 +324,45 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. } xapp.Logger.Debug("CREATE %s", subs.String()) xapp.Logger.Debug("Registry: substable=%v", r.register) - return subs, nil + return subs, errorInfo, nil } -func (r *Registry) RouteCreate(subs *Subscription, c *Control) error { +func (r *Registry) RouteCreate(subs *Subscription, c *Control) (ErrorInfo, error) { + errorInfo := ErrorInfo{} subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.InstanceId)} err := r.rtmgrClient.SubscriptionRequestCreate(subRouteAction) if err != nil { + if strings.Contains(err.Error(), "status 400") { + errorInfo.TimeoutType = models.SubscriptionInstanceTimeoutTypeRTMGRTimeout + } else { + errorInfo.ErrorSource = models.SubscriptionInstanceErrorSourceRTMGR + } + errorInfo.ErrorCause = err.Error() c.UpdateCounter(cRouteCreateFail) xapp.Logger.Error("%s", err.Error()) err = fmt.Errorf("RTMGR route create failure") } - return err + return errorInfo, err } -func (r *Registry) RouteCreateUpdate(subs *Subscription, c *Control) error { +func (r *Registry) RouteCreateUpdate(subs *Subscription, c *Control) (ErrorInfo, error) { + errorInfo := ErrorInfo{} subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.InstanceId)} err := r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) if err != nil { + if strings.Contains(err.Error(), "status 400") { + errorInfo.TimeoutType = models.SubscriptionInstanceTimeoutTypeRTMGRTimeout + } else { + errorInfo.ErrorSource = models.SubscriptionInstanceErrorSourceRTMGR + } + errorInfo.ErrorCause = err.Error() c.UpdateCounter(cRouteCreateUpdateFail) xapp.Logger.Error("%s", err.Error()) err = fmt.Errorf("RTMGR route update failure") - return err + return errorInfo, err } c.UpdateCounter(cMergedSubscriptions) - return err + return errorInfo, err } func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (uint64, error) { @@ -355,7 +407,6 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction delStatus := subs.EpList.DelEndpoint(trans.GetEndpoint()) epamount := subs.EpList.Size() subId := subs.ReqId.InstanceId - if delStatus == false { return nil } @@ -368,13 +419,15 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction subs.mutex.Lock() defer subs.mutex.Unlock() - xapp.Logger.Info("CLEAN %s", subs.String()) + xapp.Logger.Debug("CLEAN %s", subs.String()) if epamount == 0 { // // Subscription route delete // - r.RouteDelete(subs, trans, c) + if subs.RMRRouteCreated == true { + r.RouteDelete(subs, trans, c) + } // // Subscription release @@ -392,7 +445,9 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction // // Subscription route update // - r.RouteDeleteUpdate(subs, c) + if subs.RMRRouteCreated == true { + r.RouteDeleteUpdate(subs, c) + } } }() @@ -400,6 +455,7 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction } func (r *Registry) RouteDelete(subs *Subscription, trans *TransactionXapp, c *Control) { + tmpList := xapp.RmrEndpointList{} tmpList.AddEndpoint(trans.GetEndpoint()) subRouteAction := SubRouteInfo{tmpList, uint16(subs.ReqId.InstanceId)} @@ -454,3 +510,59 @@ func (r *Registry) GetSubscriptionFirstMatch(subIds []uint32) (*Subscription, er } return nil, fmt.Errorf("No valid subscription found with subIds %v", subIds) } + +func (r *Registry) SetResetTestFlag(resetTestFlag bool, subs *Subscription) { + if resetTestFlag == true { + // This is used in submgr restart unit tests + xapp.Logger.Debug("resetTestFlag == true") + subs.DoNotWaitSubResp = true + } else { + xapp.Logger.Debug("resetTestFlag == false") + } +} + +func (r *Registry) DeleteAllE2Subscriptions(ranName string, c *Control) { + + xapp.Logger.Debug("Registry: DeleteAllE2Subscriptions()") + for subId, subs := range r.register { + if subs.Meid.RanName == ranName { + if subs.OngoingReqCount != 0 || subs.OngoingDelCount != 0 { + // Subscription creation or deletion processes need to be processed gracefully till the end. + // Subscription is deleted at end of the process in both cases. + xapp.Logger.Debug("Registry: E2 subscription under prosessing ongoing cannot delete it yet. subId=%v, OngoingReqCount=%v, OngoingDelCount=%v", subId, subs.OngoingReqCount, subs.OngoingDelCount) + continue + } else { + // Delete route + if subs.RMRRouteCreated == true { + for _, ep := range subs.EpList.Endpoints { + tmpList := xapp.RmrEndpointList{} + tmpList.AddEndpoint(&ep) + subRouteAction := SubRouteInfo{tmpList, uint16(subs.ReqId.InstanceId)} + if err := r.rtmgrClient.SubscriptionRequestDelete(subRouteAction); err != nil { + c.UpdateCounter(cRouteDeleteFail) + } + } + } + // Delete E2 subscription from registry and db + xapp.Logger.Debug("Registry: Subscription delete. subId=%v", subId) + delete(r.register, subId) + r.subIds = append(r.subIds, subId) + c.RemoveSubscriptionFromDb(subs) + } + } + } + + // Delete REST subscription from registry and db + for restSubId, restSubs := range r.restSubscriptions { + if restSubs.Meid == ranName && restSubs.SubReqOngoing == true || restSubs.SubDelReqOngoing == true { + // Subscription creation or deletion processes need to be processed gracefully till the end. + // Subscription is deleted at end of the process in both cases. + xapp.Logger.Debug("Registry: REST subscription under prosessing ongoing cannot delete it yet. RestSubId=%v, SubReqOngoing=%v, SubDelReqOngoing=%v", restSubId, restSubs.SubReqOngoing, restSubs.SubDelReqOngoing) + continue + } else { + xapp.Logger.Debug("Registry: REST subscription delete. subId=%v", restSubId) + delete(r.restSubscriptions, restSubId) + c.RemoveRESTSubscriptionFromDb(restSubId) + } + } +}