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=153f07b6f0f0ee11736855d19a76524ef6d49239;hpb=9bcb0a4620d71671f758dce029cb2e3da9ab9dbe;p=ric-plt%2Fsubmgr.git

diff --git a/e2ap/pkg/e2ap/msg_e2ap.go b/e2ap/pkg/e2ap/msg_e2ap.go
index 153f07b..f4ca81a 100644
--- a/e2ap/pkg/e2ap/msg_e2ap.go
+++ b/e2ap/pkg/e2ap/msg_e2ap.go
@@ -96,83 +96,6 @@ const (
 	//
 )
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const (
-	E2AP_IndicationTypeReport uint64 = 0
-	E2AP_IndicationTypeInsert uint64 = 1
-)
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const (
-	E2AP_ActionTypeReport  uint64 = 0
-	E2AP_ActionTypeInsert  uint64 = 1
-	E2AP_ActionTypePolicy  uint64 = 2
-	E2AP_ActionTypeInvalid uint64 = 99 // For RIC internal usage only
-)
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const (
-	E2AP_SubSeqActionTypeContinue uint64 = 0
-	E2AP_SubSeqActionTypeWait     uint64 = 1
-)
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const (
-	E2AP_TimeToWaitZero   uint64 = 0
-	E2AP_TimeToWaitW1ms   uint64 = 1
-	E2AP_TimeToWaitW2ms   uint64 = 2
-	E2AP_TimeToWaitW5ms   uint64 = 3
-	E2AP_TimeToWaitW10ms  uint64 = 4
-	E2AP_TimeToWaitW20ms  uint64 = 4
-	E2AP_TimeToWaitW30ms  uint64 = 5
-	E2AP_TimeToWaitW40ms  uint64 = 6
-	E2AP_TimeToWaitW50ms  uint64 = 7
-	E2AP_TimeToWaitW100ms uint64 = 8
-	E2AP_TimeToWaitW200ms uint64 = 9
-	E2AP_TimeToWaitW500ms uint64 = 10
-	E2AP_TimeToWaitW1s    uint64 = 11
-	E2AP_TimeToWaitW2s    uint64 = 12
-	E2AP_TimeToWaitW5s    uint64 = 13
-	E2AP_TimeToWaitW10s   uint64 = 14
-	E2AP_TimeToWaitW20s   uint64 = 15
-	E2AP_TimeToWaitW60    uint64 = 16
-)
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const (
-	E2AP_InterfaceDirectionIncoming uint32 = 0
-	E2AP_InterfaceDirectionOutgoing uint32 = 1
-)
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const (
-	E2AP_CriticalityReject uint8 = 0
-	E2AP_CriticalityIgnore uint8 = 1
-	E2AP_CriticalityNotify uint8 = 2
-)
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-const (
-	E2AP_ENBIDMacroPBits20    uint8 = 20
-	E2AP_ENBIDHomeBits28      uint8 = 28
-	E2AP_ENBIDShortMacroits18 uint8 = 18
-	E2AP_ENBIDlongMacroBits21 uint8 = 21
-)
-
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -196,12 +119,12 @@ func (msgInfo *MessageInfo) String() string {
 //
 //-----------------------------------------------------------------------------
 type RequestId struct {
-	Id  uint32
-	Seq 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 {
-	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)
 }
 
 //-----------------------------------------------------------------------------
@@ -212,6 +135,14 @@ type FunctionId uint16
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+
+const (
+	E2AP_ENBIDMacroPBits20    uint8 = 20
+	E2AP_ENBIDHomeBits28      uint8 = 28
+	E2AP_ENBIDShortMacroits18 uint8 = 18
+	E2AP_ENBIDlongMacroBits21 uint8 = 21
+)
+
 type NodeId struct {
 	Bits uint8
 	Id   uint32
@@ -226,7 +157,7 @@ func (nid *NodeId) String() string {
 //-----------------------------------------------------------------------------
 type GlobalNodeId struct {
 	Present      bool
-	PlmnIdentity conv.PlmnIdentity
+	PlmnIdentity conv.PlmnIdentityTbcd
 	NodeId       NodeId
 }
 
@@ -245,11 +176,14 @@ type InterfaceId struct {
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+
+const (
+	E2AP_InterfaceDirectionIncoming uint32 = 0
+	E2AP_InterfaceDirectionOutgoing uint32 = 1
+)
+
 type EventTriggerDefinition struct {
-	InterfaceId
-	InterfaceDirection uint32
-	ProcedureCode      uint32
-	TypeOfMessage      uint64
+	Data OctetString
 }
 
 /*
@@ -261,19 +195,56 @@ type CallProcessId struct {
 }
 */
 
+type ActionDefinitionChoice struct {
+	Data OctetString
+}
+
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type ActionDefinition struct {
-	Present bool
-	StyleId uint64
-	ParamId uint32
-	//ParamValue
+type BitString struct {
+	UnusedBits uint8
+	Length     uint64
+	Data       []uint8
 }
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+type OctetString struct {
+	Length uint64
+	Data   []uint8
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+const (
+	E2AP_SubSeqActionTypeContinue uint64 = 0
+	E2AP_SubSeqActionTypeWait     uint64 = 1
+)
+
+const (
+	E2AP_TimeToWaitZero   uint64 = 0
+	E2AP_TimeToWaitW1ms   uint64 = 1
+	E2AP_TimeToWaitW2ms   uint64 = 2
+	E2AP_TimeToWaitW5ms   uint64 = 3
+	E2AP_TimeToWaitW10ms  uint64 = 4
+	E2AP_TimeToWaitW20ms  uint64 = 4
+	E2AP_TimeToWaitW30ms  uint64 = 5
+	E2AP_TimeToWaitW40ms  uint64 = 6
+	E2AP_TimeToWaitW50ms  uint64 = 7
+	E2AP_TimeToWaitW100ms uint64 = 8
+	E2AP_TimeToWaitW200ms uint64 = 9
+	E2AP_TimeToWaitW500ms uint64 = 10
+	E2AP_TimeToWaitW1s    uint64 = 11
+	E2AP_TimeToWaitW2s    uint64 = 12
+	E2AP_TimeToWaitW5s    uint64 = 13
+	E2AP_TimeToWaitW10s   uint64 = 14
+	E2AP_TimeToWaitW20s   uint64 = 15
+	E2AP_TimeToWaitW60    uint64 = 16
+)
+
 type SubsequentAction struct {
 	Present    bool
 	Type       uint64
@@ -283,19 +254,66 @@ type SubsequentAction struct {
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+
+const (
+	E2AP_ActionTypeReport  uint64 = 0
+	E2AP_ActionTypeInsert  uint64 = 1
+	E2AP_ActionTypePolicy  uint64 = 2
+	E2AP_ActionTypeInvalid uint64 = 99 // For RIC internal usage only
+)
+
 type ActionToBeSetupItem struct {
-	ActionId   uint64
-	ActionType uint64
-	ActionDefinition
+	ActionId                   uint64
+	ActionType                 uint64
+	RicActionDefinitionPresent bool
+	ActionDefinitionChoice
 	SubsequentAction
 }
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+
+const (
+	E2AP_CauseContent_RadioNetwork uint8 = 1
+	E2AP_CauseContent_Transport    uint8 = 2
+	E2AP_CauseContent_Protocol     uint8 = 3
+	E2AP_CauseContent_Misc         uint8 = 4
+	E2AP_CauseContent_Ric          uint8 = 5
+)
+
+//const (
+//	E2AP_CauseValue_RadioNetwork_ uint8 = 0
+//)
+//const (
+//	E2AP_CauseValue_Transport_ uint8 = 0
+//)
+//const (
+//	E2AP_CauseValue_Protocol_ uint8 = 0
+//)
+//const (
+//	E2AP_CauseValue_Misc_ uint8 = 0
+//)
+
+const (
+	E2AP_CauseValue_Ric_function_id_Invalid                            uint8 = 0
+	E2AP_CauseValue_Ric_action_not_supported                           uint8 = 1
+	E2AP_CauseValue_Ric_excessive_actions                              uint8 = 2
+	E2AP_CauseValue_Ric_duplicate_action                               uint8 = 3
+	E2AP_CauseValue_Ric_duplicate_event                                uint8 = 4
+	E2AP_CauseValue_Ric_function_resource_limit                        uint8 = 5
+	E2AP_CauseValue_Ric_request_id_unknown                             uint8 = 6
+	E2AP_CauseValue_Ric_inconsistent_action_subsequent_action_sequence uint8 = 7
+	E2AP_CauseValue_Ric_control_message_invalid                        uint8 = 8
+	E2AP_CauseValue_Ric_call_process_id_invalid                        uint8 = 9
+	E2AP_CauseValue_Ric_function_not_required                          uint8 = 10
+	E2AP_CauseValue_Ric_excessive_functions                            uint8 = 11
+	E2AP_CauseValue_Ric_ric_resource_limi                              uint8 = 12
+)
+
 type Cause struct {
-	Content  uint8
-	CauseVal uint8
+	Content uint8
+	Value   uint8
 }
 
 //-----------------------------------------------------------------------------
@@ -330,6 +348,12 @@ type ActionNotAdmittedList struct {
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+const (
+	E2AP_CriticalityReject uint8 = 0
+	E2AP_CriticalityIgnore uint8 = 1
+	E2AP_CriticalityNotify uint8 = 2
+)
+
 type CriticalityDiagnosticsIEListItem struct {
 	IeCriticality uint8 //Crit
 	IeID          uint32