X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=88a4cc5262434bdeb446baaa33d4f1e66eb6d3f6;hb=3a9697375fa1ebb0d39e7516756b08fcb64f4cb8;hp=f9e1bccb72ec5c5955a3c95ac2a488e185871f22;hpb=9c4697fa22fae79ac923e72f417ecbebf1c1e4d6;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/registry.go b/pkg/control/registry.go index f9e1bcc..88a4cc5 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -657,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) + } } } }