X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2ap%2Fpkg%2Fe2ap%2Fmsg_e2ap.go;h=f4ca81a1a273b83cb7318b9b79c8f91e4b5c384f;hb=4c626a2869ab103ac837910518f8e71cb0541b27;hp=2ce2c175c4996d5648960c7ab41a061dad2ecc0d;hpb=aada64566a3a77cf9a20a98f9ddd7cd6f37529ae;p=ric-plt%2Fsubmgr.git

diff --git a/e2ap/pkg/e2ap/msg_e2ap.go b/e2ap/pkg/e2ap/msg_e2ap.go
index 2ce2c17..f4ca81a 100644
--- a/e2ap/pkg/e2ap/msg_e2ap.go
+++ b/e2ap/pkg/e2ap/msg_e2ap.go
@@ -119,8 +119,8 @@ func (msgInfo *MessageInfo) String() string {
 //
 //-----------------------------------------------------------------------------
 type RequestId struct {
-	Id         uint32
-	InstanceId uint32
+	Id         uint32 //RequestorId
+	InstanceId uint32 //Same as SubId in many place in the code. Name changed in E2 spec SubId -> InstanceId
 }
 
 func (rid *RequestId) String() string {
@@ -183,34 +183,9 @@ const (
 )
 
 type EventTriggerDefinition struct {
-	NBX2EventTriggerDefinitionPresent bool
-	X2EventTriggerDefinition
-	NBNRTEventTriggerDefinitionPresent bool
-	NBNRTEventTriggerDefinition
+	Data OctetString
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type X2EventTriggerDefinition struct {
-	InterfaceId
-	InterfaceDirection uint32
-	ProcedureCode      uint32
-	TypeOfMessage      uint64
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type NBNRTEventTriggerDefinition struct {
-	TriggerNature uint8
-}
-
-const ( // enum NRTTriggerNature
-	NRTTriggerNature_now = iota
-	NRTTriggerNature_onchange
-)
-
 /*
 //-----------------------------------------------------------------------------
 //
@@ -221,129 +196,7 @@ type CallProcessId struct {
 */
 
 type ActionDefinitionChoice struct {
-	ActionDefinitionX2Format1Present  bool
-	ActionDefinitionX2Format1         E2SMgNBX2actionDefinition
-	ActionDefinitionX2Format2Present  bool
-	ActionDefinitionX2Format2         ActionDefinitionFormat2
-	ActionDefinitionNRTFormat1Present bool
-	ActionDefinitionNRTFormat1        E2SMgNBNRTActionDefinitionFormat1
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type E2SMgNBNRTActionDefinitionFormat1 struct {
-	RanParameterList []RANParameterItem // 1..255
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type E2SMgNBX2actionDefinition struct {
-	StyleID              uint64
-	ActionParameterItems []ActionParameterItem // 1..255
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type ActionParameterItem struct {
-	ParameterID          uint32 // 1..255
-	ActionParameterValue ActionParameterValue
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type ActionParameterValue struct {
-	ValueIntPresent  bool
-	ValueInt         int64
-	ValueEnumPresent bool
-	ValueEnum        int64
-	ValueBoolPresent bool
-	ValueBool        bool
-	ValueBitSPresent bool
-	ValueBitS        BitString
-	ValueOctSPresent bool
-	ValueOctS        OctetString
-	ValuePrtSPresent bool
-	ValuePrtS        OctetString
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type ActionDefinitionFormat2 struct {
-	RanUEgroupItems []RANueGroupItem // 1..15
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RANueGroupItem struct {
-	RanUEgroupID         int64
-	RanUEgroupDefinition RANueGroupDefinition
-	RanPolicy            RANimperativePolicy
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RANueGroupDefinition struct {
-	RanUEGroupDefItems []RANueGroupDefItem // 1..255
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RANimperativePolicy struct {
-	RanParameterItems []RANParameterItem // 1..255
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RANueGroupDefItem struct {
-	RanParameterID    uint32 // 1..255
-	RanParameterTest  uint8
-	RanParameterValue RANParameterValue
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RANParameterItem struct {
-	RanParameterID    uint8 // 1..255
-	RanParameterValue RANParameterValue
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const ( // enum RANParameterTest
-	RANParameterTest_equal = iota
-	RANParameterTest_greaterthan
-	RANParameterTest_lessthan
-	RANParameterTest_contains
-	RANParameterTest_present
-)
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RANParameterValue struct {
-	ValueIntPresent  bool
-	ValueInt         int64
-	ValueEnumPresent bool
-	ValueEnum        int64
-	ValueBoolPresent bool
-	ValueBool        bool
-	ValueBitSPresent bool
-	ValueBitS        BitString
-	ValueOctSPresent bool
-	ValueOctS        OctetString
-	ValuePrtSPresent bool
-	ValuePrtS        OctetString
+	Data OctetString
 }
 
 //-----------------------------------------------------------------------------