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

33128/r17/TS33128Payloads.asn

@@ -288,7 +288,10 @@ AMFRegistration ::= SEQUENCE
     gUTI                        [8] FiveGGUTI,
     location                    [9] Location OPTIONAL,
     non3GPPAccessEndpoint       [10] UEEndpointAddress OPTIONAL,
-    fiveGSTAIList               [11] TAIList OPTIONAL
+    fiveGSTAIList               [11] TAIList OPTIONAL,
+    sMSOverNasIndicator         [12] SMSOverNASIndicator OPTIONAL,
+    oldGUTI                     [13] EPS5GGUTI OPTIONAL,
+    eMM5GRegStatus              [14] EMM5GMMStatus OPTIONAL
 }
 
 -- See clause 6.2.2.2.3 for details of this structure
@@ -302,7 +305,9 @@ AMFDeregistration ::= SEQUENCE
     gPSI                        [6] GPSI OPTIONAL,
     gUTI                        [7] FiveGGUTI OPTIONAL,
     cause                       [8] FiveGMMCause OPTIONAL,
-    location                    [9] Location OPTIONAL
+    location                    [9] Location OPTIONAL,
+    switchOffIndicator          [10] SwitchOffIndicator OPTIONAL,
+    reRegRequiredIndicator      [11] ReRegRequiredIndicator OPTIONAL
 }
 
 -- See clause 6.2.2.2.4 for details of this structure
@@ -313,7 +318,9 @@ AMFLocationUpdate ::= SEQUENCE
     pEI                         [3] PEI OPTIONAL,
     gPSI                        [4] GPSI OPTIONAL,
     gUTI                        [5] FiveGGUTI OPTIONAL,
-    location                    [6] Location
+    location                    [6] Location,
+    sMSOverNASIndicator         [7] SMSOverNASIndicator OPTIONAL,
+    oldGUTI                     [8] EPS5GGUTI OPTIONAL
 }
 
 -- See clause 6.2.2.2.5 for details of this structure
@@ -330,7 +337,10 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE
     location                    [9] Location OPTIONAL,
     non3GPPAccessEndpoint       [10] UEEndpointAddress OPTIONAL,
     timeOfRegistration          [11] Timestamp OPTIONAL,
-    fiveGSTAIList               [12] TAIList OPTIONAL
+    fiveGSTAIList               [12] TAIList OPTIONAL,
+    sMSOverNASIndicator         [12] SMSOverNASIndicator OPTIONAL,
+    oldGUTI                     [13] EPS5GGUTI OPTIONAL,
+    eMM5GRegStatus              [14] EMM5GMMStatus OPTIONAL
 }
 
 -- See clause 6.2.2.2.6 for details of this structure
@@ -2269,6 +2279,12 @@ RejectedSNSSAI ::= SEQUENCE
 
 RejectedSliceCauseValue ::= INTEGER (0..255)
 
+ReRegRequiredIndicator ::= ENUMERATED
+{
+    reRegistrationRequired(1),
+    reRegistrationNotRequired(2)
+}
+
 RoutingIndicator ::= INTEGER (0..9999)
 
 SchemeOutput ::= OCTET STRING
@@ -2284,6 +2300,13 @@ Slice ::= SEQUENCE
 
 SMPDUDNRequest ::= OCTET STRING
 
+-- TS 24.501 [13], clause 9.11.3.6.1
+SMSOverNASIndicator ::= ENUMERATED
+{
+    sMSOverNASNotAllowed(1),
+    sMSOverNASAllowed(2)
+}
+
 SNSSAI ::= SEQUENCE
 {
     sliceServiceType    [1] INTEGER (0..255),