Counter improvements

Change-Id: Idd87fcb14f63e0b0d139f0cbb6b9debf83b23cb3
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>

diff --git a/pkg/control/control.go b/pkg/control/control.go
index ccb4b3d..bf3ca83 100755 (executable)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -226,29 +226,31 @@ func (c *Control) Run() {
 //-------------------------------------------------------------------
 func (c *Control) SubscriptionHandler(params interface{}) (*models.SubscriptionResponse, error) {
 
+       c.CntRecvMsg++
+       c.UpdateCounter(cRestSubReqFromXapp)
+
        restSubId := ksuid.New().String()
        subResp := models.SubscriptionResponse{}
        subResp.SubscriptionID = &restSubId
        p := params.(*models.SubscriptionParams)
 
-       c.CntRecvMsg++
-
-       c.UpdateCounter(cRestSubReqFromXapp)
-
        if p.ClientEndpoint == nil {
                xapp.Logger.Error("ClientEndpoint == nil")
+               c.UpdateCounter(cRestSubFailToXapp)
                return nil, fmt.Errorf("")
        }
 
        _, xAppRmrEndpoint, err := ConstructEndpointAddresses(*p.ClientEndpoint)
        if err != nil {
                xapp.Logger.Error("%s", err.Error())
+               c.UpdateCounter(cRestSubFailToXapp)
                return nil, err
        }
 
        restSubscription, err := c.registry.CreateRESTSubscription(&restSubId, &xAppRmrEndpoint, p.Meid)
        if err != nil {
                xapp.Logger.Error("%s", err.Error())
+               c.UpdateCounter(cRestSubFailToXapp)
                return nil, err
        }
 
@@ -257,13 +259,14 @@ func (c *Control) SubscriptionHandler(params interface{}) (*models.SubscriptionR
        if err != nil {
                xapp.Logger.Error("%s", err.Error())
                c.registry.DeleteRESTSubscription(&restSubId)
+               c.UpdateCounter(cRestSubFailToXapp)
                return nil, err
        }
 
        go c.processSubscriptionRequests(restSubscription, &subReqList, p.ClientEndpoint, p.Meid, &restSubId)
 
+       c.UpdateCounter(cRestSubRespToXapp)
        return &subResp, nil
-
 }
 
 //-------------------------------------------------------------------
@@ -286,7 +289,9 @@ func (c *Control) processSubscriptionRequests(restSubscription *RESTSubscription
        for index := 0; index < len(subReqList.E2APSubscriptionRequests); index++ {
                subReqMsg := subReqList.E2APSubscriptionRequests[index]
 
-               trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(xAppRmrEndpoint), *restSubId, subReqMsg.RequestId, &xapp.RMRMeid{RanName: *meid})
+               xid := *restSubId + "_" + strconv.FormatUint(uint64(subReqMsg.RequestId.InstanceId), 10)
+               trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(xAppRmrEndpoint), xid, subReqMsg.RequestId, &xapp.RMRMeid{RanName: *meid})
+               //trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(xAppRmrEndpoint), *restSubId, subReqMsg.RequestId, &xapp.RMRMeid{RanName: *meid})
                if trans == nil {
                        c.registry.DeleteRESTSubscription(restSubId)
                        xapp.Logger.Error("XAPP-SubReq transaction not created. RESTSubId=%s, EndPoint=%s, Meid=%s", *restSubId, xAppRmrEndpoint, *meid)
@@ -311,7 +316,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)
+                       c.UpdateCounter(cRestSubFailNotifToXapp)
                } else {
                        xapp.Logger.Info("SubscriptionRequest index=%v processed successfully. endpoint=%v, InstanceId=%v, %s", index, *clientEndpoint, instanceId, idstring(nil, trans))
 
@@ -331,7 +336,7 @@ 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(cRestSubNotifToXapp)
 
                }
        }
@@ -434,7 +439,9 @@ func (c *Control) SubscriptionDeleteHandlerCB(restSubId string) error {
 //-------------------------------------------------------------------
 func (c *Control) SubscriptionDeleteHandler(restSubId *string, endPoint *string, meid *string, instanceId uint32) error {
 
-       trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(*endPoint), *restSubId, e2ap.RequestId{0, 0}, &xapp.RMRMeid{RanName: *meid})
+       xid := *restSubId + "_" + strconv.FormatUint(uint64(instanceId), 10)
+       trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(*endPoint), xid, e2ap.RequestId{0, 0}, &xapp.RMRMeid{RanName: *meid})
+       //trans := c.tracker.NewXappTransaction(xapp.NewRmrEndpoint(*endPoint), *restSubId, e2ap.RequestId{0, 0}, &xapp.RMRMeid{RanName: *meid})
        if trans == nil {
                err := fmt.Errorf("XAPP-SubDelReq transaction not created. restSubId %s, endPoint %s, meid %s, instanceId %v", *restSubId, *endPoint, *meid, instanceId)
                xapp.Logger.Error("%s", err.Error())

diff --git a/pkg/control/metrics.go b/pkg/control/metrics.go
index 9e0b7b5..0f514b4 100644 (file)
--- a/pkg/control/metrics.go
+++ b/pkg/control/metrics.go
@@ -5,35 +5,38 @@ import (
 )
 
 const (
-       cSubReqFromXapp        string = "SubReqFromXapp"
-       cRestSubReqFromXapp    string = "RestSubReqFromXapp"
-       cSubRespToXapp         string = "SubRespToXapp"
-       cRestSubRespToXapp     string = "RestSubRespToXapp"
-       cSubFailToXapp         string = "SubFailToXapp"
-       cRestSubFailToXapp     string = "RestSubFailToXapp"
-       cSubReqToE2            string = "SubReqToE2"
-       cSubReReqToE2          string = "SubReReqToE2"
-       cSubRespFromE2         string = "SubRespFromE2"
-       cSubFailFromE2         string = "SubFailFromE2"
-       cSubReqTimerExpiry     string = "SubReqTimerExpiry"
-       cRouteCreateFail       string = "RouteCreateFail"
-       cRouteCreateUpdateFail string = "RouteCreateUpdateFail"
-       cMergedSubscriptions   string = "MergedSubscriptions"
-       cSubDelReqFromXapp     string = "SubDelReqFromXapp"
-       cRestSubDelReqFromXapp string = "RestSubDelReqFromXapp"
-       cSubDelRespToXapp      string = "SubDelRespToXapp"
-       cRestSubDelRespToXapp  string = "RestSubDelRespToXapp"
-       cSubDelReqToE2         string = "SubDelReqToE2"
-       cSubDelReReqToE2       string = "SubDelReReqToE2"
-       cSubDelRespFromE2      string = "SubDelRespFromE2"
-       cSubDelFailFromE2      string = "SubDelFailFromE2"
-       cSubDelReqTimerExpiry  string = "SubDelReqTimerExpiry"
-       cRouteDeleteFail       string = "RouteDeleteFail"
-       cRouteDeleteUpdateFail string = "RouteDeleteUpdateFail"
-       cUnmergedSubscriptions string = "UnmergedSubscriptions"
-       cSDLWriteFailure       string = "SDLWriteFailure"
-       cSDLReadFailure        string = "SDLReadFailure"
-       cSDLRemoveFailure      string = "SDLRemoveFailure"
+       cSubReqFromXapp         string = "SubReqFromXapp"
+       cRestSubReqFromXapp     string = "RestSubReqFromXapp"
+       cSubFailToXapp          string = "SubFailToXapp"
+       cSubRespToXapp          string = "SubRespToXapp"
+       cRestSubRespToXapp      string = "RestSubRespToXapp"
+       cRestSubFailToXapp      string = "RestSubFailToXapp"
+       cRestSubNotifToXapp     string = "RestSubNotifToXapp"
+       cRestSubFailNotifToXapp string = "RestSubFailNotifToXapp"
+       cSubReqToE2             string = "SubReqToE2"
+       cSubReReqToE2           string = "SubReReqToE2"
+       cSubRespFromE2          string = "SubRespFromE2"
+       cSubFailFromE2          string = "SubFailFromE2"
+       cSubReqTimerExpiry      string = "SubReqTimerExpiry"
+       cRouteCreateFail        string = "RouteCreateFail"
+       cRouteCreateUpdateFail  string = "RouteCreateUpdateFail"
+       cMergedSubscriptions    string = "MergedSubscriptions"
+       cDuplicateE2SubReq      string = "DuplicateE2SubReq"
+       cSubDelReqFromXapp      string = "SubDelReqFromXapp"
+       cSubDelRespToXapp       string = "SubDelRespToXapp"
+       cRestSubDelReqFromXapp  string = "RestSubDelReqFromXapp"
+       cRestSubDelRespToXapp   string = "RestSubDelRespToXapp"
+       cSubDelReqToE2          string = "SubDelReqToE2"
+       cSubDelReReqToE2        string = "SubDelReReqToE2"
+       cSubDelRespFromE2       string = "SubDelRespFromE2"
+       cSubDelFailFromE2       string = "SubDelFailFromE2"
+       cSubDelReqTimerExpiry   string = "SubDelReqTimerExpiry"
+       cRouteDeleteFail        string = "RouteDeleteFail"
+       cRouteDeleteUpdateFail  string = "RouteDeleteUpdateFail"
+       cUnmergedSubscriptions  string = "UnmergedSubscriptions"
+       cSDLWriteFailure        string = "SDLWriteFailure"
+       cSDLReadFailure         string = "SDLReadFailure"
+       cSDLRemoveFailure       string = "SDLRemoveFailure"
 )
 
 func GetMetricsOpts() []xapp.CounterOpts {
@@ -41,11 +44,13 @@ func GetMetricsOpts() []xapp.CounterOpts {
 
                // Subscrition create counters
                {Name: cSubReqFromXapp, Help: "The total number of SubscriptionRequest messages received from xApp"},
-               {Name: cRestSubReqFromXapp, Help: "The total number of Rest SubscriptionRequest messages received from xApp"},
                {Name: cSubRespToXapp, Help: "The total number of SubscriptionResponse messages sent to xApp"},
-               {Name: cRestSubRespToXapp, Help: "The total number of Rest SubscriptionResponse messages sent to xApp"},
                {Name: cSubFailToXapp, Help: "The total number of SubscriptionFailure messages sent to xApp"},
+               {Name: cRestSubReqFromXapp, Help: "The total number of Rest SubscriptionRequest messages received from xApp"},
+               {Name: cRestSubRespToXapp, Help: "The total number of Rest SubscriptionResponse messages sent to xApp"},
                {Name: cRestSubFailToXapp, Help: "The total number of Rest SubscriptionFailure messages sent to xApp"},
+               {Name: cRestSubNotifToXapp, Help: "The total number of successful Rest SubscriptionNotification messages sent to xApp"},
+               {Name: cRestSubFailNotifToXapp, Help: "The total number of failure Rest SubscriptionNotification messages sent to xApp"},
                {Name: cSubReqToE2, Help: "The total number of SubscriptionRequest messages sent to E2Term"},
                {Name: cSubReReqToE2, Help: "The total number of SubscriptionRequest messages resent to E2Term"},
                {Name: cSubRespFromE2, Help: "The total number of SubscriptionResponse messages from E2Term"},
@@ -54,11 +59,12 @@ func GetMetricsOpts() []xapp.CounterOpts {
                {Name: cRouteCreateFail, Help: "The total number of subscription route create failure"},
                {Name: cRouteCreateUpdateFail, Help: "The total number of subscription route create update failure"},
                {Name: cMergedSubscriptions, Help: "The total number of merged Subscriptions"},
+               {Name: cDuplicateE2SubReq, Help: "The total number of same E2 SubscriptionRequest messages from same xApp"},
 
                // Subscrition delete counters
-               {Name: cSubDelReqFromXapp, Help: "The total number of SubscriptionDeleteResponse messages received from xApp"},
-               {Name: cRestSubDelReqFromXapp, Help: "The total number of Rest SubscriptionDeleteResponse messages received from xApp"},
+               {Name: cSubDelReqFromXapp, Help: "The total number of SubscriptionDeleteRequest messages received from xApp"},
                {Name: cSubDelRespToXapp, Help: "The total number of SubscriptionDeleteResponse messages sent to xApp"},
+               {Name: cRestSubDelReqFromXapp, Help: "The total number of Rest SubscriptionDeleteRequest messages received from xApp"},
                {Name: cRestSubDelRespToXapp, Help: "The total number of Rest SubscriptionDeleteResponse messages sent to xApp"},
                {Name: cSubDelReqToE2, Help: "The total number of SubscriptionDeleteRequest messages sent to E2Term"},
                {Name: cSubDelReReqToE2, Help: "The total number of SubscriptionDeleteRequest messages resent to E2Term"},

diff --git a/pkg/control/metrics_test.go b/pkg/control/metrics_test.go
index 067f2d4..b72a9ce 100644 (file)
--- a/pkg/control/metrics_test.go
+++ b/pkg/control/metrics_test.go
@@ -28,11 +28,13 @@ func TestAddAllCountersOnce(t *testing.T) {
        // Check that all counters can be added correctly
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cSubReqFromXapp, 1},
-               Counter{cRestSubReqFromXapp, 1},
                Counter{cSubRespToXapp, 1},
-               Counter{cRestSubRespToXapp, 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},
@@ -41,9 +43,10 @@ func TestAddAllCountersOnce(t *testing.T) {
                Counter{cRouteCreateFail, 1},
                Counter{cRouteCreateUpdateFail, 1},
                Counter{cMergedSubscriptions, 1},
+               Counter{cDuplicateE2SubReq, 1},
                Counter{cSubDelReqFromXapp, 1},
-               Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelRespToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
                Counter{cRestSubDelRespToXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelReReqToE2, 1},
@@ -59,11 +62,13 @@ func TestAddAllCountersOnce(t *testing.T) {
        })
 
        mainCtrl.c.UpdateCounter(cSubReqFromXapp)
-       mainCtrl.c.UpdateCounter(cRestSubReqFromXapp)
        mainCtrl.c.UpdateCounter(cSubRespToXapp)
-       mainCtrl.c.UpdateCounter(cRestSubRespToXapp)
        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)
@@ -72,9 +77,10 @@ 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(cRestSubDelReqFromXapp)
        mainCtrl.c.UpdateCounter(cSubDelRespToXapp)
+       mainCtrl.c.UpdateCounter(cRestSubDelReqFromXapp)
        mainCtrl.c.UpdateCounter(cRestSubDelRespToXapp)
        mainCtrl.c.UpdateCounter(cSubDelReqToE2)
        mainCtrl.c.UpdateCounter(cSubDelReReqToE2)

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index ddb0226..eae870d 100644 (file)
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -80,7 +80,7 @@ func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *st
        newRestSubscription.SubReqOngoing = true
        newRestSubscription.SubDelReqOngoing = false
        r.restSubscriptions[*restSubId] = &newRestSubscription
-       xapp.Logger.Info("Registry: Created REST subscription successfully. restSubId=%v, subscriptionCount=%v, e2apCubscriptionCount=%v", *restSubId, len(r.restSubscriptions), len(r.register))
+       xapp.Logger.Info("Registry: Created REST subscription successfully. restSubId=%v, subscriptionCount=%v, e2apSubscriptionCount=%v", *restSubId, len(r.restSubscriptions), len(r.register))
        return &newRestSubscription, nil
 }
 
@@ -226,7 +226,8 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.
        } else if endPointFound == true {
                // Requesting endpoint is already present in existing subscription. This can happen if xApp is restarted.
                subs.RetryFromXapp = true
-               xapp.Logger.Debug("CREATE: subscription already exists. %s", subs.String())
+               xapp.Logger.Debug("CREATE subReqMsg.InstanceId=%v. Same subscription %s already exists.", subReqMsg.InstanceId, subs.String())
+               c.UpdateCounter(cDuplicateE2SubReq)
                return subs, nil
        }
 
@@ -237,7 +238,7 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.
        defer subs.mutex.Unlock()
 
        epamount := subs.EpList.Size()
-       xapp.Logger.Info("AssignToSubscription subs.EpList.Size() = %v", subs.EpList.Size())
+       xapp.Logger.Info("AssignToSubscription subs.EpList.Size()=%v", subs.EpList.Size())
 
        r.mutex.Unlock()
        //

diff --git a/pkg/control/restendpoint.go b/pkg/control/restendpoint.go
index 96df505..59c30d0 100644 (file)
--- a/pkg/control/restendpoint.go
+++ b/pkg/control/restendpoint.go
@@ -31,6 +31,7 @@ import (
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+
 func ConstructEndpointAddresses(clientEndpoint models.SubscriptionParamsClientEndpoint) (string, string, error) {
 
        var HTTP_port int64 = *clientEndpoint.HTTPPort

diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index a9eec61..b3f105d 100644 (file)
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -2402,8 +2402,9 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cRouteCreateFail, 1},
-               Counter{cRestSubFailToXapp, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cRestSubDelRespToXapp, 1},
        })
@@ -2437,10 +2438,11 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
        //Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
-               Counter{cRestSubFailToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cRouteCreateUpdateFail, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
@@ -2484,9 +2486,10 @@ func TestRESTSubDelReqAndRouteDeleteNok(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cRouteDeleteFail, 1},
                Counter{cSubDelReqToE2, 1},
@@ -2517,9 +2520,10 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cRouteDeleteUpdateFail, 1},
                Counter{cSubDelReqToE2, 1},
@@ -2595,9 +2599,10 @@ func TestRESTSubReqRetransmission(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -2655,9 +2660,10 @@ func TestRESTSubDelReqRetransmission(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -2720,9 +2726,10 @@ func TestRESTSubReqDelReq(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -2765,9 +2772,10 @@ func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -2818,9 +2826,10 @@ func TestRESTSameSubsDiffRan(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -2855,10 +2864,11 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -2936,6 +2946,7 @@ func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubReqTimerExpiry, 2},
@@ -2971,6 +2982,7 @@ func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubReqTimerExpiry, 2},
@@ -3047,6 +3059,7 @@ func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubReqTimerExpiry, 2},
@@ -3117,9 +3130,10 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubFailFromE2, 1},
-               Counter{cRestSubFailToXapp, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
        })
 
@@ -3181,9 +3195,10 @@ func TestRESTSubDelReqRetryInSubmgr(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelReReqToE2, 1},
@@ -3240,9 +3255,10 @@ func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelReReqToE2, 1},
@@ -3299,9 +3315,10 @@ func TestRESTSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelFailFromE2, 1},
@@ -3380,9 +3397,10 @@ func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cMergedSubscriptions, 1},
                Counter{cUnmergedSubscriptions, 1},
                Counter{cRestSubDelReqFromXapp, 2},
@@ -3477,9 +3495,10 @@ func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -3574,8 +3593,9 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
-               Counter{cRestSubFailToXapp, 2},
+               Counter{cRestSubFailNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -3677,9 +3697,10 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
                Counter{cSubFailFromE2, 1},
-               Counter{cRestSubFailToXapp, 2},
+               Counter{cRestSubFailNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -3734,9 +3755,10 @@ func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -3818,9 +3840,10 @@ func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -3899,9 +3922,10 @@ func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4024,9 +4048,10 @@ func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -4085,6 +4110,7 @@ func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
@@ -4165,9 +4191,10 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 1},
+               Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
@@ -4263,9 +4290,10 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cMergedSubscriptions, 1},
                Counter{cUnmergedSubscriptions, 1},
                Counter{cRestSubDelReqFromXapp, 2},
@@ -4471,9 +4499,10 @@ func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4503,9 +4532,10 @@ func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 19},
                Counter{cSubRespFromE2, 19},
-               Counter{cRestSubRespToXapp, 19},
+               Counter{cRestSubNotifToXapp, 19},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 19},
                Counter{cSubDelRespFromE2, 19},
@@ -4534,9 +4564,10 @@ func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, uint64(subReqCount)},
                Counter{cSubRespFromE2, uint64(subReqCount)},
-               Counter{cRestSubRespToXapp, uint64(subReqCount)},
+               Counter{cRestSubNotifToXapp, uint64(subReqCount)},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, uint64(subReqCount)},
                Counter{cSubDelRespFromE2, uint64(subReqCount)},
@@ -4567,9 +4598,10 @@ func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, uint64(subReqCount)},
                Counter{cSubRespFromE2, uint64(subReqCount)},
-               Counter{cRestSubRespToXapp, uint64(subReqCount)},
+               Counter{cRestSubNotifToXapp, uint64(subReqCount)},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, uint64(subReqCount)},
                Counter{cSubDelRespFromE2, uint64(subReqCount)},
@@ -4600,9 +4632,10 @@ func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, uint64(subReqCount)},
                Counter{cSubRespFromE2, uint64(subReqCount)},
-               Counter{cRestSubRespToXapp, uint64(subReqCount)},
+               Counter{cRestSubNotifToXapp, uint64(subReqCount)},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, uint64(subReqCount)},
                Counter{cSubDelRespFromE2, uint64(subReqCount)},
@@ -4632,9 +4665,10 @@ func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4678,9 +4712,10 @@ func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4729,9 +4764,10 @@ func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4774,9 +4810,10 @@ func TestRESTSubReqDiffActionType(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4818,9 +4855,10 @@ func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4862,9 +4900,10 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4908,9 +4947,10 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -4954,9 +4994,10 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
-               Counter{cRestSubRespToXapp, 2},
+               Counter{cRestSubNotifToXapp, 2},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 2},
                Counter{cSubDelRespFromE2, 2},
@@ -5840,9 +5881,10 @@ func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelFailFromE2, 1},
-               Counter{cRestSubFailToXapp, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
        })
 
        subReqCount := 1

diff --git a/pkg/control/ut_restendpoint_test.go b/pkg/control/ut_restendpoint_test.go
index cabae3c..9183d3b 100644 (file)
--- a/pkg/control/ut_restendpoint_test.go
+++ b/pkg/control/ut_restendpoint_test.go
@@ -48,10 +48,10 @@ func TestRestEndpointOk(t *testing.T) {
                t.Errorf("Mismatching return value: %s - ecpected NIL", err)
        }
        if httpEndPoint != expectedHttpEndpoint {
-               t.Errorf("Mismatching httpEndpoint: %s - ecpected %s", httpEndPoint, expectedHttpEndpoint)
+               t.Errorf("Mismatching httpEndpoint: %s - expected %s", httpEndPoint, expectedHttpEndpoint)
        }
        if rmrEndPoint != expectedRmrEndpoint {
-               t.Errorf("Mismatching httpEndpoint: %s - ecpected %s", httpEndPoint, expectedHttpEndpoint)
+               t.Errorf("Mismatching httpEndpoint: %s - expected %s", httpEndPoint, expectedHttpEndpoint)
        }
 }