From: Markku Virtanen <markku.virtanen@nokia.com>
Date: Thu, 10 Jun 2021 12:05:02 +0000 (+0300)
Subject: Increment counters before sending Notification response
X-Git-Tag: 0.7.1~5
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=987f8b1fdb2dd8413d6c8faef1eb8618226e0421;hp=b642a19e7527f03458f1b6ca47bca132019aa2cf;p=ric-plt%2Fsubmgr.git

Increment counters before sending Notification response

Change-Id: I9ddb98c33fbde2a534cef3edfe0112f1919af255
Signed-off-by: Markku Virtanen <markku.virtanen@nokia.com>
---

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 9234a34..9779498 100755
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -331,8 +331,9 @@ func (c *Control) sendUnsuccesfullResponseNotification(restSubId *string, restSu
 		xapp.Logger.Info("Sending unsuccessful REST notification (cause %s) to endpoint=%v:%v, XappEventInstanceID=%v, E2EventInstanceID=%v",
 			errorCause, clientEndpoint.Host, *clientEndpoint.HTTPPort, xAppEventInstanceID, e2EventInstanceID)
 	}
-	xapp.Subscription.Notify(resp, *clientEndpoint)
+
 	c.UpdateCounter(cRestSubFailNotifToXapp)
+	xapp.Subscription.Notify(resp, *clientEndpoint)
 }
 
 func (c *Control) sendSuccesfullResponseNotification(restSubId *string, restSubscription *RESTSubscription, xAppEventInstanceID int64, e2EventInstanceID int64,
@@ -355,8 +356,9 @@ func (c *Control) sendSuccesfullResponseNotification(restSubId *string, restSubs
 	restSubscription.SetProcessed()
 	xapp.Logger.Info("Sending successful REST notification to endpoint=%v:%v, XappEventInstanceID=%v, E2EventInstanceID=%v, %s",
 		clientEndpoint.Host, *clientEndpoint.HTTPPort, xAppEventInstanceID, e2EventInstanceID, idstring(nil, trans))
-	xapp.Subscription.Notify(resp, *clientEndpoint)
+
 	c.UpdateCounter(cRestSubNotifToXapp)
+	xapp.Subscription.Notify(resp, *clientEndpoint)
 }
 
 //-------------------------------------------------------------------
@@ -1169,6 +1171,13 @@ func (c *Control) SendSubscriptionDeleteReq(subs *Subscription) {
 func (c *Control) PrintRESTSubscriptionRequest(p *models.SubscriptionParams) {
 
 	fmt.Println("CRESTSubscriptionRequest")
+
+	if p.SubscriptionID != "" {
+		fmt.Println("  SubscriptionID = ", p.SubscriptionID)
+	} else {
+		fmt.Println("  SubscriptionID = ''")
+	}
+
 	fmt.Printf("  ClientEndpoint.Host = %s\n", p.ClientEndpoint.Host)
 
 	if p.ClientEndpoint.HTTPPort != nil {