Merge branch 'cr/33128/0261' into 'meeting/SA94e'

TS 33.128 CR0261 - Addition of PDN Info to SMF Tables

See merge request !102

33128/r17/TS33128Payloads.asn

@@ -1247,7 +1247,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE
     accessType                  [16] AccessType OPTIONAL,
     rATType                     [17] RATType OPTIONAL,
     sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,
-    uEEPSPDNConnection          [19] UEEPSPDNConnection OPTIONAL
+    uEEPSPDNConnection          [19] UEEPSPDNConnection OPTIONAL,
+    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL
 }
 
 -- See clause 6.2.3.2.3 for details of this structure
@@ -1263,7 +1264,8 @@ SMFPDUSessionModification ::= SEQUENCE
     requestType                 [8] FiveGSMRequestType,
     accessType                  [9] AccessType OPTIONAL,
     rATType                     [10] RATType OPTIONAL,
-    pDUSessionID                [11] PDUSessionID OPTIONAL
+    pDUSessionID                [11] PDUSessionID OPTIONAL,
+    ePS5GSComboInfo             [12] EPS5GSComboInfo OPTIONAL
 }
 
 -- See clause 6.2.3.2.4 for details of this structure
@@ -1278,7 +1280,8 @@ SMFPDUSessionRelease ::= SEQUENCE
     uplinkVolume                [7] INTEGER OPTIONAL,
     downlinkVolume              [8] INTEGER OPTIONAL,
     location                    [9] Location OPTIONAL,
-    cause                       [10] SMFErrorCodes OPTIONAL
+    cause                       [10] SMFErrorCodes OPTIONAL,
+    ePS5GSComboInfo             [11] EPS5GSComboInfo OPTIONAL
 }
 
 -- See clause 6.2.3.2.5 for details of this structure
@@ -1302,7 +1305,8 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
     accessType                  [16] AccessType OPTIONAL,
     rATType                     [17] RATType OPTIONAL,
     sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,
-    timeOfSessionEstablishment  [19] Timestamp OPTIONAL
+    timeOfSessionEstablishment  [19] Timestamp OPTIONAL,
+    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL
 }
 
 -- See clause 6.2.3.2.6 for details of this structure
@@ -1522,6 +1526,49 @@ RequestIndication ::= ENUMERATED
     rELDUETO5GANREQUEST(7)
 }
 
+-- ======================
+-- PGW-C + SMF Parameters
+-- ======================
+
+EPS5GSComboInfo ::= SEQUENCE
+{
+    ePSInterworkingIndication [1] EPSInterworkingIndication,
+    ePSSubscriberIDs          [2] EPSSubscriberIDs,
+    ePSPDNCnxInfo             [3] EPSPDNCnxInfo OPTIONAL,
+    ePSBearerInfo             [4] EPSBearerInfo OPTIONAL
+}
+
+EPSInterworkingIndication ::= ENUMERATED
+{
+    none(1),
+    withN26(2),
+    withoutN26(3),
+    iwkNon3GPP(4)
+}
+
+EPSSubscriberIDs ::= SEQUENCE
+{
+    iMSI   [1] IMSI OPTIONAL,
+    mSISDN [2] MSISDN OPTIONAL,
+    iMEI   [3] IMEI OPTIONAL
+}
+
+EPSPDNCnxInfo ::= SEQUENCE
+{
+    pGWS8ControlPlaneFTEID [1] FTEID,
+    linkedBearerID         [2] EPSBearerID OPTIONAL
+}
+
+EPSBearerInfo ::= SEQUENCE OF EPSBearers
+
+EPSBearers ::= SEQUENCE
+{
+    ePSBearerID         [1] EPSBearerID,
+    pGWS8UserPlaneFTEID [2] FTEID,
+    qCI                 [3] QCI
+}
+
+QCI ::= INTEGER (0..255)
 -- ==================
 -- 5G UPF definitions
 -- ==================
@@ -4013,4 +4060,4 @@ OGCURN ::= UTF8String
 -- TS 29.572 [24], clause 6.1.6.2.15
 MethodCode ::= INTEGER (16..31)
 
-END
\ No newline at end of file
+END