X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fmetrics_test.go;h=b72a9ce7f21b55680595f4e3721a5f82124aa380;hb=de457a14f98c546fdb009e9915745ef398388ddd;hp=3f0c41c56069f51f564ed5196b07162f1bf85da0;hpb=4abf18056b1674fb284c4d7d753c35a3ddab37e4;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/metrics_test.go b/pkg/control/metrics_test.go
index 3f0c41c..b72a9ce 100644
--- a/pkg/control/metrics_test.go
+++ b/pkg/control/metrics_test.go
@@ -26,36 +26,49 @@ import (
 func TestAddAllCountersOnce(t *testing.T) {
 
 	// Check that all counters can be added correctly
-	mainCtrl.SetTimesCounterWillBeAdded(cSubReqFromXapp, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubRespToXapp, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubFailToXapp, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubReqToE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubReReqToE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubRespFromE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubFailFromE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubReqTimerExpiry, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cRouteCreateFail, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cRouteCreateUpdateFail, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cMergedSubscriptions, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqFromXapp, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespToXapp, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqToE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubDelReReqToE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubDelRespFromE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubDelFailFromE2, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSubDelReqTimerExpiry, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cRouteDeleteFail, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cRouteDeleteUpdateFail, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cUnmergedSubscriptions, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSDLWriteFailure, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSDLReadFailure, 1)
-	mainCtrl.SetTimesCounterWillBeAdded(cSDLRemoveFailure, 1)
-
-	mainCtrl.GetCounterValuesBefore(t)
+	mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+		Counter{cSubReqFromXapp, 1},
+		Counter{cSubRespToXapp, 1},
+		Counter{cSubFailToXapp, 1},
+		Counter{cRestSubReqFromXapp, 1},
+		Counter{cRestSubRespToXapp, 1},
+		Counter{cRestSubFailToXapp, 1},
+		Counter{cRestSubNotifToXapp, 1},
+		Counter{cRestSubFailNotifToXapp, 1},
+		Counter{cSubReqToE2, 1},
+		Counter{cSubReReqToE2, 1},
+		Counter{cSubRespFromE2, 1},
+		Counter{cSubFailFromE2, 1},
+		Counter{cSubReqTimerExpiry, 1},
+		Counter{cRouteCreateFail, 1},
+		Counter{cRouteCreateUpdateFail, 1},
+		Counter{cMergedSubscriptions, 1},
+		Counter{cDuplicateE2SubReq, 1},
+		Counter{cSubDelReqFromXapp, 1},
+		Counter{cSubDelRespToXapp, 1},
+		Counter{cRestSubDelReqFromXapp, 1},
+		Counter{cRestSubDelRespToXapp, 1},
+		Counter{cSubDelReqToE2, 1},
+		Counter{cSubDelReReqToE2, 1},
+		Counter{cSubDelRespFromE2, 1},
+		Counter{cSubDelFailFromE2, 1},
+		Counter{cSubDelReqTimerExpiry, 1},
+		Counter{cRouteDeleteFail, 1},
+		Counter{cRouteDeleteUpdateFail, 1},
+		Counter{cUnmergedSubscriptions, 1},
+		Counter{cSDLWriteFailure, 1},
+		Counter{cSDLReadFailure, 1},
+		Counter{cSDLRemoveFailure, 1},
+	})
 
 	mainCtrl.c.UpdateCounter(cSubReqFromXapp)
 	mainCtrl.c.UpdateCounter(cSubRespToXapp)
 	mainCtrl.c.UpdateCounter(cSubFailToXapp)
+	mainCtrl.c.UpdateCounter(cRestSubReqFromXapp)
+	mainCtrl.c.UpdateCounter(cRestSubRespToXapp)
+	mainCtrl.c.UpdateCounter(cRestSubFailToXapp)
+	mainCtrl.c.UpdateCounter(cRestSubNotifToXapp)
+	mainCtrl.c.UpdateCounter(cRestSubFailNotifToXapp)
 	mainCtrl.c.UpdateCounter(cSubReqToE2)
 	mainCtrl.c.UpdateCounter(cSubReReqToE2)
 	mainCtrl.c.UpdateCounter(cSubRespFromE2)
@@ -64,8 +77,11 @@ func TestAddAllCountersOnce(t *testing.T) {
 	mainCtrl.c.UpdateCounter(cRouteCreateFail)
 	mainCtrl.c.UpdateCounter(cRouteCreateUpdateFail)
 	mainCtrl.c.UpdateCounter(cMergedSubscriptions)
+	mainCtrl.c.UpdateCounter(cDuplicateE2SubReq)
 	mainCtrl.c.UpdateCounter(cSubDelReqFromXapp)
 	mainCtrl.c.UpdateCounter(cSubDelRespToXapp)
+	mainCtrl.c.UpdateCounter(cRestSubDelReqFromXapp)
+	mainCtrl.c.UpdateCounter(cRestSubDelRespToXapp)
 	mainCtrl.c.UpdateCounter(cSubDelReqToE2)
 	mainCtrl.c.UpdateCounter(cSubDelReReqToE2)
 	mainCtrl.c.UpdateCounter(cSubDelRespFromE2)