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

diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go
index 8fbfd44..cb15b35 100644
--- a/pkg/teststube2ap/stubE2.go
+++ b/pkg/teststube2ap/stubE2.go
@@ -858,15 +858,15 @@ func (p *RESTSubsReqParams) GetRESTSubsReqReportParams(subReqCount int, clientEn
 		reqId := int64(requestCount) + 1
 		subscriptionDetail := &clientmodel.SubscriptionDetail{
 			XappEventInstanceID: &reqId,
-			EventTriggers: &clientmodel.EventTriggerDefinition{
-				OctetString: "1234" + strconv.Itoa(requestCount),
+			EventTriggers: clientmodel.EventTriggerDefinition{
+				int64(1234 + requestCount),
 			},
 			ActionToBeSetupList: clientmodel.ActionsToBeSetup{
 				&clientmodel.ActionToBeSetup{
 					ActionID:   &actionId,
 					ActionType: &actionType,
-					ActionDefinition: &clientmodel.ActionDefinition{
-						OctetString: "5678" + strconv.Itoa(requestCount),
+					ActionDefinition: clientmodel.ActionDefinition{
+						int64(5678 + requestCount),
 					},
 					SubsequentAction: &clientmodel.SubsequentAction{
 						SubsequentActionType: &subsequestActioType,
@@ -938,34 +938,32 @@ func (p *RESTSubsReqParams) SetSubActionIDs(actionId int64) {
 	}
 }
 
-func (p *RESTSubsReqParams) SetSubActionDefinition(actionDefinition string) {
+func (p *RESTSubsReqParams) SetSubActionDefinition(actionDefinition []int64) {
 
 	for _, subDetail := range p.SubsReqParams.SubscriptionDetails {
 		for _, action := range subDetail.ActionToBeSetupList {
 			if action != nil {
-				action.ActionDefinition.OctetString = actionDefinition
+				action.ActionDefinition = actionDefinition
 			}
 		}
 	}
 }
 
-func (p *RESTSubsReqParams) SetSubEventTriggerDefinition(eventTriggerDefinition string) {
+func (p *RESTSubsReqParams) SetSubEventTriggerDefinition(eventTriggerDefinition []int64) {
 
 	for _, subDetail := range p.SubsReqParams.SubscriptionDetails {
 		if subDetail != nil {
-			subDetail.EventTriggers.OctetString = eventTriggerDefinition
+			subDetail.EventTriggers = eventTriggerDefinition
 		}
 	}
 }
 
-func (p *RESTSubsReqParams) AppendActionToActionToBeSetupList(actionId int64, actionType string, actionDefinition string, subsequentActionType string, timeToWait string) {
+func (p *RESTSubsReqParams) AppendActionToActionToBeSetupList(actionId int64, actionType string, actionDefinition []int64, subsequentActionType string, timeToWait string) {
 
 	actionToBeSetup := &clientmodel.ActionToBeSetup{
-		ActionID:   &actionId,
-		ActionType: &actionType,
-		ActionDefinition: &clientmodel.ActionDefinition{
-			OctetString: actionDefinition,
-		},
+		ActionID:         &actionId,
+		ActionType:       &actionType,
+		ActionDefinition: clientmodel.ActionDefinition(actionDefinition),
 		SubsequentAction: &clientmodel.SubsequentAction{
 			SubsequentActionType: &subsequentActionType,
 			TimeToWait:           &timeToWait,
@@ -1059,15 +1057,15 @@ func (p *RESTSubsReqParams) GetRESTSubsReqPolicyParams(subReqCount int, clientEn
 		reqId := int64(requestCount) + 1
 		subscriptionDetail := &clientmodel.SubscriptionDetail{
 			XappEventInstanceID: &reqId,
-			EventTriggers: &clientmodel.EventTriggerDefinition{
-				OctetString: "1234" + strconv.Itoa(requestCount),
+			EventTriggers: clientmodel.EventTriggerDefinition{
+				int64(1234 + requestCount),
 			},
 			ActionToBeSetupList: clientmodel.ActionsToBeSetup{
 				&clientmodel.ActionToBeSetup{
 					ActionID:   &actionId,
 					ActionType: &actionType,
-					ActionDefinition: &clientmodel.ActionDefinition{
-						OctetString: "5678" + strconv.Itoa(requestCount),
+					ActionDefinition: clientmodel.ActionDefinition{
+						int64(5678 + requestCount),
 					},
 					SubsequentAction: &clientmodel.SubsequentAction{
 						SubsequentActionType: &subsequestActioType,