X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Fcontrol.go;fp=pkg%2Fcontrol%2Fcontrol.go;h=27b2157e3ff8c14fd430a6a7f55ce3521e594f9a;hb=d00f25ffa52842524e52e161429ec4795574155a;hp=5dedb1e37919c8c99e53e74d2c61092ba2a42046;hpb=568d260371fd14454e5a3e41133e65bc7099a1b9;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 5dedb1e..27b2157 100755
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -71,22 +71,22 @@ var waitRouteCleanup_ms time.Duration
 var e2tMaxSubReqTryCount uint64    // Initial try + retry
 var e2tMaxSubDelReqTryCount uint64 // Initial try + retry
 var readSubsFromDb string
-var restDuplicateCtrl duplicateCtrl
 var dbRetryForever string
 var dbTryCount int
 
 type Control struct {
 	*xapp.RMRClient
-	e2ap          *E2ap
-	registry      *Registry
-	tracker       *Tracker
-	e2SubsDb      Sdlnterface
-	restSubsDb    Sdlnterface
-	CntRecvMsg    uint64
-	ResetTestFlag bool
-	Counters      map[string]xapp.Counter
-	LoggerLevel   uint32
-	UTTesting     bool
+	e2ap              *E2ap
+	registry          *Registry
+	tracker           *Tracker
+	restDuplicateCtrl *DuplicateCtrl
+	e2SubsDb          Sdlnterface
+	restSubsDb        Sdlnterface
+	CntRecvMsg        uint64
+	ResetTestFlag     bool
+	Counters          map[string]xapp.Counter
+	LoggerLevel       uint32
+	UTTesting         bool
 }
 
 type RMRMeid struct {
@@ -117,13 +117,17 @@ func NewControl() *Control {
 	tracker := new(Tracker)
 	tracker.Init()
 
+	restDuplicateCtrl := new(DuplicateCtrl)
+	restDuplicateCtrl.Init()
+
 	c := &Control{e2ap: new(E2ap),
-		registry:    registry,
-		tracker:     tracker,
-		e2SubsDb:    CreateSdl(),
-		restSubsDb:  CreateRESTSdl(),
-		Counters:    xapp.Metric.RegisterCounterGroup(GetMetricsOpts(), "SUBMGR"),
-		LoggerLevel: 3,
+		registry:          registry,
+		tracker:           tracker,
+		restDuplicateCtrl: restDuplicateCtrl,
+		e2SubsDb:          CreateSdl(),
+		restSubsDb:        CreateRESTSdl(),
+		Counters:          xapp.Metric.RegisterCounterGroup(GetMetricsOpts(), "SUBMGR"),
+		LoggerLevel:       4,
 	}
 	c.ReadConfigParameters("")
 
@@ -132,17 +136,16 @@ func NewControl() *Control {
 	xapp.Resource.InjectRoute("/ric/v1/restsubscriptions", c.GetAllRestSubscriptions, "GET")
 	xapp.Resource.InjectRoute("/ric/v1/symptomdata", c.SymptomDataHandler, "GET")
 
-	go xapp.Subscription.Listen(c.SubscriptionHandler, c.QueryHandler, c.SubscriptionDeleteHandlerCB)
-
 	if readSubsFromDb == "false" {
 		return c
 	}
 
-	restDuplicateCtrl.Init()
-
 	// Read subscriptions from db
 	c.ReadE2Subscriptions()
 	c.ReadRESTSubscriptions()
+
+	go xapp.Subscription.Listen(c.SubscriptionHandler, c.QueryHandler, c.SubscriptionDeleteHandlerCB)
+
 	return c
 }
 
@@ -308,7 +311,7 @@ func (c *Control) GetOrCreateRestSubscription(p *models.SubscriptionParams, md5s
 	var restSubscription *RESTSubscription
 	var err error
 
-	prevRestSubsId, exists := restDuplicateCtrl.GetLastKnownRestSubsIdBasedOnMd5sum(md5sum)
+	prevRestSubsId, exists := c.restDuplicateCtrl.GetLastKnownRestSubsIdBasedOnMd5sum(md5sum)
 	if p.SubscriptionID == "" {
 		if exists {
 			restSubscription, err = c.registry.GetRESTSubscription(prevRestSubsId, false)
@@ -321,7 +324,7 @@ func (c *Control) GetOrCreateRestSubscription(p *models.SubscriptionParams, md5s
 				}
 			} else {
 				xapp.Logger.Info("None existing restSubId %s referred by MD5sum %s for a request without subscription ID - deleting cached entry", prevRestSubsId, md5sum)
-				restDuplicateCtrl.DeleteLastKnownRestSubsIdBasedOnMd5sum(md5sum)
+				c.restDuplicateCtrl.DeleteLastKnownRestSubsIdBasedOnMd5sum(md5sum)
 			}
 		}
 
@@ -400,13 +403,13 @@ func (c *Control) SubscriptionHandler(params interface{}) (*models.SubscriptionR
 	err = c.e2ap.FillSubscriptionReqMsgs(params, &subReqList, restSubscription)
 	if err != nil {
 		xapp.Logger.Error("%s", err.Error())
-		restDuplicateCtrl.DeleteLastKnownRestSubsIdBasedOnMd5sum(md5sum)
+		c.restDuplicateCtrl.DeleteLastKnownRestSubsIdBasedOnMd5sum(md5sum)
 		c.registry.DeleteRESTSubscription(&restSubId)
 		c.UpdateCounter(cRestSubFailToXapp)
 		return nil, err
 	}
 
-	duplicate := restDuplicateCtrl.IsDuplicateToOngoingTransaction(restSubId, md5sum)
+	duplicate := c.restDuplicateCtrl.IsDuplicateToOngoingTransaction(restSubId, md5sum)
 	if duplicate {
 		xapp.Logger.Info("Retransmission blocker direct ACK for request of restSubsId %s restSubId MD5sum %s as retransmission", restSubId, md5sum)
 		c.UpdateCounter(cRestSubRespToXapp)
@@ -434,7 +437,7 @@ func (c *Control) processSubscriptionRequests(restSubscription *RESTSubscription
 	var xAppEventInstanceID int64
 	var e2EventInstanceID int64
 
-	defer restDuplicateCtrl.SetMd5sumFromLastOkRequest(*restSubId, md5sum)
+	defer c.restDuplicateCtrl.SetMd5sumFromLastOkRequest(*restSubId, md5sum)
 
 	for index := 0; index < len(subReqList.E2APSubscriptionRequests); index++ {
 		subReqMsg := subReqList.E2APSubscriptionRequests[index]
@@ -630,7 +633,7 @@ func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error {
 			restSubscription.DeleteXappIdToE2Id(xAppEventInstanceID)
 			restSubscription.DeleteE2InstanceId(instanceId)
 		}
-		restDuplicateCtrl.DeleteLastKnownRestSubsIdBasedOnMd5sum(restSubscription.lastReqMd5sum)
+		c.restDuplicateCtrl.DeleteLastKnownRestSubsIdBasedOnMd5sum(restSubscription.lastReqMd5sum)
 		c.registry.DeleteRESTSubscription(&restSubId)
 		c.RemoveRESTSubscriptionFromDb(restSubId)
 	}()