From: Konstantinos Archangelof <konstantinos.archangelof@nokia.com>
Date: Mon, 31 May 2021 09:32:10 +0000 (+0000)
Subject: Rest interface specific counter used: cRestSubFailToXapp
X-Git-Tag: 0.7.1~16
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=5d4f68f1b4cf03646bafeb98cea13a4c57e56a65;p=ric-plt%2Fsubmgr.git

Rest interface specific counter used: cRestSubFailToXapp

Signed-off-by: Konstantinos Archangelof <konstantinos.archangelof@nokia.com>
Change-Id: I4bbbcf44056ca92f3595122652e188ffee20d374
---

diff --git a/pkg/control/control.go b/pkg/control/control.go
index c391d15..ccb4b3d 100755
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -311,6 +311,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(cRestSubFailToXapp)
 		} else {
 			xapp.Logger.Info("SubscriptionRequest index=%v processed successfully. endpoint=%v, InstanceId=%v, %s", index, *clientEndpoint, instanceId, idstring(nil, trans))
 
@@ -330,9 +331,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(cRestSubRespToXapp)
 
 		}
-		c.UpdateCounter(cRestSubRespToXapp)
 	}
 }
 
diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index 81df76a..a9eec61 100644
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -2403,7 +2403,7 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 		Counter{cRestSubReqFromXapp, 1},
 		Counter{cRouteCreateFail, 1},
-		Counter{cRestSubRespToXapp, 1},
+		Counter{cRestSubFailToXapp, 1},
 		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cRestSubDelRespToXapp, 1},
 	})
@@ -2439,7 +2439,8 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
 		Counter{cRestSubReqFromXapp, 2},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubRespFromE2, 1},
-		Counter{cRestSubRespToXapp, 2},
+		Counter{cRestSubRespToXapp, 1},
+		Counter{cRestSubFailToXapp, 1},
 		Counter{cRouteCreateUpdateFail, 1},
 		Counter{cRestSubDelReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
@@ -3118,7 +3119,7 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
 		Counter{cRestSubReqFromXapp, 1},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubFailFromE2, 1},
-		Counter{cRestSubRespToXapp, 1},
+		Counter{cRestSubFailToXapp, 1},
 		Counter{cRestSubDelReqFromXapp, 1},
 	})
 
@@ -3574,7 +3575,7 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
 	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
 		Counter{cRestSubReqFromXapp, 2},
 		Counter{cSubReqToE2, 1},
-		Counter{cRestSubRespToXapp, 2},
+		Counter{cRestSubFailToXapp, 2},
 		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
@@ -3678,7 +3679,7 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
 		Counter{cRestSubReqFromXapp, 2},
 		Counter{cSubReqToE2, 1},
 		Counter{cSubFailFromE2, 1},
-		Counter{cRestSubRespToXapp, 2},
+		Counter{cRestSubFailToXapp, 2},
 		Counter{cRestSubDelReqFromXapp, 2},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelRespFromE2, 1},
@@ -5841,7 +5842,7 @@ func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
 		Counter{cRestSubReqFromXapp, 1},
 		Counter{cSubDelReqToE2, 1},
 		Counter{cSubDelFailFromE2, 1},
-		Counter{cRestSubRespToXapp, 1},
+		Counter{cRestSubFailToXapp, 1},
 	})
 
 	subReqCount := 1