X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststube2ap%2FstubE2.go;h=160597f7757ae46dc1512464008ddee46ac64f11;hb=cdc35bff0dd4c41d1e764d3f48efa70d9f33a8f7;hp=5804f74ab9d7bd397875b68e7543ba5cef284ac7;hpb=bc853f8016912a995dbde7bccf13136b09909cc6;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go
index 5804f74..160597f 100644
--- a/pkg/teststube2ap/stubE2.go
+++ b/pkg/teststube2ap/stubE2.go
@@ -106,77 +106,20 @@ func (p *E2StubSubsReqParams) Init() {
 	// gnb -> enb outgoing
 	// enb -> gnb incoming
 	// X2 36423-f40.doc
-	p.Req.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent = true
-	p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent = false
-	if p.Req.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent == true {
-		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Set("310150")
-		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 123
-		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28
-
-		p.Req.EventTriggerDefinition.InterfaceDirection = e2ap.E2AP_InterfaceDirectionIncoming
-		p.Req.EventTriggerDefinition.ProcedureCode = 5 //28 35
-		p.Req.EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage
-	} else if p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent == true {
-		p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinition.TriggerNature = e2ap.NRTTriggerNature_now
-	}
+	p.Req.EventTriggerDefinition.Data.Length = 1
+	p.Req.EventTriggerDefinition.Data.Data = make([]uint8, p.Req.EventTriggerDefinition.Data.Length)
+	p.Req.EventTriggerDefinition.Data.Data[0] = 1
 
 	p.Req.ActionSetups = make([]e2ap.ActionToBeSetupItem, 1)
 
 	p.Req.ActionSetups[0].ActionId = 0
 	p.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypeReport
 	p.Req.ActionSetups[0].RicActionDefinitionPresent = true
-	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1Present = false
-	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2Present = true
-	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1Present = false
-
-	if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1Present {
-		p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.StyleID = 99
-		// 1..255
-		for index := 0; index < 1; index++ {
-			actionParameterItem := e2ap.ActionParameterItem{}
-			actionParameterItem.ParameterID = 11
-			actionParameterItem.ActionParameterValue.ValueIntPresent = true
-			actionParameterItem.ActionParameterValue.ValueInt = 100
-			p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems =
-				append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems, actionParameterItem)
-		}
-	} else if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2Present {
-		// 1..15
-		for index := 0; index < 1; index++ {
-			ranUEgroupItem := e2ap.RANueGroupItem{}
-			// 1..255
-			for index2 := 0; index2 < 1; index2++ {
-				ranUEGroupDefItem := e2ap.RANueGroupDefItem{}
-				ranUEGroupDefItem.RanParameterID = 22
-				ranUEGroupDefItem.RanParameterTest = e2ap.RANParameterTest_equal
-				ranUEGroupDefItem.RanParameterValue.ValueIntPresent = true
-				ranUEGroupDefItem.RanParameterValue.ValueInt = 100
-				ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems = append(ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems, ranUEGroupDefItem)
-			}
-			// 1..255
-			for index3 := 0; index3 < 1; index3++ {
-				ranParameterItem := e2ap.RANParameterItem{}
-				ranParameterItem.RanParameterID = 33
-				ranParameterItem.RanParameterValue.ValueIntPresent = true
-				ranParameterItem.RanParameterValue.ValueInt = 100
-				ranUEgroupItem.RanPolicy.RanParameterItems = append(ranUEgroupItem.RanPolicy.RanParameterItems, ranParameterItem)
-			}
-			ranUEgroupItem.RanUEgroupID = 2
-			p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems =
-				append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems, ranUEgroupItem)
-		}
-	} else if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1Present {
-		// 1..255
-		for index := 0; index < 1; index++ {
-			ranParameterItem := e2ap.RANParameterItem{}
-			ranParameterItem.RanParameterID = 33
-			ranParameterItem.RanParameterValue.ValueIntPresent = true
-			ranParameterItem.RanParameterValue.ValueInt = 100
-			p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList =
-				append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList, ranParameterItem)
-		}
-	}
+
+	p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Length = 1
+	p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Data = make([]uint8, p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Length)
+	p.Req.ActionSetups[0].ActionDefinitionChoice.Data.Data[0] = 1
+
 	p.Req.ActionSetups[0].SubsequentAction.Present = true
 	p.Req.ActionSetups[0].SubsequentAction.Type = e2ap.E2AP_SubSeqActionTypeContinue
 	p.Req.ActionSetups[0].SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitZero