X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2ap%2Fpkg%2Fe2ap%2Fmsg_e2ap.go;h=96ef09963552594ddd1cfdb09792d936a9333896;hb=refs%2Ftags%2F0.5.8;hp=8020049f00805229ffa9b030c1e98f81f3b7d8fb;hpb=f28853b537355b9ce04d7f3617bc80b3f0c34a1a;p=ric-plt%2Fsubmgr.git

diff --git a/e2ap/pkg/e2ap/msg_e2ap.go b/e2ap/pkg/e2ap/msg_e2ap.go
index 8020049..96ef099 100644
--- a/e2ap/pkg/e2ap/msg_e2ap.go
+++ b/e2ap/pkg/e2ap/msg_e2ap.go
@@ -119,12 +119,12 @@ func (msgInfo *MessageInfo) String() string {
 //
 //-----------------------------------------------------------------------------
 type RequestId struct {
-	Id  uint32
-	Seq uint32
+	Id         uint32
+	InstanceId uint32
 }
 
 func (rid *RequestId) String() string {
-	return strconv.FormatUint((uint64)(rid.Id), 10) + string(":") + strconv.FormatUint((uint64)(rid.Seq), 10)
+	return strconv.FormatUint((uint64)(rid.Id), 10) + string(":") + strconv.FormatUint((uint64)(rid.InstanceId), 10)
 }
 
 //-----------------------------------------------------------------------------
@@ -183,10 +183,7 @@ const (
 )
 
 type EventTriggerDefinition struct {
-	InterfaceId
-	InterfaceDirection uint32
-	ProcedureCode      uint32
-	TypeOfMessage      uint64
+	Data OctetString
 }
 
 /*
@@ -198,14 +195,25 @@ type CallProcessId struct {
 }
 */
 
+type ActionDefinitionChoice struct {
+	Data OctetString
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type BitString struct {
+	UnusedBits uint8
+	Length     uint64
+	Data       []uint8
+}
+
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type ActionDefinition struct {
-	Present bool
-	StyleId uint64
-	ParamId uint32
-	//ParamValue
+type OctetString struct {
+	Length uint64
+	Data   []uint8
 }
 
 //-----------------------------------------------------------------------------
@@ -255,9 +263,10 @@ const (
 )
 
 type ActionToBeSetupItem struct {
-	ActionId   uint64
-	ActionType uint64
-	ActionDefinition
+	ActionId                   uint64
+	ActionType                 uint64
+	RicActionDefinitionPresent bool
+	ActionDefinitionChoice
 	SubsequentAction
 }