X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fcontrol.go;h=0c2f917e4b256baad519a935b51f722602ab947b;hb=de457a14f98c546fdb009e9915745ef398388ddd;hp=aee1158c5ca0affa097211ec58d48adfcbfed657;hpb=afbf95f5756a7b781859beb1e68b41f7319ed208;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/control.go b/pkg/control/control.go index aee1158..0c2f917 100755 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -63,20 +63,21 @@ func idstring(err error, entries ...fmt.Stringer) string { var e2tSubReqTimeout time.Duration var e2tSubDelReqTime time.Duration var e2tRecvMsgTimeout time.Duration +var waitRouteCleanup_ms time.Duration var e2tMaxSubReqTryCount uint64 // Initial try + retry var e2tMaxSubDelReqTryCount uint64 // Initial try + retry var readSubsFromDb string type Control struct { *xapp.RMRClient - e2ap *E2ap - registry *Registry - tracker *Tracker - db Sdlnterface - //subscriber *xapp.Subscriber + e2ap *E2ap + registry *Registry + tracker *Tracker + db Sdlnterface CntRecvMsg uint64 ResetTestFlag bool Counters map[string]xapp.Counter + LoggerLevel uint32 } type RMRMeid struct { @@ -108,11 +109,11 @@ func NewControl() *Control { tracker.Init() c := &Control{e2ap: new(E2ap), - registry: registry, - tracker: tracker, - db: CreateSdl(), - //subscriber: subscriber, - Counters: xapp.Metric.RegisterCounterGroup(GetMetricsOpts(), "SUBMGR"), + registry: registry, + tracker: tracker, + db: CreateSdl(), + Counters: xapp.Metric.RegisterCounterGroup(GetMetricsOpts(), "SUBMGR"), + LoggerLevel: 3, } c.ReadConfigParameters("") @@ -165,11 +166,21 @@ func (c *Control) ReadConfigParameters(f string) { e2tRecvMsgTimeout = 2000 * 1000000 } xapp.Logger.Info("e2tRecvMsgTimeout %v", e2tRecvMsgTimeout) + + // Internal cfg parameter, used to define a wait time for RMR route clean-up. None default + // value 100ms used currently only in unittests. + waitRouteCleanup_ms = viper.GetDuration("controls.waitRouteCleanup_ms") * 1000000 + if waitRouteCleanup_ms == 0 { + waitRouteCleanup_ms = 5000 * 1000000 + } + xapp.Logger.Info("waitRouteCleanup %v", waitRouteCleanup_ms) + e2tMaxSubReqTryCount = viper.GetUint64("controls.e2tMaxSubReqTryCount") if e2tMaxSubReqTryCount == 0 { e2tMaxSubReqTryCount = 1 } xapp.Logger.Info("e2tMaxSubReqTryCount %v", e2tMaxSubReqTryCount) + e2tMaxSubDelReqTryCount = viper.GetUint64("controls.e2tMaxSubDelReqTryCount") if e2tMaxSubDelReqTryCount == 0 { e2tMaxSubDelReqTryCount = 1 @@ -181,6 +192,10 @@ func (c *Control) ReadConfigParameters(f string) { readSubsFromDb = "true" } xapp.Logger.Info("readSubsFromDb %v", readSubsFromDb) + c.LoggerLevel = viper.GetUint32("logger.level") + if c.LoggerLevel == 0 { + c.LoggerLevel = 3 + } } //------------------------------------------------------------------- @@ -215,29 +230,35 @@ func (c *Control) Run() { //------------------------------------------------------------------- func (c *Control) SubscriptionHandler(params interface{}) (*models.SubscriptionResponse, error) { + c.CntRecvMsg++ + c.UpdateCounter(cRestSubReqFromXapp) + restSubId := ksuid.New().String() subResp := models.SubscriptionResponse{} subResp.SubscriptionID = &restSubId p := params.(*models.SubscriptionParams) - c.CntRecvMsg++ - - c.UpdateCounter(cSubReqFromXapp) + if c.LoggerLevel > 2 { + c.PrintRESTSubscriptionRequest(p) + } if p.ClientEndpoint == nil { xapp.Logger.Error("ClientEndpoint == nil") + c.UpdateCounter(cRestSubFailToXapp) return nil, fmt.Errorf("") } _, xAppRmrEndpoint, err := ConstructEndpointAddresses(*p.ClientEndpoint) if err != nil { xapp.Logger.Error("%s", err.Error()) + c.UpdateCounter(cRestSubFailToXapp) return nil, err } restSubscription, err := c.registry.CreateRESTSubscription(&restSubId, &xAppRmrEndpoint, p.Meid) if err != nil { xapp.Logger.Error("%s", err.Error()) + c.UpdateCounter(cRestSubFailToXapp) return nil, err } @@ -246,13 +267,14 @@ func (c *Control) SubscriptionHandler(params interface{}) (*models.SubscriptionR if err != nil { xapp.Logger.Error("%s", err.Error()) c.registry.DeleteRESTSubscription(&restSubId) + c.UpdateCounter(cRestSubFailToXapp) return nil, err } go c.processSubscriptionRequests(restSubscription, &subReqList, p.ClientEndpoint, p.Meid, &restSubId) + c.UpdateCounter(cRestSubRespToXapp) return &subResp, nil - } //------------------------------------------------------------------- @@ -275,7 +297,9 @@ func (c *Control) processSubscriptionRequests(restSubscription *RESTSubscription for index := 0; index < len(subReqList.E2APSubscriptionRequests); index++ { subReqMsg := subReqList.E2APSubscriptionRequests[index] - trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(xAppRmrEndpoint), *restSubId, subReqMsg.RequestId, &xapp.RMRMeid{RanName: *meid}) + xid := *restSubId + "_" + strconv.FormatUint(uint64(subReqMsg.RequestId.InstanceId), 10) + trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(xAppRmrEndpoint), xid, subReqMsg.RequestId, &xapp.RMRMeid{RanName: *meid}) + //trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(xAppRmrEndpoint), *restSubId, subReqMsg.RequestId, &xapp.RMRMeid{RanName: *meid}) if trans == nil { c.registry.DeleteRESTSubscription(restSubId) xapp.Logger.Error("XAPP-SubReq transaction not created. RESTSubId=%s, EndPoint=%s, Meid=%s", *restSubId, xAppRmrEndpoint, *meid) @@ -300,6 +324,7 @@ func (c *Control) processSubscriptionRequests(restSubscription *RESTSubscription restSubscription.SetProcessed() xapp.Logger.Info("Sending unsuccessful REST notification to endpoint=%v:%v, InstanceId=%v, %s", clientEndpoint.Host, clientEndpoint.HTTPPort, instanceId, idstring(nil, trans)) xapp.Subscription.Notify(resp, *clientEndpoint) + c.UpdateCounter(cRestSubFailNotifToXapp) } else { xapp.Logger.Info("SubscriptionRequest index=%v processed successfully. endpoint=%v, InstanceId=%v, %s", index, *clientEndpoint, instanceId, idstring(nil, trans)) @@ -319,8 +344,9 @@ func (c *Control) processSubscriptionRequests(restSubscription *RESTSubscription restSubscription.SetProcessed() xapp.Logger.Info("Sending successful REST notification to endpoint=%v, InstanceId=%v, %s", *clientEndpoint, instanceId, idstring(nil, trans)) xapp.Subscription.Notify(resp, *clientEndpoint) + c.UpdateCounter(cRestSubNotifToXapp) + } - c.UpdateCounter(cSubRespToXapp) } } @@ -365,7 +391,7 @@ func (c *Control) handleSubscriptionRequest(trans *TransactionXapp, subReqMsg *e } err = fmt.Errorf("XAPP-SubReq: failed %s", idstring(err, trans, subs)) xapp.Logger.Error("%s", err.Error()) - c.registry.RemoveFromSubscription(subs, trans, 5*time.Second, c) + c.registry.RemoveFromSubscription(subs, trans, waitRouteCleanup_ms, c) return nil, err } @@ -375,7 +401,7 @@ func (c *Control) handleSubscriptionRequest(trans *TransactionXapp, subReqMsg *e func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error { c.CntRecvMsg++ - c.UpdateCounter(cSubDelReqFromXapp) + c.UpdateCounter(cRestSubDelReqFromXapp) xapp.Logger.Info("SubscriptionDeleteRequest from XAPP") @@ -411,7 +437,7 @@ func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error { c.registry.DeleteRESTSubscription(&restSubId) }() - c.UpdateCounter(cSubDelRespToXapp) + c.UpdateCounter(cRestSubDelRespToXapp) return nil } @@ -421,7 +447,9 @@ func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error { //------------------------------------------------------------------- func (c *Control) SubscriptionDeleteHandler(restSubId *string, endPoint *string, meid *string, instanceId uint32) error { - trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(*endPoint), *restSubId, e2ap.RequestId{0, 0}, &xapp.RMRMeid{RanName: *meid}) + xid := *restSubId + "_" + strconv.FormatUint(uint64(instanceId), 10) + trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(*endPoint), xid, e2ap.RequestId{0, 0}, &xapp.RMRMeid{RanName: *meid}) + //trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(*endPoint), *restSubId, e2ap.RequestId{0, 0}, &xapp.RMRMeid{RanName: *meid}) if trans == nil { err := fmt.Errorf("XAPP-SubDelReq transaction not created. restSubId %s, endPoint %s, meid %s, instanceId %v", *restSubId, *endPoint, *meid, instanceId) xapp.Logger.Error("%s", err.Error()) @@ -449,7 +477,7 @@ func (c *Control) SubscriptionDeleteHandler(restSubId *string, endPoint *string, xapp.Logger.Debug("XAPP-SubDelReq: Handling event %s ", idstring(nil, trans, subs)) - c.registry.RemoveFromSubscription(subs, trans, 5*time.Second, c) + c.registry.RemoveFromSubscription(subs, trans, waitRouteCleanup_ms, c) return nil } @@ -748,7 +776,7 @@ func (c *Control) handleSubscriptionCreate(subs *Subscription, parentTrans *Tran //Now RemoveFromSubscription in here to avoid race conditions (mostly concerns delete) if valid == false { - c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second, c) + c.registry.RemoveFromSubscription(subs, parentTrans, waitRouteCleanup_ms, c) } c.UpdateSubscriptionInDB(subs, removeSubscriptionFromDb) @@ -780,7 +808,7 @@ func (c *Control) handleSubscriptionDelete(subs *Subscription, parentTrans *Tran //Now RemoveFromSubscription in here to avoid race conditions (mostly concerns delete) // If parallel deletes ongoing both might pass earlier sendE2TSubscriptionDeleteRequest(...) if // RemoveFromSubscription locates in caller side (now in handleXAPPSubscriptionDeleteRequest(...)) - c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second, c) + c.registry.RemoveFromSubscription(subs, parentTrans, waitRouteCleanup_ms, c) c.registry.UpdateSubscriptionToDb(subs, c) parentTrans.SendEvent(nil, 0) } @@ -803,6 +831,7 @@ func (c *Control) sendE2TSubscriptionRequest(subs *Subscription, trans *Transact // Write uncompleted subscrition in db. If no response for subscrition it need to be re-processed (deleted) after restart c.WriteSubscriptionToDb(subs) + for retries := uint64(0); retries < e2tMaxSubReqTryCount; retries++ { desc := fmt.Sprintf("(retry %d)", retries) if retries == 0 { @@ -870,6 +899,7 @@ func (c *Control) sendE2TSubscriptionDeleteRequest(subs *Subscription, trans *Tr func (c *Control) handleE2TSubscriptionResponse(params *xapp.RMRParams) { xapp.Logger.Info("MSG from E2T: %s", params.String()) c.UpdateCounter(cSubRespFromE2) + subRespMsg, err := c.e2ap.UnpackSubscriptionResponse(params.Payload) if err != nil { xapp.Logger.Error("MSG-SubResp %s", idstring(err, params)) @@ -992,14 +1022,14 @@ func typeofSubsMessage(v interface{}) string { return "NIL" } switch v.(type) { - case *e2ap.E2APSubscriptionRequest: - return "SubReq" + //case *e2ap.E2APSubscriptionRequest: + // return "SubReq" case *e2ap.E2APSubscriptionResponse: return "SubResp" case *e2ap.E2APSubscriptionFailure: return "SubFail" - case *e2ap.E2APSubscriptionDeleteRequest: - return "SubDelReq" + //case *e2ap.E2APSubscriptionDeleteRequest: + // return "SubDelReq" case *e2ap.E2APSubscriptionDeleteResponse: return "SubDelResp" case *e2ap.E2APSubscriptionDeleteFailure: @@ -1075,3 +1105,55 @@ func (c *Control) SendSubscriptionDeleteReq(subs *Subscription) { c.handleXAPPSubscriptionDeleteRequest(params) } } + +func (c *Control) PrintRESTSubscriptionRequest(p *models.SubscriptionParams) { + + fmt.Println("CRESTSubscriptionRequest") + fmt.Printf(" ClientEndpoint.Host = %s\n", p.ClientEndpoint.Host) + + if p.ClientEndpoint.HTTPPort != nil { + fmt.Printf(" ClientEndpoint.HTTPPort = %v\n", *p.ClientEndpoint.HTTPPort) + } else { + fmt.Println(" ClientEndpoint.HTTPPort = nil") + } + + if p.ClientEndpoint.RMRPort != nil { + fmt.Printf(" ClientEndpoint.RMRPort = %v\n", *p.ClientEndpoint.RMRPort) + } else { + fmt.Println(" ClientEndpoint.RMRPort = nil") + } + + if p.Meid != nil { + fmt.Printf(" Meid = %s\n", *p.Meid) + } else { + fmt.Println(" Meid = nil") + } + + for _, subscriptionDetail := range p.SubscriptionDetails { + if p.RANFunctionID != nil { + fmt.Printf(" RANFunctionID = %v\n", *p.RANFunctionID) + } else { + fmt.Println(" RANFunctionID = nil") + } + fmt.Printf(" SubscriptionDetail.RequestorID = %v\n", *subscriptionDetail.RequestorID) + fmt.Printf(" SubscriptionDetail.InstanceID = %v\n", *subscriptionDetail.InstanceID) + fmt.Printf(" SubscriptionDetail.EventTriggers.OctetString = %X\n", subscriptionDetail.EventTriggers.OctetString) + + for _, actionToBeSetup := range subscriptionDetail.ActionToBeSetupList { + fmt.Printf(" SubscriptionDetail.ActionToBeSetup.ActionID = %v\n", *actionToBeSetup.ActionID) + fmt.Printf(" SubscriptionDetail.ActionToBeSetup.ActionType = %s\n", *actionToBeSetup.ActionType) + if actionToBeSetup.ActionDefinition != nil { + fmt.Printf(" SubscriptionDetail.ActionToBeSetup.ActionDefinition.OctetString = %X\n", actionToBeSetup.ActionDefinition.OctetString) + } else { + fmt.Println(" SubscriptionDetail.ActionToBeSetup.ActionDefinition = nil") + + } + if actionToBeSetup.SubsequentAction != nil { + fmt.Printf(" SubscriptionDetail.ActionToBeSetup.SubsequentAction.SubsequentActionType = %s\n", *actionToBeSetup.SubsequentAction.SubsequentActionType) + fmt.Printf(" SubscriptionDetail.ActionToBeSetup..SubsequentAction.TimeToWait = %s\n", *actionToBeSetup.SubsequentAction.TimeToWait) + } else { + fmt.Println(" SubscriptionDetail.ActionToBeSetup.SubsequentAction = nil") + } + } + } +}