Fixing merge conflict

33128/r17/TS33128Payloads.asn

@@ -163,8 +163,11 @@ XIRIEvent ::= CHOICE
     aFAKMAApplicationKeyRefresh                         [1005] AFAKMAApplicationKeyRefresh,
     aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
     aFAuxiliarySecurityParameterEstablishment           [1007] AFAuxiliarySecurityParameterEstablishment,
-    aFApplicationKeyRemoval                             [1008] AFApplicationKeyRemoval
+    aFApplicationKeyRemoval                             [1008] AFApplicationKeyRemoval,
 
+    --HR LI Events, see clause 7.X.3.3
+    n9HRPDUSessionInfo                                  [2491] N9HRPDUSessionInfo,
+    s8HRBearerInfo                                      [2492] S8HRBearerInfo
 }
 
 -- ==============
@@ -313,6 +316,9 @@ IRIEvent ::= CHOICE
     mMEStartOfInterceptionWithEPSAttachedUE             [90] MMEStartOfInterceptionWithEPSAttachedUE,
     mMEUnsuccessfulProcedure                            [91] MMEUnsuccessfulProcedure,
 
+    -- tag 2491 is reserved because there is no equivalent IRI for the xIRI n9HRPDUSessionInfo
+    -- tag 2492 is reserved because there is no equivalent IRI for the xIRI S8HRBearerInfo
+
     -- AKMA key management Events, see clause 7.X.1
     aAnFAnchorKeyRegister                               [1001] AAnFAnchorKeyRegister,
     aAnFKAKMAApplicationKeyGet                          [1002] AAnFKAKMAApplicationKeyGet,
@@ -322,7 +328,6 @@ IRIEvent ::= CHOICE
     aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
     aFAuxiliarySecurityParameterEstablishment           [1007] AFAuxiliarySecurityParameterEstablishment,
     aFApplicationKeyRemoval                             [1008] AFApplicationKeyRemoval
-
 }
 
 IRITargetIdentifier ::= SEQUENCE
@@ -364,6 +369,59 @@ LINotificationMessage ::= CHOICE
 {
     lINotification      [1] LINotification
 }
+
+-- =================
+-- HR LI definitions
+-- =================
+
+N9HRPDUSessionInfo ::= SEQUENCE
+{
+    sUPI                            [1] SUPI,
+    pEI                             [2] PEI OPTIONAL,
+    pDUSessionID                    [3] PDUSessionID,
+    location                        [4] Location OPTIONAL,
+    sNSSAI                          [5] SNSSAI OPTIONAL,
+    dNN                             [6] DNN OPTIONAL,
+    messageCause                    [7] N9HRMessageCause
+}
+
+S8HRBearerInfo ::= SEQUENCE
+{
+    iMSI                            [1] IMSI,
+    iMEI                            [2] IMEI OPTIONAL,
+    bearerID                        [3] EPSBearerID,
+    linkedBearerID                  [4] EPSBearerID OPTIONAL,
+    location                        [5] Location OPTIONAL,
+    aPN                             [6] APN OPTIONAL,
+    sGWIPAddress                    [7] IPAddress OPTIONAL,
+    messageCause                    [8] S8HRMessageCause
+}
+
+-- ================
+-- HR LI parameters
+-- ================
+
+N9HRMessageCause ::= ENUMERATED
+{
+    pDUSessionEstablished(1),
+    pDUSessionModified(2),
+    pDUSessionReleased(3),
+    updatedLocationAvailable(4),
+    sMFChanged(5),
+    other(6)
+}
+
+S8HRMessageCause ::= ENUMERATED
+{
+    bearerActivated(1),
+    bearerModified(2),
+    bearerDeleted(3),
+    pDNDisconnected(4),
+    updatedLocationAvailable(5),
+    sGWChanged(6),
+    other(7)
+}
+
 -- ==================
 -- 5G NEF definitions
 -- ==================