//-----------------------------------------------------------------------------
type RESTSubscription struct {
+ Created string
+ xAppServiceName string
xAppRmrEndPoint string
Meid string
InstanceIds []uint32
}
type Registry struct {
- mutex sync.Mutex
+ mutex *sync.Mutex
register map[uint32]*Subscription
subIds []uint32
rtmgrClient *RtmgrClient
}
func (r *Registry) Initialize() {
+ r.mutex = new(sync.Mutex)
r.register = make(map[uint32]*Subscription)
r.restSubscriptions = make(map[string]*RESTSubscription)
}
}
-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
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, c *Control) error {
+ xapp.Logger.Debug("RemoveFromSubscription %s", idstring(nil, trans, subs, trans))
r.mutex.Lock()
defer r.mutex.Unlock()
subs.mutex.Lock()
delStatus := subs.EpList.DelEndpoint(trans.GetEndpoint())
epamount := subs.EpList.Size()
+
subId := subs.ReqId.InstanceId
if delStatus == false {
return nil
}
- go func() {
- if waitRouteClean > 0 {
- xapp.Logger.Debug("Pending %v in order to wait route cleanup", waitRouteClean)
- time.Sleep(waitRouteClean)
- }
+ 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()
+ }
- subs.mutex.Lock()
- defer subs.mutex.Unlock()
- xapp.Logger.Debug("CLEAN %s", subs.String())
+ xapp.Logger.Debug("CLEAN %s", subs.String())
- if epamount == 0 {
- //
- // Subscription route delete
- //
- if subs.RMRRouteCreated == true {
- r.RouteDelete(subs, trans, c)
- }
+ if epamount == 0 {
+ //
+ // Subscription route delete
+ //
+ if subs.RMRRouteCreated == true {
+ r.RouteDelete(subs, trans, c)
+ }
- //
- // Subscription release
- //
- r.mutex.Lock()
- defer r.mutex.Unlock()
+ // Not merged subscription is being deleted
+ xapp.Logger.Debug("Subscription route delete RemoveSubscriptionFromDb")
+ c.RemoveSubscriptionFromDb(subs)
- if _, ok := r.register[subId]; ok {
- xapp.Logger.Debug("RELEASE %s", subs.String())
- delete(r.register, subId)
- xapp.Logger.Debug("Registry: substable=%v", r.register)
- }
- r.subIds = append(r.subIds, subId)
- } else if subs.EpList.Size() > 0 {
- //
- // Subscription route update
- //
- if subs.RMRRouteCreated == true {
- r.RouteDeleteUpdate(subs, c)
- }
+ //
+ // Subscription release
+ //
+
+ if _, ok := r.register[subId]; ok {
+ xapp.Logger.Debug("RELEASE %s", subs.String())
+ delete(r.register, subId)
+ xapp.Logger.Debug("Registry: substable=%v", r.register)
+ }
+ r.subIds = append(r.subIds, subId)
+ } else if subs.EpList.Size() > 0 {
+ //
+ // Subscription route update
+ //
+ if subs.RMRRouteCreated == true {
+ r.RouteDeleteUpdate(subs, c)
}
- }()
+ // Endpoint of merged subscription is being deleted
+ xapp.Logger.Debug("Subscription route update WriteSubscriptionToDb")
+ err := c.WriteSubscriptionToDb(subs)
+ if err != nil {
+ xapp.Logger.Error("tracker.UnTrackTransaction() failed:%s", err.Error())
+ }
+ c.UpdateCounter(cUnmergedSubscriptions)
+ }
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)
- c.UpdateCounter(cUnmergedSubscriptions)
- }
-}
-
func (r *Registry) GetSubscription(subId uint32) *Subscription {
r.mutex.Lock()
defer r.mutex.Unlock()
// 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)
+ }
}
}
}
Code Review / ric-plt / submgr.git / blobdiff