X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Fcontrol.go;h=ccb4b3d083648ee7f4158ebd9d8534862a68c37b;hb=5d4f68f1b4cf03646bafeb98cea13a4c57e56a65;hp=9b3f43de2b521baf556033e0176e9bef090caeb0;hpb=fe2cdabf98e8d1028bbe1713daa187e538f042a0;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 9b3f43d..ccb4b3d 100755
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -233,7 +233,7 @@ func (c *Control) SubscriptionHandler(params interface{}) (*models.SubscriptionR
 
 	c.CntRecvMsg++
 
-	c.UpdateCounter(cSubReqFromXapp)
+	c.UpdateCounter(cRestSubReqFromXapp)
 
 	if p.ClientEndpoint == nil {
 		xapp.Logger.Error("ClientEndpoint == nil")
@@ -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,8 +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(cSubRespToXapp)
 	}
 }
 
@@ -386,7 +388,7 @@ func (c *Control) handleSubscriptionRequest(trans *TransactionXapp, subReqMsg *e
 func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error {
 
 	c.CntRecvMsg++
-	c.UpdateCounter(cSubDelReqFromXapp)
+	c.UpdateCounter(cRestSubDelReqFromXapp)
 
 	xapp.Logger.Info("SubscriptionDeleteRequest from XAPP")
 
@@ -422,7 +424,7 @@ func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error {
 		c.registry.DeleteRESTSubscription(&restSubId)
 	}()
 
-	c.UpdateCounter(cSubDelRespToXapp)
+	c.UpdateCounter(cRestSubDelRespToXapp)
 
 	return nil
 }
@@ -882,6 +884,7 @@ func (c *Control) sendE2TSubscriptionDeleteRequest(subs *Subscription, trans *Tr
 func (c *Control) handleE2TSubscriptionResponse(params *xapp.RMRParams) {
 	xapp.Logger.Info("MSG from E2T: %s", params.String())
 	c.UpdateCounter(cSubRespFromE2)
+
 	subRespMsg, err := c.e2ap.UnpackSubscriptionResponse(params.Payload)
 	if err != nil {
 		xapp.Logger.Error("MSG-SubResp %s", idstring(err, params))
@@ -1004,14 +1007,14 @@ func typeofSubsMessage(v interface{}) string {
 		return "NIL"
 	}
 	switch v.(type) {
-	case *e2ap.E2APSubscriptionRequest:
-		return "SubReq"
+	//case *e2ap.E2APSubscriptionRequest:
+	//	return "SubReq"
 	case *e2ap.E2APSubscriptionResponse:
 		return "SubResp"
 	case *e2ap.E2APSubscriptionFailure:
 		return "SubFail"
-	case *e2ap.E2APSubscriptionDeleteRequest:
-		return "SubDelReq"
+	//case *e2ap.E2APSubscriptionDeleteRequest:
+	//	return "SubDelReq"
 	case *e2ap.E2APSubscriptionDeleteResponse:
 		return "SubDelResp"
 	case *e2ap.E2APSubscriptionDeleteFailure: