X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fcontrol.go;h=3ebcbcd4789280ac83915ddd5f09519f395b94a9;hb=b91971f3e81361a0dd714b144fd35fbd5225ce40;hp=0b39f2c5d08ae69afe0586b2c13b708d3b7f68eb;hpb=b73e7cda239967bd52e7b6022c95dca915769e81;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 0b39f2c..3ebcbcd 100755
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -142,25 +142,6 @@ func NewControl() *Control {
 	// Read subscriptions from db
 	c.ReadE2Subscriptions()
 	c.ReadRESTSubscriptions()
-
-	/*
-		xapp.Logger.Info("Reading subscriptions from db")
-		subIds, register, err := c.ReadAllSubscriptionsFromSdl()
-		if err != nil {
-			xapp.Logger.Error("%v", err)
-		} else {
-			c.registry.subIds = subIds
-			c.registry.register = register
-			c.HandleUncompletedSubscriptions(register)
-		}
-
-		restSubscriptions, err := c.ReadAllRESTSubscriptionsFromSdl()
-		if err != nil {
-			xapp.Logger.Error("%v", err)
-		} else {
-			c.registry.restSubscriptions = restSubscriptions
-		}
-	*/
 	return c
 }
 
@@ -431,6 +412,8 @@ func (c *Control) SubscriptionHandler(params interface{}) (*models.SubscriptionR
 		return &subResp, nil
 	}
 
+	c.WriteRESTSubscriptionToDb(restSubId, restSubscription)
+
 	go c.processSubscriptionRequests(restSubscription, &subReqList, p.ClientEndpoint, p.Meid, &restSubId, xAppRmrEndpoint, md5sum)
 
 	c.UpdateCounter(cRestSubRespToXapp)
@@ -620,7 +603,7 @@ func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error {
 
 	xAppRmrEndPoint := restSubscription.xAppRmrEndPoint
 	go func() {
-		xapp.Logger.Info("Deleteting instances = %v", restSubscription.InstanceIds)
+		xapp.Logger.Info("Deleteting handler: processing instances = %v", restSubscription.InstanceIds)
 		for _, instanceId := range restSubscription.InstanceIds {
 			xAppEventInstanceID, err := c.SubscriptionDeleteHandler(&restSubId, &xAppRmrEndPoint, &restSubscription.Meid, instanceId)
 
@@ -1352,6 +1335,10 @@ func (c *Control) PrintRESTSubscriptionRequest(p *models.SubscriptionParams) {
 
 	fmt.Println("CRESTSubscriptionRequest")
 
+	if p == nil {
+		return
+	}
+
 	if p.SubscriptionID != "" {
 		fmt.Println("  SubscriptionID = ", p.SubscriptionID)
 	} else {