Debug printout improvements

[ric-plt/submgr.git] / pkg / control / control.go

diff --git a/pkg/control/control.go b/pkg/control/control.go
index c391d15..0c2f917 100755 (executable)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -70,14 +70,14 @@ 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 {
@@ -109,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("")
 
@@ -192,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
+       }
 }
 
 //-------------------------------------------------------------------
@@ -226,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(cRestSubReqFromXapp)
+       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
        }
 
@@ -257,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
-
 }
 
 //-------------------------------------------------------------------
@@ -286,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)
@@ -311,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))
 
@@ -330,9 +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(cRestSubRespToXapp)
        }
 }
 
@@ -433,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())
@@ -1089,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")
+                       }
+               }
+       }
+}