X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=5e9d63e900ce5a839bfa86df1bfa966403434526;hb=4378baf6754d656738f9f55233e7598ae05df2d6;hp=36e9b4c9f68b93abd7821ec59a70b04370a172f6;hpb=54838ed6fb79821c3711f92876993264d358f2c3;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/registry.go b/pkg/control/registry.go index 36e9b4c..5e9d63e 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -36,6 +36,8 @@ import ( //----------------------------------------------------------------------------- type RESTSubscription struct { + Created string + xAppServiceName string xAppRmrEndPoint string Meid string InstanceIds []uint32 @@ -107,20 +109,132 @@ func (r *Registry) Initialize() { } } -func (r *Registry) GetAllRestSubscriptions() []byte { +func (r *Registry) GetAllRestSubscriptionsJson() []byte { + r.mutex.Lock() defer r.mutex.Unlock() restSubscriptionsJson, err := json.Marshal(r.restSubscriptions) if err != nil { - xapp.Logger.Error("GetAllRestSubscriptions(): %v", err) + xapp.Logger.Error("GetAllRestSubscriptions() json.Marshal error: %v", err) } return restSubscriptionsJson } -func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *string, maid *string) *RESTSubscription { +func (r *Registry) GetAllE2NodeRestSubscriptionsJson(ranName string) []byte { + + restSubscriptions := r.GetAllE2NodeRestSubscriptions(ranName) + e2NodeRestSubscriptionsJson, err := json.Marshal(restSubscriptions) + if err != nil { + xapp.Logger.Error("GetE2NodeRestSubscriptions() json.Marshal error: %v", err) + } + return e2NodeRestSubscriptionsJson +} + +func (r *Registry) GetAllE2NodeRestSubscriptions(ranName string) map[string]RESTSubscription { + + r.mutex.Lock() + defer r.mutex.Unlock() + var restSubscriptions map[string]RESTSubscription + restSubscriptions = make(map[string]RESTSubscription) + for restSubsId, restSubscription := range r.restSubscriptions { + if restSubscription.Meid == ranName { + restSubscriptions[restSubsId] = *restSubscription + } + } + return restSubscriptions +} + +func (r *Registry) GetAllXappsJson() []byte { + + r.mutex.Lock() + var xappList []string + var xappsMap map[string]string + xappsMap = make(map[string]string) + for _, restSubscription := range r.restSubscriptions { + _, ok := xappsMap[restSubscription.xAppServiceName] + if !ok { + xappsMap[restSubscription.xAppServiceName] = restSubscription.xAppServiceName + xappList = append(xappList, restSubscription.xAppServiceName) + } + } + r.mutex.Unlock() + + xappsJson, err := json.Marshal(xappList) + if err != nil { + xapp.Logger.Error("GetXapps() json.Marshal error: %v", err) + } + return xappsJson +} + +func (r *Registry) GetAllXapps() map[string]string { + + r.mutex.Lock() + defer r.mutex.Unlock() + var xappsMap map[string]string + xappsMap = make(map[string]string) + for _, restSubscription := range r.restSubscriptions { + _, ok := xappsMap[restSubscription.xAppServiceName] + if !ok { + xappsMap[restSubscription.xAppServiceName] = restSubscription.xAppServiceName + } + } + return xappsMap +} + +func (r *Registry) GetAllXappRestSubscriptionsJson(xAppServiceName string) []byte { + + xappRestSubscriptions := r.GetAllXappRestSubscriptions(xAppServiceName) + xappRestSubscriptionsJson, err := json.Marshal(xappRestSubscriptions) + if err != nil { + xapp.Logger.Error("GetXappRestSubscriptions() json.Marshal error: %v", err) + } + return xappRestSubscriptionsJson +} + +func (r *Registry) GetAllXappRestSubscriptions(xAppServiceName string) map[string]RESTSubscription { + + r.mutex.Lock() + defer r.mutex.Unlock() + var xappRestSubscriptions map[string]RESTSubscription + xappRestSubscriptions = make(map[string]RESTSubscription) + for restSubsId, xappRestSubscription := range r.restSubscriptions { + if xappRestSubscription.xAppServiceName == xAppServiceName { + xappRestSubscriptions[restSubsId] = *xappRestSubscription + } + } + return xappRestSubscriptions +} + +func (r *Registry) GetE2SubscriptionsJson(restSubsId string) ([]byte, error) { + + // Get all E2 subscriptions of a REST subscription + restSubs, err := r.GetRESTSubscription(restSubsId, false) + if err != nil { + return nil, err + } + + r.mutex.Lock() + var e2Subscriptions []Subscription + for _, e2SubId := range restSubs.InstanceIds { + e2Subscription, ok := r.register[e2SubId] + if ok { + e2Subscriptions = append(e2Subscriptions, *e2Subscription) + } + } + r.mutex.Unlock() + e2SubscriptionsJson, err := json.Marshal(e2Subscriptions) + if err != nil { + xapp.Logger.Error("GetE2Subscriptions() json.Marshal error: %v", err) + } + return e2SubscriptionsJson, nil +} + +func (r *Registry) CreateRESTSubscription(restSubId *string, xappServiceName *string, xAppRmrEndPoint *string, maid *string) *RESTSubscription { r.mutex.Lock() defer r.mutex.Unlock() newRestSubscription := RESTSubscription{} + newRestSubscription.Created = time.Now().Format("2006-01-02 15:04:05.000") + newRestSubscription.xAppServiceName = *xappServiceName newRestSubscription.xAppRmrEndPoint = *xAppRmrEndPoint newRestSubscription.Meid = *maid newRestSubscription.SubReqOngoing = true @@ -397,7 +511,7 @@ func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (ui return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Invalid action type in RICactions-ToBeSetup-List") } -func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *TransactionXapp, waitRouteClean time.Duration, c *Control) error { +func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *TransactionXapp, waitRouteClean time.Duration, c *Control) { xapp.Logger.Debug("RemoveFromSubscription %s", idstring(nil, trans, subs, trans)) r.mutex.Lock() @@ -410,13 +524,15 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction subId := subs.ReqId.InstanceId if delStatus == false { - return nil + return } if waitRouteClean > 0 { // Wait here that response is delivered to xApp via RMR before route is cleaned xapp.Logger.Debug("Pending %v in order to wait route cleanup", waitRouteClean) + r.mutex.Unlock() time.Sleep(waitRouteClean) + r.mutex.Lock() } xapp.Logger.Debug("CLEAN %s", subs.String()) @@ -453,10 +569,13 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction // Endpoint of merged subscription is being deleted xapp.Logger.Debug("Subscription route update WriteSubscriptionToDb") - c.WriteSubscriptionToDb(subs) + err := c.WriteSubscriptionToDb(subs) + if err != nil { + xapp.Logger.Error("tracker.UnTrackTransaction() failed:%s", err.Error()) + } c.UpdateCounter(cUnmergedSubscriptions) } - return nil + return } func (r *Registry) RouteDelete(subs *Subscription, trans *TransactionXapp, c *Control) { @@ -538,15 +657,17 @@ func (r *Registry) DeleteAllE2Subscriptions(ranName string, c *Control) { // 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) + if restSubs.Meid == ranName { + if 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) + } } } }