X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=525927375f935d919beee3150b9ce6551bbcaf25;hb=b642a19e7527f03458f1b6ca47bca132019aa2cf;hp=416b4156116633bfcf6938220ecd3b2ad81e4595;hpb=e93b00fe97d7f1f4a0a687df1403494ad06b8c9a;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/registry.go b/pkg/control/registry.go index 416b415..5259273 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -40,6 +40,7 @@ type RESTSubscription struct { xAppIdToE2Id map[int64]int64 SubReqOngoing bool SubDelReqOngoing bool + Md5sumOngoing string } func (r *RESTSubscription) AddE2InstanceId(instanceId uint32) { @@ -64,6 +65,7 @@ func (r *RESTSubscription) DeleteXappIdToE2Id(xAppEventInstanceID int64) { func (r *RESTSubscription) SetProcessed() { r.SubReqOngoing = false + r.Md5sumOngoing = "" } type Registry struct { @@ -216,7 +218,8 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. // actionType, err := r.CheckActionTypes(subReqMsg) if err != nil { - xapp.Logger.Debug("CREATE %s", err) + xapp.Logger.Info("CREATE %s", err) + err = fmt.Errorf("E2 content validation failed") return nil, err } @@ -236,6 +239,8 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap. subs, endPointFound := r.findExistingSubs(trans, subReqMsg) if subs == nil { if subs, err = r.allocateSubs(trans, subReqMsg, resetTestFlag); err != nil { + xapp.Logger.Error("%s", err.Error()) + err = fmt.Errorf("subscription not allocated") return nil, err } newAlloc = true @@ -289,6 +294,8 @@ func (r *Registry) RouteCreate(subs *Subscription, c *Control) error { err := r.rtmgrClient.SubscriptionRequestCreate(subRouteAction) if err != nil { c.UpdateCounter(cRouteCreateFail) + xapp.Logger.Error("%s", err.Error()) + err = fmt.Errorf("RTMGR route create failure") } return err } @@ -298,6 +305,8 @@ func (r *Registry) RouteCreateUpdate(subs *Subscription, c *Control) error { err := r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) if err != nil { c.UpdateCounter(cRouteCreateUpdateFail) + xapp.Logger.Error("%s", err.Error()) + err = fmt.Errorf("RTMGR route update failure") return err } c.UpdateCounter(cMergedSubscriptions)