Merge branch 'cr/TS33128/0165' of forge.3gpp.org:sa3/li-trial into test_merge

33128/r17/TS33128Payloads.asn

 TS33128Payloads
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version5(5)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version0(0)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
 
@@ -9,7 +9,7 @@ BEGIN
 -- Relative OIDs
 -- =============
 
-tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version5(5)}
+tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version0(0)}
 
 xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
 xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -1987,14 +1987,6 @@ MMEIdentifierAssocation ::= SEQUENCE
 -- Identifier Association parameters
 -- =================================
 
-GUTI ::= SEQUENCE
-{
-    mCC          [1] MCC,
-    mNC          [2] MNC,
-    mMEGroupID   [3] MMEGroupID,
-    mMECode      [4] MMECode,
-    mTMSI        [5] TMSI
-}
 
 MMEGroupID ::= OCTET STRING (SIZE(2))
 
@@ -2039,6 +2031,35 @@ LIAppliedDeliveryInformation ::= SEQUENCE
 -- ===============
 
 MDFCellSiteReport ::= SEQUENCE OF CellInformation
+-- ==============================
+-- 5G EPS Interworking Parameters
+-- ==============================
+
+
+EMM5GMMStatus ::= SEQUENCE
+{
+    eMMRegStatus  [1] EMMRegStatus OPTIONAL,
+    fiveGMMStatus [2] FiveGMMStatus OPTIONAL
+}
+
+
+EPS5GGUTI ::= CHOICE
+{
+    gUTI      [1] GUTI,
+    fiveGGUTI [2] FiveGGUTI
+}
+
+EMMRegStatus ::= ENUMERATED
+{
+    uEEMMRegistered(1),
+    uENotEMMRegistered(2)
+}
+
+FiveGMMStatus ::= ENUMERATED
+{
+    uE5GMMRegistered(1),
+    uENot5GMMRegistered(2)
+}
 
 -- =================
 -- Common Parameters
@@ -2116,6 +2137,15 @@ GUMMEI ::= SEQUENCE
     mNC         [3] MNC
 }
 
+GUTI ::= SEQUENCE
+{
+    mCC          [1] MCC,
+    mNC          [2] MNC,
+    mMEGroupID   [3] MMEGroupID,
+    mMECode      [4] MMECode,
+    mTMSI        [5] TMSI
+}
+
 HomeNetworkPublicKeyID ::= OCTET STRING
 
 HSMFURI ::= UTF8String
@@ -2278,6 +2308,12 @@ SUPI ::= CHOICE
 
 SUPIUnauthenticatedIndication ::= BOOLEAN
 
+SwitchOffIndicator ::= ENUMERATED
+{
+    normalDetach(1),
+    switchOff(2)
+}
+
 TargetIdentifier ::= CHOICE
 {
     sUPI                [1] SUPI,