X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststube2ap%2FstubE2.go;h=d6421e54d4e52aea93a92ef9baa75a9fe7ee0bef;hb=b43c8445740c9a5ac5535a2b065b403c3608b5dc;hp=a021cd06790679b1fc5206852cfcd6c41e102bcc;hpb=f682ace08a827bd260e4905b5ee1bddacf01c6e0;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go
index a021cd0..d6421e5 100644
--- a/pkg/teststube2ap/stubE2.go
+++ b/pkg/teststube2ap/stubE2.go
@@ -705,25 +705,25 @@ func (tc *E2Stub) expectNotification(t *testing.T, restSubsId string, expectErro
 	tc.restSubsIdList = []string{restSubsId}
 	xapp.Subscription.SetResponseCB(tc.ListedRestNotifHandler)
 	if tc.requestCount == 0 {
-		tc.TestError(t, "### NO REST notifications SET received for endpoint=%s, request zount ZERO! (%v)", tc.clientEndpoint, tc)
+		tc.TestError(t, "### NO REST notifications SET received for endpoint=%s, request zount ZERO! (%v)", tc.clientEndpoint, *tc)
 	}
 	go func() {
 		select {
 		case e2Ids := <-tc.CallBackListedNotifications:
 			if tc.requestCount == 0 {
-				tc.TestError(t, "### REST notification count unexpectedly ZERO for %s (%v)", restSubsId, tc)
+				tc.TestError(t, "### REST notification count unexpectedly ZERO for %s (%v)", restSubsId, *tc)
 			} else if e2Ids.RestSubsId != restSubsId {
-				tc.TestError(t, "### Unexpected REST notifications received, expected %s bunt got %s instead| (%v)", e2Ids.RestSubsId, restSubsId, tc)
+				tc.TestError(t, "### Unexpected REST notifications received, expected %s bunt got %s instead| (%v)", e2Ids.RestSubsId, restSubsId, *tc)
 			} else if e2Ids.ErrorCause == "" && expectError == "allFail" {
-				tc.TestError(t, "### Unexpected ok cause received from REST notifications |%s:%s| (%v)", e2Ids.RestSubsId, restSubsId, tc)
+				tc.TestError(t, "### Unexpected ok cause received from REST notifications |%s:%s| (%v)", e2Ids.RestSubsId, restSubsId, *tc)
 			} else if e2Ids.ErrorCause != "" && expectError == "allOk" {
-				tc.TestError(t, "### Unexpected ErrorCause: (%s), ErrorSource: (%s), TimeoutType: (%s) received from REST notifications |%s:%s| (%v)", e2Ids.ErrorCause, e2Ids.ErrorSource, e2Ids.TimeoutType, e2Ids.RestSubsId, restSubsId, tc)
+				tc.TestError(t, "### Unexpected ErrorCause: (%s), ErrorSource: (%s), TimeoutType: (%s) received from REST notifications |%s:%s| (%v)", e2Ids.ErrorCause, e2Ids.ErrorSource, e2Ids.TimeoutType, e2Ids.RestSubsId, restSubsId, *tc)
 			} else {
 				tc.requestCount--
 				if tc.requestCount == 0 {
-					tc.Debug("### All expected REST notifications received for %s (%v)", e2Ids.RestSubsId, tc)
+					tc.Debug("### All expected REST notifications received for %s (%v)", e2Ids.RestSubsId, *tc)
 				} else {
-					tc.Debug("### Expected REST notifications received for %s, (%v)", e2Ids.RestSubsId, tc)
+					tc.Debug("### Expected REST notifications received for %s, (%v)", e2Ids.RestSubsId, *tc)
 				}
 				if e2Ids.ErrorCause != "" && expectError == "allFail" {
 					tc.Debug("### REST Notification: RestSubsId: %s, ErrorCause: %s, ErrorSource: (%s), TimeoutType: (%s)", e2Ids.RestSubsId, e2Ids.ErrorCause, e2Ids.ErrorSource, e2Ids.TimeoutType)
@@ -748,10 +748,10 @@ func (tc *E2Stub) WaitRESTNotification(t *testing.T, restSubsId string) uint32 {
 	select {
 	case e2SubsId := <-tc.ListedRESTNotifications:
 		if e2SubsId.RestSubsId == restSubsId {
-			tc.Debug("### Expected REST notifications received %s, e2SubsId %v for endpoint=%s, (%v)", e2SubsId.RestSubsId, e2SubsId.E2SubsId, tc.clientEndpoint, tc)
+			tc.Debug("### Expected REST notifications received %s, e2SubsId %v for endpoint=%v, (%v)", e2SubsId.RestSubsId, e2SubsId.E2SubsId, tc.clientEndpoint, *tc)
 			return e2SubsId.E2SubsId
 		} else {
-			tc.TestError(t, "### Unexpected REST notification %s received, expected %s for endpoint=%s, (%v)", e2SubsId.RestSubsId, restSubsId, tc.clientEndpoint, tc)
+			tc.TestError(t, "### Unexpected REST notification %s received, expected %v for endpoint=%v, (%v)", e2SubsId.RestSubsId, restSubsId, tc.clientEndpoint, *tc)
 			xapp.Logger.Debug("CALL STACK:\n %s", stack)
 			return 0
 		}
@@ -796,7 +796,7 @@ func (tc *E2Stub) WaitAnyRESTNotification(t *testing.T) uint32 {
 func (tc *E2Stub) ListedRestNotifHandler(resp *clientmodel.SubscriptionResponse) {
 
 	if len(tc.restSubsIdList) == 0 {
-		tc.Error("Unexpected listed REST notifications received for endpoint=%s, expected restSubsId list size was ZERO!", tc.clientEndpoint)
+		tc.Error("Unexpected listed REST notifications received for endpoint=%v, expected restSubsId list size was ZERO!", tc.clientEndpoint)
 	} else {
 		for i, subsId := range tc.restSubsIdList {
 			if *resp.SubscriptionID == subsId {
@@ -813,7 +813,7 @@ func (tc *E2Stub) ListedRestNotifHandler(resp *clientmodel.SubscriptionResponse)
 				//				}
 
 				if len(tc.restSubsIdList) == 0 {
-					tc.Debug("All listed REST notifications received for endpoint=%s", tc.clientEndpoint)
+					tc.Debug("All listed REST notifications received for endpoint=%v", tc.clientEndpoint)
 				}
 
 				return
@@ -838,21 +838,9 @@ func (tc *E2Stub) GetE2RestIds(resp *clientmodel.SubscriptionResponse) *E2RestId
 			if resp.SubscriptionInstances[0].E2EventInstanceID != nil {
 				e2RestIds.E2SubsId = uint32(*resp.SubscriptionInstances[0].E2EventInstanceID)
 			}
-			if resp.SubscriptionInstances[0].ErrorCause != nil {
-				e2RestIds.ErrorCause = *resp.SubscriptionInstances[0].ErrorCause
-			} else {
-				e2RestIds.ErrorCause = "nil"
-			}
-			if resp.SubscriptionInstances[0].ErrorSource != nil {
-				e2RestIds.ErrorSource = *resp.SubscriptionInstances[0].ErrorSource
-			} else {
-				e2RestIds.ErrorSource = "nil"
-			}
-			if resp.SubscriptionInstances[0].TimeoutType != nil {
-				e2RestIds.TimeoutType = *resp.SubscriptionInstances[0].TimeoutType
-			} else {
-				e2RestIds.TimeoutType = "nil"
-			}
+			e2RestIds.ErrorCause = resp.SubscriptionInstances[0].ErrorCause
+			e2RestIds.ErrorSource = resp.SubscriptionInstances[0].ErrorSource
+			e2RestIds.TimeoutType = resp.SubscriptionInstances[0].TimeoutType
 		}
 	}
 	return e2RestIds
@@ -900,11 +888,6 @@ func (tc *E2Stub) SendRESTSubsReq(t *testing.T, params *RESTSubsReqParams) strin
 		// Swagger generated code makes checks for the values that are inserted the subscription function
 		// If error cause is unknown and POST is not done, the problem is in the inserted values
 		tc.Error("======== REST subscription request failed %s ========", err.Error())
-		if resp != nil {
-			tc.PrintSubscriptionInsctanceErrorInfo(resp)
-		} else {
-			tc.Error("Subscribe resp == nil")
-		}
 		return ""
 	}
 	tc.subscriptionId = *resp.SubscriptionID
@@ -912,28 +895,6 @@ func (tc *E2Stub) SendRESTSubsReq(t *testing.T, params *RESTSubsReqParams) strin
 	return *resp.SubscriptionID
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-func (tc *E2Stub) PrintSubscriptionInsctanceErrorInfo(resp *clientmodel.SubscriptionResponse) {
-	for _, subscriptionInstance := range resp.SubscriptionInstances {
-		if subscriptionInstance != nil {
-			if subscriptionInstance.RejectCause != nil {
-				tc.Error("subscriptionInstance.RejectCause= %s", *subscriptionInstance.RejectCause)
-			}
-			if subscriptionInstance.ErrorCause != nil {
-				tc.Error("subscriptionInstance.ErrorCause= %s", *subscriptionInstance.ErrorCause)
-			}
-			if subscriptionInstance.ErrorSource != nil {
-				tc.Error("subscriptionInstance.ErrorSource= %s", *subscriptionInstance.ErrorSource)
-			}
-			if subscriptionInstance.TimeoutType != nil {
-				tc.Error("subscriptionInstance.TimeoutType = %s", *subscriptionInstance.TimeoutType)
-			}
-		}
-	}
-}
-
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -1033,7 +994,7 @@ func (p *RESTSubsReqParams) SetE2SubscriptionDirectives(E2RetryCount int64, E2Ti
 	p.SubsReqParams.E2SubscriptionDirectives = E2SubscriptionDirectives
 	p.SubsReqParams.E2SubscriptionDirectives.E2RetryCount = &E2RetryCount
 	p.SubsReqParams.E2SubscriptionDirectives.E2TimeoutTimerValue = E2TimeoutTimerValue
-	p.SubsReqParams.E2SubscriptionDirectives.RMRRoutingNeeded = &RMRRoutingNeeded
+	p.SubsReqParams.E2SubscriptionDirectives.RMRRoutingNeeded = RMRRoutingNeeded
 }
 
 func (p *RESTSubsReqParams) RemoveE2SubscriptionDirectives() {
@@ -1227,7 +1188,7 @@ func (p *RESTSubsReqParams) SetSubscriptionDirectives(e2Timeout int64, e2RetryCo
 	e2SubscriptionDirectives := &clientmodel.SubscriptionParamsE2SubscriptionDirectives{}
 	e2SubscriptionDirectives.E2TimeoutTimerValue = e2Timeout
 	e2SubscriptionDirectives.E2RetryCount = &e2RetryCount
-	e2SubscriptionDirectives.RMRRoutingNeeded = &routingNeeded
+	e2SubscriptionDirectives.RMRRoutingNeeded = routingNeeded
 	p.SubsReqParams.E2SubscriptionDirectives = e2SubscriptionDirectives
 
 }