diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4e3df33f5089456fc4d64b9dcd03d40ab38864c..c54d13097bf4d808ae1d7dd2b4b551c86df80e22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,47 @@ +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH + stages: - check + - build process_asn: - image: "mcanterb/asn1test:latest" + image: "forge.3gpp.org:5050/sa3/li/asn1test:latest" stage: check interruptible: true script: - python3 testing/asn_process.py process_xsd: - image: "mcanterb/xsdtest:latest" + image: "forge.3gpp.org:5050/sa3/li/xsdtest:latest" stage: check interruptible: true script: - python3 testing/xsd_process.py +generate_artefacts: + image: "forge.3gpp.org:5050/sa3/li/artefacts:latest" + stage: build + interruptible: true + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + script: + - echo $CI_PROJECT_ID + - echo $CI_PROJECT_NAME + - echo $CI_PROJECT_PATH + - echo $CI_PIPELINE_SOURCE + - echo $CI_OPEN_MERGE_REQUESTS + - echo $CI_MERGE_REQUEST_IID + - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + - echo $ARTEFACT_NAME + - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + artifacts: + untracked: true + paths: + - "*.docx" + name: $CI_MERGE_REQUEST_TITLE + expire_in: 30 days diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 3ce8d6a07062d9fa58afb21943ece1d9549625de..6576c098961d79b55661c2e2f7236a7aea5b0869 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version11(11)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version10(10)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version11(11)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -2296,16 +2296,23 @@ SUPIUnauthenticatedIndication ::= BOOLEAN TargetIdentifier ::= CHOICE { - sUPI [1] SUPI, - iMSI [2] IMSI, - pEI [3] PEI, - iMEI [4] IMEI, - gPSI [5] GPSI, - mSISDN [6] MSISDN, - nAI [7] NAI, - iPv4Address [8] IPv4Address, - iPv6Address [9] IPv6Address, - ethernetAddress [10] MACAddress + sUPI [1] SUPI, + iMSI [2] IMSI, + pEI [3] PEI, + iMEI [4] IMEI, + gPSI [5] GPSI, + mSISDN [6] MSISDN, + nAI [7] NAI, + iPv4Address [8] IPv4Address, + iPv6Address [9] IPv6Address, + ethernetAddress [10] MACAddress, + iMPU [11] IMPU, + iMPI [12] IMPI, + e164Number [13] E164Number, + emailAddress [14] EmailAddress, + mCPTTID [15] UTF8String, + instanceIdentifierURN [16] UTF8String, + pTCChatGroupID [17] PTCChatGroupID } TargetIdentifierProvenance ::= ENUMERATED diff --git a/33128/r17/TS33128IdentityAssociation.asn b/33128/r17/TS33128IdentityAssociation.asn index 707aaa27da1deeba4edd67c8676e7299731b03fc..72d66c5ef3582b521e5b6947763d5e5ae9202fc8 100644 --- a/33128/r17/TS33128IdentityAssociation.asn +++ b/33128/r17/TS33128IdentityAssociation.asn @@ -104,4 +104,4 @@ GPSI ::= CHOICE MSISDN ::= NumericString (SIZE(1..15)) -END \ No newline at end of file +END diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index b0469013f0af6177cd40b5320a22b5b774155a8a..1304ee377f4ad5586c008855debf20ff46c6a267 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version4(4)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version5(5)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version4(4)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version5(5)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -1152,7 +1152,8 @@ AMFRegistration ::= SEQUENCE oldGUTI [13] EPS5GGUTI OPTIONAL, eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL, nonIMEISVPEI [15] NonIMEISVPEI OPTIONAL, - mACRestIndicator [16] MACRestrictionIndicator OPTIONAL + mACRestIndicator [16] MACRestrictionIndicator OPTIONAL, + pagingRestrictionIndicator [17] PagingRestrictionIndicator OPTIONAL } -- See clause 6.2.2.2.3 for details of this structure @@ -1277,7 +1278,10 @@ AMFRegistrationType ::= ENUMERATED initial(1), mobility(2), periodic(3), - emergency(4) + emergency(4), + sNPNOnboarding(5), + disasterMobility(6), + disasterInitial(7) } AMFSetID ::= INTEGER (0..1023) @@ -1289,32 +1293,33 @@ AMFSetID ::= INTEGER (0..1023) -- See clause 6.2.3.2.2 for details of this structure SMFPDUSessionEstablishment ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - gTPTunnelID [6] FTEID, - pDUSessionType [7] PDUSessionType, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, - non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, - location [11] Location OPTIONAL, - dNN [12] DNN, - aMFID [13] AMFID OPTIONAL, - hSMFURI [14] HSMFURI OPTIONAL, - requestType [15] FiveGSMRequestType, - accessType [16] AccessType OPTIONAL, - rATType [17] RATType OPTIONAL, - sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, - uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL, - ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, - selectedDNN [21] DNN OPTIONAL, - servingNetwork [22] SMFServingNetwork OPTIONAL, - oldPDUSessionID [23] PDUSessionID OPTIONAL, - handoverState [24] HandoverState OPTIONAL, - gTPTunnelInfo [25] GTPTunnelInfo OPTIONAL, - pCCRules [26] PCCRuleSet OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + gTPTunnelID [6] FTEID, + pDUSessionType [7] PDUSessionType, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, + location [11] Location OPTIONAL, + dNN [12] DNN, + aMFID [13] AMFID OPTIONAL, + hSMFURI [14] HSMFURI OPTIONAL, + requestType [15] FiveGSMRequestType, + accessType [16] AccessType OPTIONAL, + rATType [17] RATType OPTIONAL, + sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, + uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, + selectedDNN [21] DNN OPTIONAL, + servingNetwork [22] SMFServingNetwork OPTIONAL, + oldPDUSessionID [23] PDUSessionID OPTIONAL, + handoverState [24] HandoverState OPTIONAL, + gTPTunnelInfo [25] GTPTunnelInfo OPTIONAL, + pCCRules [26] PCCRuleSet OPTIONAL, + ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL } -- See clause 6.2.3.2.3 for details of this structure @@ -1336,7 +1341,10 @@ SMFPDUSessionModification ::= SEQUENCE servingNetwork [14] SMFServingNetwork OPTIONAL, handoverState [15] HandoverState OPTIONAL, gTPTunnelInfo [16] GTPTunnelInfo OPTIONAL, - pCCRules [17] PCCRuleSet OPTIONAL + pCCRules [17] PCCRuleSet OPTIONAL, + ePSPDNConnectionModification[18] EPSPDNConnectionModification OPTIONAL, + uPPathChange [19] UPPathChange OPTIONAL, + pFDDataForApp [20] PFDDataForApp OPTIONAL } -- See clause 6.2.3.2.4 for details of this structure @@ -1355,36 +1363,39 @@ SMFPDUSessionRelease ::= SEQUENCE ePS5GSComboInfo [11] EPS5GSComboInfo OPTIONAL, nGAPCause [12] NGAPCauseInt OPTIONAL, fiveGMMCause [13] FiveGMMCause OPTIONAL, - pCCRuleIDs [14] PCCRuleIDSet OPTIONAL + pCCRuleIDs [14] PCCRuleIDSet OPTIONAL, + ePSPDNConnectionRelease [15] EPSPDNConnectionRelease OPTIONAL } -- See clause 6.2.3.2.5 for details of this structure SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - gTPTunnelID [6] FTEID, - pDUSessionType [7] PDUSessionType, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress, - non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, - location [11] Location OPTIONAL, - dNN [12] DNN, - aMFID [13] AMFID OPTIONAL, - hSMFURI [14] HSMFURI OPTIONAL, - requestType [15] FiveGSMRequestType, - accessType [16] AccessType OPTIONAL, - rATType [17] RATType OPTIONAL, - sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, - timeOfSessionEstablishment [19] Timestamp OPTIONAL, - ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, - uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL, - servingNetwork [22] SMFServingNetwork OPTIONAL, - gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + gTPTunnelID [6] FTEID, + pDUSessionType [7] PDUSessionType, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, + location [11] Location OPTIONAL, + dNN [12] DNN, + aMFID [13] AMFID OPTIONAL, + hSMFURI [14] HSMFURI OPTIONAL, + requestType [15] FiveGSMRequestType, + accessType [16] AccessType OPTIONAL, + rATType [17] RATType OPTIONAL, + sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, + timeOfSessionEstablishment [19] Timestamp OPTIONAL, + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, + uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL, + servingNetwork [22] SMFServingNetwork OPTIONAL, + gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, + pCCRules [24] PCCRuleSet OPTIONAL, + ePSStartOfInterceptionWithEstablishedPDNConnection [25] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL, + pFDDataForApps [26] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -1485,7 +1496,9 @@ SMFMAPDUSessionModification ::= SEQUENCE uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL, ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL, handoverState [18] HandoverState OPTIONAL, - pCCRules [19] PCCRuleSet OPTIONAL + pCCRules [19] PCCRuleSet OPTIONAL, + uPPathChange [20] UPPathChange OPTIONAL, + pFDDataForApp [21] PFDDataForApp OPTIONAL } -- See clause 6.2.3.2.7.3 for details of this structure @@ -1532,7 +1545,8 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE aTSSSContainer [21] ATSSSContainer OPTIONAL, ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL, uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL + pCCRules [24] PCCRuleSet OPTIONAL, + pFDDataForApps [25] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.7.5 for details of this structure @@ -1713,6 +1727,19 @@ PCCRule ::= SEQUENCE eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } +--See clause table 5.6.2.5-1 of TS 29.508 [90] for the details of this structure. +UPPathChange ::= SEQUENCE +{ + sourceDNAI [1] DNAI OPTIONAL, + targetDNAI [2] DNAI OPTIONAL, + dNAIChangeType [3] DNAIChangeType OPTIONAL, + sourceUEIPAddr [4] IPAddress OPTIONAL, + targetUEIPAddr [5] IPAddress OPTIONAL, + sourceTrafficRouting [6] RouteToLocation OPTIONAL, + targetTrafficRouting [7] RouteToLocation OPTIONAL, + mACAddress [8] MACAddress OPTIONAL +} + -- See table 5.6.2.14-1 of TS 29.512 [89] PCCRuleID ::= UTF8String @@ -1848,10 +1875,155 @@ EASServerAddress ::= SEQUENCE port [2] PortNumber } +-- ================================ +-- PGW-C + SMF PDNConnection Events +-- ================================ + +EPSPDNConnectionEstablishment ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL, + pDNConnectionType [5] PDNConnectionType, + uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL, + location [8] Location OPTIONAL, + additionalLocation [9] Location OPTIONAL, + aPN [10] APN, + requestType [11] EPSPDNConnectionRequestType OPTIONAL, + accessType [12] AccessType OPTIONAL, + rATType [13] RATType OPTIONAL, + protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL, + bearerContextsCreated [17] SEQUENCE OF EPSBearerContextCreated, + bearerContextsMarkedForRemoval [18] SEQUENCE OF EPSBearerContextForRemoval OPTIONAL, + indicationFlags [19] PDNConnectionIndicationFlags OPTIONAL, + handoverIndication [20] PDNHandoverIndication OPTIONAL, + nBIFOMSupport [21] PDNNBIFOMSupport OPTIONAL, + fiveGSInterworkingInfo [22] FiveGSInterworkingInfo OPTIONAL, + cSRMFI [23] CSRMFI OPTIONAL, + restorationOfPDNConnectionsSupport [24] RestorationOfPDNConnectionsSupport OPTIONAL, + pGWChangeIndication [25] PGWChangeIndication OPTIONAL, + pGWRNSI [26] PGWRNSI OPTIONAL +} + +EPSPDNConnectionModification ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL, + pDNConnectionType [5] PDNConnectionType, + uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL, + location [8] Location OPTIONAL, + additionalLocation [9] Location OPTIONAL, + aPN [10] APN, + requestType [11] EPSPDNConnectionRequestType OPTIONAL, + accessType [12] AccessType OPTIONAL, + rATType [13] RATType OPTIONAL, + protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL, + bearerContextsCreated [17] SEQUENCE OF EPSBearerContextCreated OPTIONAL, + bearerConcextsModified [18] SEQUENCE OF EPSBearerContextModified, + bearerContextsMarkedForRemoval [19] SEQUENCE OF EPSBearerContextForRemoval OPTIONAL, + bearersDeleted [20] SEQUENCE OF EPSBearersDeleted OPTIONAL, + indicationFlags [21] PDNConnectionIndicationFlags OPTIONAL, + handoverIndication [22] PDNHandoverIndication OPTIONAL, + nBIFOMSupport [23] PDNNBIFOMSupport OPTIONAL, + fiveGSInterworkingInfo [24] FiveGSInterworkingInfo OPTIONAL, + cSRMFI [25] CSRMFI OPTIONAL, + restorationOfPDNConnectionsSupport [26] RestorationOfPDNConnectionsSupport OPTIONAL, + pGWChangeIndication [27] PGWChangeIndication OPTIONAL, + pGWRNSI [28] PGWRNSI OPTIONAL +} + +EPSPDNConnectionRelease ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + location [4] Location OPTIONAL, + gTPTunnelInfo [5] GTPTunnelInfo OPTIONAL, + rANNASCause [6] EPSRANNASCause OPTIONAL, + pDNConnectionType [7] PDNConnectionType, + indicationFlags [8] PDNConnectionIndicationFlags OPTIONAL, + scopeIndication [9] EPSPDNConnectionReleaseScopeIndication OPTIONAL, + bearersDeleted [10] SEQUENCE OF EPSBearersDeleted OPTIONAL +} + +EPSStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL, + pDNConnectionType [5] PDNConnectionType, + uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL, + location [8] Location OPTIONAL, + additionalLocation [9] Location OPTIONAL, + aPN [10] APN, + requestType [11] EPSPDNConnectionRequestType OPTIONAL, + accessType [12] AccessType OPTIONAL, + rATType [13] RATType OPTIONAL, + protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL, + bearerContexts [17] SEQUENCE OF EPSBearerContext +} + +PFDDataForApps ::= SET OF PFDDataForApp + +PFDDataForApp ::= SEQUENCE +{ + aPPId [1] UTF8String, + pFDs [2] PFDs +} + +PFDs ::= SET OF PFD + +-- See table 5.6.2.5-1 of TS 29.551 [94] +PFD ::= SEQUENCE +{ + pFDId [1] UTF8String, + pFDFlowDescriptions [2] PFDFlowDescriptions, + urls [3] PFDURLs, + domainNames [4] DomainNames, + dnProtocol [5] DnProtocol +} + +PFDURLs ::= SET OF UTF8String + +PFDFlowDescriptions ::= SET OF PFDFlowDescription + +DomainNames ::= SET OF UTF8String + +PFDFlowDescription ::= SEQUENCE +{ + nextLayerProtocol [1] NextLayerProtocol, + serverIPAddress [2] IPAddress, + serverPortNumber [3] PortNumber +} + +-- See table 5.14.2.2.4-1 of TS 29.122 [63] +DnProtocol ::= ENUMERATED +{ + dnsQname(1), + tlsSni(2), + tlsSan(3), + tlsScn(4) +} + -- ====================== -- PGW-C + SMF Parameters -- ====================== +CSRMFI ::= BOOLEAN + EPS5GSComboInfo ::= SEQUENCE { ePSInterworkingIndication [1] EPSInterworkingIndication, @@ -1890,13 +2062,154 @@ EPSBearers ::= SEQUENCE qCI [3] QCI } +EPSBearerContext ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + uPGTPTunnelInfo [2] GTPTunnelInfo, + bearerQOS [3] EPSBearerQOS +} + +EPSBearerContextCreated ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + cause [2] EPSBearerCreationCauseValue, + gTPTunnelInfo [3] GTPTunnelInfo OPTIONAL, + bearerQOS [4] EPSBearerQOS OPTIONAL, + protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL +} + +EPSBearerContextModified ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + cause [2] EPSBearerModificationCauseValue, + gTPTunnelInfo [3] GTPTunnelInfo OPTIONAL, + bearerQOS [4] EPSBearerQOS OPTIONAL, + protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL +} + +EPSBearersDeleted ::= SEQUENCE +{ + linkedEPSBearerID [1] EPSBearerID OPTIONAL, + ePSBearerIDs [2] SEQUENCE OF EPSBearerID OPTIONAL, + protocolConfigurationOptions [3] PDNProtocolConfigurationOptions OPTIONAL, + cause [4] EPSBearerDeletionCauseValue OPTIONAL, + deleteBearerResponse [5] EPSDeleteBearerResponse +} + +EPSDeleteBearerResponse ::= SEQUENCE +{ + cause [1] EPSBearerDeletionCauseValue, + linkedEPSBearerID [2] EPSBearerID OPTIONAL, + bearerContexts [3] SEQUENCE OF EPSDeleteBearerContext OPTIONAL, + protocolConfigurationOptions [4] PDNProtocolConfigurationOptions OPTIONAL +} + +EPSDeleteBearerContext ::= SEQUENCE +{ + cause [1] EPSBearerDeletionCauseValue, + ePSBearerID [2] EPSBearerID, + protocolConfigurationOptions [3] PDNProtocolConfigurationOptions OPTIONAL, + rANNASCause [4] EPSRANNASCause OPTIONAL +} + +EPSBearerContextForRemoval ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + cause [2] EPSBearerRemovalCauseValue +} + +EPSBearerCreationCauseValue ::= INTEGER (0..255) + +EPSBearerDeletionCauseValue ::= INTEGER (0..255) + +EPSBearerModificationCauseValue ::= INTEGER (0..255) + +EPSBearerRemovalCauseValue ::= INTEGER (0..255) + +EPSBearerQOS ::= SEQUENCE +{ + qCI [1] QCI OPTIONAL, + maximumUplinkBitRate [2] BitrateBinKBPS OPTIONAL, + maximumDownlinkBitRate [3] BitrateBinKBPS OPTIONAL, + guaranteedUplinkBitRate [4] BitrateBinKBPS OPTIONAL, + guaranteedDownlinkBitRate [5] BitrateBinKBPS OPTIONAL, + priorityLevel [6] EPSQOSPriority OPTIONAL +} + +EPSRANNASCause ::= OCTET STRING + +EPSQOSPriority ::= INTEGER (1..15) + +BitrateBinKBPS ::= OCTET STRING + +EPSGTPTunnels ::= SEQUENCE +{ + controlPlaneSenderFTEID [1] FTEID OPTIONAL, + controlPlanePGWS5S8FTEID [2] FTEID OPTIONAL, + s1UeNodeBFTEID [3] FTEID OPTIONAL, + s5S8SGWFTEID [4] FTEID OPTIONAL, + s5S8PGWFTEID [5] FTEID OPTIONAL, + s2bUePDGFTEID [6] FTEID OPTIONAL, + s2aUePDGFTEID [7] FTEID OPTIONAL +} + +EPSPDNConnectionRequestType ::= ENUMERATED +{ + initialRequest(1), + handover(2), + rLOS(3), + emergency(4), + handoverOfEmergencyBearerServices(5), + reserved(6) +} + +EPSPDNConnectionReleaseScopeIndication ::= BOOLEAN + +FiveGSInterworkingInfo ::= SEQUENCE +{ + fiveGSInterworkingIndicator [1] FiveGSInterworkingIndicator, + fiveGSInterworkingWithoutN26 [2] FiveGSInterworkingWithoutN26, + fiveGCNotRestrictedSupport [3] FiveGCNotRestrictedSupport +} + +FiveGSInterworkingIndicator ::= BOOLEAN + +FiveGSInterworkingWithoutN26 ::= BOOLEAN + +FiveGCNotRestrictedSupport ::= BOOLEAN + +PDNConnectionIndicationFlags ::= OCTET STRING + +PDNHandoverIndication ::= BOOLEAN + +PDNNBIFOMSupport ::= BOOLEAN + +PDNProtocolConfigurationOptions ::= SEQUENCE +{ + requestPCO [1] PDNPCO OPTIONAL, + requestAPCO [2] PDNPCO OPTIONAL, + requestEPCO [3] PDNPCO OPTIONAL, + responsePCO [4] PDNPCO OPTIONAL, + responseAPCO [5] PDNPCO OPTIONAL, + responseEPCO [6] PDNPCO OPTIONAL +} + +PDNPCO ::= OCTET STRING + +PGWChangeIndication ::= BOOLEAN + +PGWRNSI ::= BOOLEAN + QCI ::= INTEGER (0..255) GTPTunnelInfo ::= SEQUENCE { - fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL + fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL, + ePSGTPTunnels [2] EPSGTPTunnels OPTIONAL } +RestorationOfPDNConnectionsSupport ::= BOOLEAN + -- ================== -- 5G UPF definitions -- ================== @@ -1936,7 +2249,8 @@ UDMServingSystemMessage ::= SEQUENCE gUMMEI [5] GUMMEI OPTIONAL, pLMNID [6] PLMNID OPTIONAL, servingSystemMethod [7] UDMServingSystemMethod, - serviceID [8] ServiceID OPTIONAL + serviceID [8] ServiceID OPTIONAL, + roamingIndicator [9] RoamingIndicator OPTIONAL } UDMSubscriberRecordChangeMessage ::= SEQUENCE @@ -2095,6 +2409,9 @@ UDMInvalidParameters ::= SEQUENCE parameter [1] UTF8String OPTIONAL, reason [2] UTF8String OPTIONAL } + +RoamingIndicator ::= BOOLEAN + -- =================== -- 5G SMSF definitions -- =================== @@ -3426,7 +3743,8 @@ PDSummaryReport ::= SEQUENCE firstPacketTimestamp [10] Timestamp, lastPacketTimestamp [11] Timestamp, packetCount [12] INTEGER, - byteCount [13] INTEGER + byteCount [13] INTEGER, + perSessionTrigger [14] BOOLEAN } -- ==================== @@ -3842,6 +4160,8 @@ IMPU ::= CHOICE IMSI ::= NumericString (SIZE(6..15)) +IMSIUnauthenticatedIndication ::= BOOLEAN + Initiator ::= ENUMERATED { uE(1), @@ -3898,17 +4218,29 @@ NonLocalID ::= ENUMERATED NonIMEISVPEI ::= CHOICE { - mACAddress [1] MACAddress + mACAddress [1] MACAddress, + eUI64 [2] EUI64 } NSSAI ::= SEQUENCE OF SNSSAI +PagingRestrictionIndicator ::= OCTET STRING (SIZE(1..33)) + PLMNID ::= SEQUENCE { mCC [1] MCC, mNC [2] MNC } +PDNConnectionType ::= ENUMERATED +{ + iPv4(1), + iPv6(2), + iPv4v6(3), + nonIP(4), + ethernet(5) +} + PDUSessionID ::= INTEGER (0..255) PDUSessionType ::= ENUMERATED @@ -4048,16 +4380,23 @@ SwitchOffIndicator ::= ENUMERATED TargetIdentifier ::= CHOICE { - sUPI [1] SUPI, - iMSI [2] IMSI, - pEI [3] PEI, - iMEI [4] IMEI, - gPSI [5] GPSI, - mSISDN [6] MSISDN, - nAI [7] NAI, - iPv4Address [8] IPv4Address, - iPv6Address [9] IPv6Address, - ethernetAddress [10] MACAddress + sUPI [1] SUPI, + iMSI [2] IMSI, + pEI [3] PEI, + iMEI [4] IMEI, + gPSI [5] GPSI, + mSISDN [6] MSISDN, + nAI [7] NAI, + iPv4Address [8] IPv4Address, + iPv6Address [9] IPv6Address, + ethernetAddress [10] MACAddress, + iMPU [11] IMPU, + iMPI [12] IMPI, + e164Number [13] E164Number, + emailAddress [14] EmailAddress, + mCPTTID [15] UTF8String, + instanceIdentifierURN [16] UTF8String, + pTCChatGroupID [17] PTCChatGroupID } TargetIdentifierProvenance ::= ENUMERATED diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 501e60a866c6202fa1fd46ea7e88e511e902f5cb..1204f498aa3d604843bae5661930ac580a8b6dfb 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ @@ -89,6 +89,7 @@ + @@ -114,7 +115,7 @@ - + @@ -129,7 +130,7 @@ - + @@ -137,6 +138,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -225,4 +248,4 @@ - \ No newline at end of file + diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index d5f9cfef7976d6b5098595cd1df63e755f40c322..5f29b559f82dd822e3f513a351df03ab15f9c662 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,8 +1,8 @@ @@ -86,6 +86,7 @@ + @@ -196,6 +197,7 @@ + @@ -347,4 +349,15 @@ + + + + + + + + + + + diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 30502982f8b6e32282e34f239168ead7b2245977..95a474f32b01f627ae891968b6cea316d76f6da5 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version0(0)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version1(1)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version0(0)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version1(1)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -194,7 +194,18 @@ XIRIEvent ::= CHOICE -- AMF events, see 6.2.2.2.9 continued from choice 5 aMFRANHandoverCommand [113] AMFRANHandoverCommand, - aMFRANHandoverRequest [114] AMFRANHandoverRequest + aMFRANHandoverRequest [114] AMFRANHandoverRequest, + + -- EES events, see clause 7.14.2 + eESEECRegistration [115] EESEECRegistration, + eESEASDiscovery [116] EESEASDiscovery, + eESEASDiscoverySubscription [117] EESEASDiscoverySubscription, + eESEASDiscoveryNotification [118] EESEASDiscoveryNotification, + eESAppContextRelocation [119] EESAppContextRelocation, + eESACRSubscription [120] EESACRSubscription, + eESACRNotification [121] EESACRNotification, + eESEECContextRelocation [122] EESEECContextRelocation, + eESStartOfInterceptionWithRegisteredEEC [123] EESStartOfInterceptionWithRegisteredEEC } -- ============== @@ -379,7 +390,18 @@ IRIEvent ::= CHOICE -- AMF events, see 6.2.2.2.9 continued from choice 5 aMFRANHandoverCommand [113] AMFRANHandoverCommand, - aMFRANHandoverRequest [114] AMFRANHandoverRequest + aMFRANHandoverRequest [114] AMFRANHandoverRequest, + + -- EES events, see clause 7.14.2 + eESEECRegistration [115] EESEECRegistration, + eESEASDiscovery [116] EESEASDiscovery, + eESEASDiscoverySubscription [117] EESEASDiscoverySubscription, + eESEASDiscoveryNotification [118] EESEASDiscoveryNotification, + eESAppContextRelocation [119] EESAppContextRelocation, + eESACRSubscription [120] EESACRSubscription, + eESACRNotification [121] EESACRNotification, + eESEECContextRelocation [122] EESEECContextRelocation, + eESStartOfInterceptionWithRegisteredEEC [123] EESStartOfInterceptionWithRegisteredEEC } IRITargetIdentifier ::= SEQUENCE @@ -452,6 +474,7 @@ S8HRBearerInfo ::= SEQUENCE -- ================ -- HR LI parameters + -- ================ N9HRMessageCause ::= ENUMERATED @@ -1158,7 +1181,8 @@ AMFRegistration ::= SEQUENCE oldGUTI [13] EPS5GGUTI OPTIONAL, eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL, nonIMEISVPEI [15] NonIMEISVPEI OPTIONAL, - mACRestIndicator [16] MACRestrictionIndicator OPTIONAL + mACRestIndicator [16] MACRestrictionIndicator OPTIONAL, + pagingRestrictionIndicator [17] PagingRestrictionIndicator OPTIONAL } -- See clause 6.2.2.2.3 for details of this structure @@ -1309,7 +1333,10 @@ AMFRegistrationType ::= ENUMERATED initial(1), mobility(2), periodic(3), - emergency(4) + emergency(4), + sNPNOnboarding(5), + disasterMobility(6), + disasterInitial(7) } AMFSetID ::= INTEGER (0..1023) @@ -1323,32 +1350,33 @@ AMFUENGAPID ::= INTEGER (0..1099511627775) -- See clause 6.2.3.2.2 for details of this structure SMFPDUSessionEstablishment ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - gTPTunnelID [6] FTEID, - pDUSessionType [7] PDUSessionType, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, - non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, - location [11] Location OPTIONAL, - dNN [12] DNN, - aMFID [13] AMFID OPTIONAL, - hSMFURI [14] HSMFURI OPTIONAL, - requestType [15] FiveGSMRequestType, - accessType [16] AccessType OPTIONAL, - rATType [17] RATType OPTIONAL, - sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, - uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL, - ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, - selectedDNN [21] DNN OPTIONAL, - servingNetwork [22] SMFServingNetwork OPTIONAL, - oldPDUSessionID [23] PDUSessionID OPTIONAL, - handoverState [24] HandoverState OPTIONAL, - gTPTunnelInfo [25] GTPTunnelInfo OPTIONAL, - pCCRules [26] PCCRuleSet OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + gTPTunnelID [6] FTEID, + pDUSessionType [7] PDUSessionType, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, + location [11] Location OPTIONAL, + dNN [12] DNN, + aMFID [13] AMFID OPTIONAL, + hSMFURI [14] HSMFURI OPTIONAL, + requestType [15] FiveGSMRequestType, + accessType [16] AccessType OPTIONAL, + rATType [17] RATType OPTIONAL, + sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, + uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, + selectedDNN [21] DNN OPTIONAL, + servingNetwork [22] SMFServingNetwork OPTIONAL, + oldPDUSessionID [23] PDUSessionID OPTIONAL, + handoverState [24] HandoverState OPTIONAL, + gTPTunnelInfo [25] GTPTunnelInfo OPTIONAL, + pCCRules [26] PCCRuleSet OPTIONAL, + ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL } -- See clause 6.2.3.2.3 for details of this structure @@ -1370,7 +1398,10 @@ SMFPDUSessionModification ::= SEQUENCE servingNetwork [14] SMFServingNetwork OPTIONAL, handoverState [15] HandoverState OPTIONAL, gTPTunnelInfo [16] GTPTunnelInfo OPTIONAL, - pCCRules [17] PCCRuleSet OPTIONAL + pCCRules [17] PCCRuleSet OPTIONAL, + ePSPDNConnectionModification[18] EPSPDNConnectionModification OPTIONAL, + uPPathChange [19] UPPathChange OPTIONAL, + pFDDataForApp [20] PFDDataForApp OPTIONAL } -- See clause 6.2.3.2.4 for details of this structure @@ -1389,36 +1420,39 @@ SMFPDUSessionRelease ::= SEQUENCE ePS5GSComboInfo [11] EPS5GSComboInfo OPTIONAL, nGAPCause [12] NGAPCauseInt OPTIONAL, fiveGMMCause [13] FiveGMMCause OPTIONAL, - pCCRuleIDs [14] PCCRuleIDSet OPTIONAL + pCCRuleIDs [14] PCCRuleIDSet OPTIONAL, + ePSPDNConnectionRelease [15] EPSPDNConnectionRelease OPTIONAL } -- See clause 6.2.3.2.5 for details of this structure SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - gTPTunnelID [6] FTEID, - pDUSessionType [7] PDUSessionType, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress, - non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, - location [11] Location OPTIONAL, - dNN [12] DNN, - aMFID [13] AMFID OPTIONAL, - hSMFURI [14] HSMFURI OPTIONAL, - requestType [15] FiveGSMRequestType, - accessType [16] AccessType OPTIONAL, - rATType [17] RATType OPTIONAL, - sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, - timeOfSessionEstablishment [19] Timestamp OPTIONAL, - ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, - uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL, - servingNetwork [22] SMFServingNetwork OPTIONAL, - gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + gTPTunnelID [6] FTEID, + pDUSessionType [7] PDUSessionType, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, + location [11] Location OPTIONAL, + dNN [12] DNN, + aMFID [13] AMFID OPTIONAL, + hSMFURI [14] HSMFURI OPTIONAL, + requestType [15] FiveGSMRequestType, + accessType [16] AccessType OPTIONAL, + rATType [17] RATType OPTIONAL, + sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, + timeOfSessionEstablishment [19] Timestamp OPTIONAL, + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, + uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL, + servingNetwork [22] SMFServingNetwork OPTIONAL, + gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, + pCCRules [24] PCCRuleSet OPTIONAL, + ePSStartOfInterceptionWithEstablishedPDNConnection [25] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL, + pFDDataForApps [26] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -1519,7 +1553,9 @@ SMFMAPDUSessionModification ::= SEQUENCE uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL, ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL, handoverState [18] HandoverState OPTIONAL, - pCCRules [19] PCCRuleSet OPTIONAL + pCCRules [19] PCCRuleSet OPTIONAL, + uPPathChange [20] UPPathChange OPTIONAL, + pFDDataForApp [21] PFDDataForApp OPTIONAL } -- See clause 6.2.3.2.7.3 for details of this structure @@ -1566,7 +1602,8 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE aTSSSContainer [21] ATSSSContainer OPTIONAL, ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL, uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL + pCCRules [24] PCCRuleSet OPTIONAL, + pFDDataForApps [25] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.7.5 for details of this structure @@ -1747,6 +1784,19 @@ PCCRule ::= SEQUENCE eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } +-- See clause table 5.6.2.5-1 of TS 29.508 [90] for the details of this structure. +UPPathChange ::= SEQUENCE +{ + sourceDNAI [1] DNAI OPTIONAL, + targetDNAI [2] DNAI OPTIONAL, + dNAIChangeType [3] DNAIChangeType OPTIONAL, + sourceUEIPAddr [4] IPAddress OPTIONAL, + targetUEIPAddr [5] IPAddress OPTIONAL, + sourceTrafficRouting [6] RouteToLocation OPTIONAL, + targetTrafficRouting [7] RouteToLocation OPTIONAL, + mACAddress [8] MACAddress OPTIONAL +} + -- See table 5.6.2.14-1 of TS 29.512 [89] PCCRuleID ::= UTF8String @@ -1882,10 +1932,155 @@ EASServerAddress ::= SEQUENCE port [2] PortNumber } +-- ================================ +-- PGW-C + SMF PDNConnection Events +-- ================================ + +EPSPDNConnectionEstablishment ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL, + pDNConnectionType [5] PDNConnectionType, + uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL, + location [8] Location OPTIONAL, + additionalLocation [9] Location OPTIONAL, + aPN [10] APN, + requestType [11] EPSPDNConnectionRequestType OPTIONAL, + accessType [12] AccessType OPTIONAL, + rATType [13] RATType OPTIONAL, + protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL, + bearerContextsCreated [17] SEQUENCE OF EPSBearerContextCreated, + bearerContextsMarkedForRemoval [18] SEQUENCE OF EPSBearerContextForRemoval OPTIONAL, + indicationFlags [19] PDNConnectionIndicationFlags OPTIONAL, + handoverIndication [20] PDNHandoverIndication OPTIONAL, + nBIFOMSupport [21] PDNNBIFOMSupport OPTIONAL, + fiveGSInterworkingInfo [22] FiveGSInterworkingInfo OPTIONAL, + cSRMFI [23] CSRMFI OPTIONAL, + restorationOfPDNConnectionsSupport [24] RestorationOfPDNConnectionsSupport OPTIONAL, + pGWChangeIndication [25] PGWChangeIndication OPTIONAL, + pGWRNSI [26] PGWRNSI OPTIONAL +} + +EPSPDNConnectionModification ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL, + pDNConnectionType [5] PDNConnectionType, + uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL, + location [8] Location OPTIONAL, + additionalLocation [9] Location OPTIONAL, + aPN [10] APN, + requestType [11] EPSPDNConnectionRequestType OPTIONAL, + accessType [12] AccessType OPTIONAL, + rATType [13] RATType OPTIONAL, + protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL, + bearerContextsCreated [17] SEQUENCE OF EPSBearerContextCreated OPTIONAL, + bearerConcextsModified [18] SEQUENCE OF EPSBearerContextModified, + bearerContextsMarkedForRemoval [19] SEQUENCE OF EPSBearerContextForRemoval OPTIONAL, + bearersDeleted [20] SEQUENCE OF EPSBearersDeleted OPTIONAL, + indicationFlags [21] PDNConnectionIndicationFlags OPTIONAL, + handoverIndication [22] PDNHandoverIndication OPTIONAL, + nBIFOMSupport [23] PDNNBIFOMSupport OPTIONAL, + fiveGSInterworkingInfo [24] FiveGSInterworkingInfo OPTIONAL, + cSRMFI [25] CSRMFI OPTIONAL, + restorationOfPDNConnectionsSupport [26] RestorationOfPDNConnectionsSupport OPTIONAL, + pGWChangeIndication [27] PGWChangeIndication OPTIONAL, + pGWRNSI [28] PGWRNSI OPTIONAL +} + +EPSPDNConnectionRelease ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + location [4] Location OPTIONAL, + gTPTunnelInfo [5] GTPTunnelInfo OPTIONAL, + rANNASCause [6] EPSRANNASCause OPTIONAL, + pDNConnectionType [7] PDNConnectionType, + indicationFlags [8] PDNConnectionIndicationFlags OPTIONAL, + scopeIndication [9] EPSPDNConnectionReleaseScopeIndication OPTIONAL, + bearersDeleted [10] SEQUENCE OF EPSBearersDeleted OPTIONAL +} + +EPSStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs, + iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL, + defaultBearerID [3] EPSBearerID, + gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL, + pDNConnectionType [5] PDNConnectionType, + uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL, + location [8] Location OPTIONAL, + additionalLocation [9] Location OPTIONAL, + aPN [10] APN, + requestType [11] EPSPDNConnectionRequestType OPTIONAL, + accessType [12] AccessType OPTIONAL, + rATType [13] RATType OPTIONAL, + protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL, + bearerContexts [17] SEQUENCE OF EPSBearerContext +} + +PFDDataForApps ::= SET OF PFDDataForApp + +PFDDataForApp ::= SEQUENCE +{ + aPPId [1] UTF8String, + pFDs [2] PFDs +} + +PFDs ::= SET OF PFD + +-- See clause 5.6.2.5 of TS 29.551 [96] +PFD ::= SEQUENCE +{ + pFDId [1] UTF8String, + pFDFlowDescriptions [2] PFDFlowDescriptions, + urls [3] PFDURLs, + domainNames [4] DomainNames, + dnProtocol [5] DnProtocol +} + +PFDURLs ::= SET OF UTF8String + +PFDFlowDescriptions ::= SET OF PFDFlowDescription + +DomainNames ::= SET OF UTF8String + +PFDFlowDescription ::= SEQUENCE +{ + nextLayerProtocol [1] NextLayerProtocol, + serverIPAddress [2] IPAddress, + serverPortNumber [3] PortNumber +} + +-- See clause 5.14.2.2.4 of TS 29.122 [63] +DnProtocol ::= ENUMERATED +{ + dnsQname(1), + tlsSni(2), + tlsSan(3), + tlsScn(4) +} + -- ====================== -- PGW-C + SMF Parameters -- ====================== +CSRMFI ::= BOOLEAN + EPS5GSComboInfo ::= SEQUENCE { ePSInterworkingIndication [1] EPSInterworkingIndication, @@ -1924,13 +2119,154 @@ EPSBearers ::= SEQUENCE qCI [3] QCI } +EPSBearerContext ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + uPGTPTunnelInfo [2] GTPTunnelInfo, + bearerQOS [3] EPSBearerQOS +} + +EPSBearerContextCreated ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + cause [2] EPSBearerCreationCauseValue, + gTPTunnelInfo [3] GTPTunnelInfo OPTIONAL, + bearerQOS [4] EPSBearerQOS OPTIONAL, + protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL +} + +EPSBearerContextModified ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + cause [2] EPSBearerModificationCauseValue, + gTPTunnelInfo [3] GTPTunnelInfo OPTIONAL, + bearerQOS [4] EPSBearerQOS OPTIONAL, + protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL +} + +EPSBearersDeleted ::= SEQUENCE +{ + linkedEPSBearerID [1] EPSBearerID OPTIONAL, + ePSBearerIDs [2] SEQUENCE OF EPSBearerID OPTIONAL, + protocolConfigurationOptions [3] PDNProtocolConfigurationOptions OPTIONAL, + cause [4] EPSBearerDeletionCauseValue OPTIONAL, + deleteBearerResponse [5] EPSDeleteBearerResponse +} + +EPSDeleteBearerResponse ::= SEQUENCE +{ + cause [1] EPSBearerDeletionCauseValue, + linkedEPSBearerID [2] EPSBearerID OPTIONAL, + bearerContexts [3] SEQUENCE OF EPSDeleteBearerContext OPTIONAL, + protocolConfigurationOptions [4] PDNProtocolConfigurationOptions OPTIONAL +} + +EPSDeleteBearerContext ::= SEQUENCE +{ + cause [1] EPSBearerDeletionCauseValue, + ePSBearerID [2] EPSBearerID, + protocolConfigurationOptions [3] PDNProtocolConfigurationOptions OPTIONAL, + rANNASCause [4] EPSRANNASCause OPTIONAL +} + +EPSBearerContextForRemoval ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + cause [2] EPSBearerRemovalCauseValue +} + +EPSBearerCreationCauseValue ::= INTEGER (0..255) + +EPSBearerDeletionCauseValue ::= INTEGER (0..255) + +EPSBearerModificationCauseValue ::= INTEGER (0..255) + +EPSBearerRemovalCauseValue ::= INTEGER (0..255) + +EPSBearerQOS ::= SEQUENCE +{ + qCI [1] QCI OPTIONAL, + maximumUplinkBitRate [2] BitrateBinKBPS OPTIONAL, + maximumDownlinkBitRate [3] BitrateBinKBPS OPTIONAL, + guaranteedUplinkBitRate [4] BitrateBinKBPS OPTIONAL, + guaranteedDownlinkBitRate [5] BitrateBinKBPS OPTIONAL, + priorityLevel [6] EPSQOSPriority OPTIONAL +} + +EPSRANNASCause ::= OCTET STRING + +EPSQOSPriority ::= INTEGER (1..15) + +BitrateBinKBPS ::= OCTET STRING + +EPSGTPTunnels ::= SEQUENCE +{ + controlPlaneSenderFTEID [1] FTEID OPTIONAL, + controlPlanePGWS5S8FTEID [2] FTEID OPTIONAL, + s1UeNodeBFTEID [3] FTEID OPTIONAL, + s5S8SGWFTEID [4] FTEID OPTIONAL, + s5S8PGWFTEID [5] FTEID OPTIONAL, + s2bUePDGFTEID [6] FTEID OPTIONAL, + s2aUePDGFTEID [7] FTEID OPTIONAL +} + +EPSPDNConnectionRequestType ::= ENUMERATED +{ + initialRequest(1), + handover(2), + rLOS(3), + emergency(4), + handoverOfEmergencyBearerServices(5), + reserved(6) +} + +EPSPDNConnectionReleaseScopeIndication ::= BOOLEAN + +FiveGSInterworkingInfo ::= SEQUENCE +{ + fiveGSInterworkingIndicator [1] FiveGSInterworkingIndicator, + fiveGSInterworkingWithoutN26 [2] FiveGSInterworkingWithoutN26, + fiveGCNotRestrictedSupport [3] FiveGCNotRestrictedSupport +} + +FiveGSInterworkingIndicator ::= BOOLEAN + +FiveGSInterworkingWithoutN26 ::= BOOLEAN + +FiveGCNotRestrictedSupport ::= BOOLEAN + +PDNConnectionIndicationFlags ::= OCTET STRING + +PDNHandoverIndication ::= BOOLEAN + +PDNNBIFOMSupport ::= BOOLEAN + +PDNProtocolConfigurationOptions ::= SEQUENCE +{ + requestPCO [1] PDNPCO OPTIONAL, + requestAPCO [2] PDNPCO OPTIONAL, + requestEPCO [3] PDNPCO OPTIONAL, + responsePCO [4] PDNPCO OPTIONAL, + responseAPCO [5] PDNPCO OPTIONAL, + responseEPCO [6] PDNPCO OPTIONAL +} + +PDNPCO ::= OCTET STRING + +PGWChangeIndication ::= BOOLEAN + +PGWRNSI ::= BOOLEAN + QCI ::= INTEGER (0..255) GTPTunnelInfo ::= SEQUENCE { - fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL + fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL, + ePSGTPTunnels [2] EPSGTPTunnels OPTIONAL } +RestorationOfPDNConnectionsSupport ::= BOOLEAN + -- ================== -- 5G UPF definitions -- ================== @@ -1970,7 +2306,8 @@ UDMServingSystemMessage ::= SEQUENCE gUMMEI [5] GUMMEI OPTIONAL, pLMNID [6] PLMNID OPTIONAL, servingSystemMethod [7] UDMServingSystemMethod, - serviceID [8] ServiceID OPTIONAL + serviceID [8] ServiceID OPTIONAL, + roamingIndicator [9] RoamingIndicator OPTIONAL } UDMSubscriberRecordChangeMessage ::= SEQUENCE @@ -2129,6 +2466,9 @@ UDMInvalidParameters ::= SEQUENCE parameter [1] UTF8String OPTIONAL, reason [2] UTF8String OPTIONAL } + +RoamingIndicator ::= BOOLEAN + -- =================== -- 5G SMSF definitions -- =================== @@ -3414,6 +3754,376 @@ RCDDisplayInfo ::= SEQUENCE jcl [3] OCTET STRING OPTIONAL } +-- ================= +-- EES definitions +-- ================= + +-- See clause 7.14.2.2 for details of this structure +EESEECRegistration ::= SEQUENCE +{ + registrationType [1] RegistrationType, + eECID [2] UTF8String, + gPSI [3] GPSI OPTIONAL, + aCProfiles [4] ACProfiles OPTIONAL, + eECServiceContSupport [5] ACRScenarios OPTIONAL, + expirationTime [6] Timestamp OPTIONAL, + eECContextID [7] UTF8String OPTIONAL, + srcEESID [8] UTF8String OPTIONAL, + unfulfilledACProfiles [9] UnfulfilledACProfiles OPTIONAL, + failureResponse [10] FailureResponse OPTIONAL +} + +-- See clause 7.14.2.3 for details of this structure +EESEASDiscovery ::= SEQUENCE +{ + eECID [1] UTF8String, + gPSI [2] GPSI OPTIONAL, + eASDiscoveryFilter [3] EASDiscoveryFilter OPTIONAL, + eECServiceContSupport [4] ACRScenarios OPTIONAL, + uELocation [5] Location OPTIONAL, + eASTargetDNAIs [6] DNAIs OPTIONAL, + discoveredEAS [7] DiscoveredEAS OPTIONAL, + failureResponse [8] FailureResponse OPTIONAL +} + +-- See clause 7.14.2.4 for details of this structure +EESEASDiscoverySubscription ::= SEQUENCE +{ + eECID [1] UTF8String, + gPSI [2] GPSI OPTIONAL, + subscriptionType [3] SubscriptionType, + eASEventType [4] EASEventType, + eASDiscoveryFilter [5] EASDiscoveryFilter OPTIONAL, + eASDynamicInfoFilter [6] EASDynamicInfoFilter OPTIONAL, + eECServiceContSupport [7] ACRScenarios OPTIONAL, + expirationTime [8] Timestamp OPTIONAL, + subscriptionId [9] UTF8String OPTIONAL, + failureResponse [10] FailureResponse OPTIONAL +} + +-- See clause 7.14.2.5 for details of this structure +EESEASDiscoveryNotification ::= SEQUENCE +{ + subscriptionID [1] UTF8String, + eventType [2] EASEventType, + discoveredEAS [3] DiscoveredEAS, + failureResponse [4] FailureResponse OPTIONAL +} + +-- See clause 7.14.2.6 for details of this structure +EESAppContextRelocation ::= SEQUENCE +{ + eECID [1] UTF8String, + gPSI [2] GPSI OPTIONAL, + eESACRDetOrInit [3] EESACRDetOrInit +} + +EESACRDetOrInit ::= CHOICE +{ + aCRDetermineReq [1] ACRDetermineReq, + aCRInitiateReq [2] ACRInitiateReq +} + +ACRDetermineReq ::= SEQUENCE +{ + eASID [1] EASID OPTIONAL, + aCID [2] ACID OPTIONAL, + sEASEndpoint [3] EASEndpoint +} + +ACRInitiateReq ::= SEQUENCE +{ + eASID [1] EASID OPTIONAL, + aCID [2] ACID OPTIONAL, + tEASEndpoint [3] EASEndpoint, + sEASEndpoint [4] EASEndpoint OPTIONAL, + previousTEASEndpoint [5] EASEndpoint OPTIONAL, + routeReq [6] RouteToLocation OPTIONAL +} + +-- See clause 7.14.2.7 for details of this structure +EESACRSubscription ::= SEQUENCE +{ + eECID [1] UTF8String, + gPSI [2] GPSI OPTIONAL, + subscriptionType [3] SubscriptionType, + expirationTime [4] Timestamp OPTIONAL, + eASIDs [5] EASIDs, + aCIDs [6] ACIDs OPTIONAL, + eventIDs [7] ACREventIDs OPTIONAL, + subscriptionId [8] UTF8String OPTIONAL, + failureResponse [9] FailureResponse OPTIONAL +} + +-- See clause 7.14.2.8 for details of this structure +EESACRNotification ::= SEQUENCE +{ + subscriptionID [1] UTF8String, + eASID [2] EASID, + eventID [3] ACREventIDs, + targetInfo [4] TargetInfo OPTIONAL, + aCRRes [5] BOOLEAN OPTIONAL, + failReason [6] UTF8String OPTIONAL +} + +-- See clause 7.14.2.9 for details of this structure +EESEECContextRelocation ::= SEQUENCE +{ + eECID [1] UTF8String, + eECContextID [2] UTF8String, + gPSI [3] GPSI OPTIONAL, + uELoc [4] Location OPTIONAL, + aCProfiles [5] ACProfiles OPTIONAL +} + +-- See clause 7.14.2.10 for details of this structure +EESStartOfInterceptionWithRegisteredEEC ::= SEQUENCE +{ + eECID [1] UTF8String, + gPSI [2] GPSI OPTIONAL, + aCProfiles [3] ACProfiles OPTIONAL, + eECServiceContSupport [4] ACRScenarios OPTIONAL, + expirationTime [5] Timestamp OPTIONAL, + eECContextID [6] UTF8String OPTIONAL, + srcEESID [7] UTF8String OPTIONAL, + unfulfilledACProfiles [8] UnfulfilledACProfiles OPTIONAL, + timeOfRegistration [9] Timestamp OPTIONAL +} + +-- ============== +-- EES parameters +-- ============== + +RegistrationType ::= ENUMERATED +{ + registration (1), + registrationUpdate(2), + deregistration(3) +} + +ACProfiles ::= SET OF ACProfile + +ACProfile ::= SEQUENCE +{ + aCID [1] ACID, + aCType [2] UTF8String OPTIONAL, + aCSchedule [3] Daytime OPTIONAL, + expACGeoServArea [4] Location OPTIONAL, + eASsInfo [5] EASsInfo OPTIONAL, + aCServiceContSupport [6] ACRScenarios OPTIONAL +} + +ACID ::= UTF8String + +ACRScenarios ::= SET OF ACRScenario + +ACRScenario ::= ENUMERATED +{ + eECInitiated(1), + eECExecutedViaSourceEES(2), + eECExecutedViaTargetEES(3), + sourceEASDecided(4), + sourceEESExecuted(5), + eELManagedACR(6) +} + +UnfulfilledACProfiles ::= SET OF UnfulfilledACProfile + +UnfulfilledACProfile ::= SEQUENCE +{ + aCID [1] ACID, + reason [2] UnfulfilledACProfileReason +} + +UnfulfilledACProfileReason ::= ENUMERATED +{ + eASNotAvailable(1), + requirementsUnfulfilled(2) +} + +EASID ::= UTF8String + +EASsInfo ::= SET OF EASInfo + +EASInfo ::= SEQUENCE +{ + eASID [1] EASID, + expectedSvcKPIs [2] ServiceKPIs OPTIONAL, + minimumReqSvcKPIs [3] ServiceKPIs OPTIONAL +} + +ServiceKPIs ::= SEQUENCE +{ + connectionBandwidth [1] INTEGER OPTIONAL, + requestRate [2] INTEGER OPTIONAL, + responseTime [3] INTEGER OPTIONAL, + requestedAvailability [4] INTEGER OPTIONAL, + requestedCompute [5] OCTET STRING OPTIONAL, + requestedGraphCompute [6] OCTET STRING OPTIONAL, + requestedMemory [7] OCTET STRING OPTIONAL, + requestedStorage [8] OCTET STRING OPTIONAL +} + +FailureResponse ::= ENUMERATED +{ + error400(1), + error401(2), + error403(3), + error404(4), + error406(5), + error411(6), + error413(7), + error415(8), + error429(9), + error500(10), + error503(11) +} + +EASDiscoveryFilter ::= CHOICE +{ + aCsCharacteristics [1] ACProfiles, + eASCharacteristics [2] EASsCharacteristics +} + +EASsCharacteristics ::= SET OF EASCharacteristics + +EASCharacteristics ::= SEQUENCE +{ + eASID [1] EASID OPTIONAL, + aSPID [2] UTF8String OPTIONAL, + eASType [3] UTF8String OPTIONAL, + eASSchedule [4] Daytime OPTIONAL, + eASProfile [5] EASProfile OPTIONAL, + eASServiceArea [6] Location OPTIONAL, + eASServicePermLevel [7] UTF8String OPTIONAL, + eASServiceFeatures [8] EASServiceFeatures OPTIONAL +} + +DNAIs ::= SET OF DNAI + +DiscoveredEAS ::= SEQUENCE +{ + eASProfile [1] EASProfile, + lifetime [2] INTEGER OPTIONAL +} + +EASProfile ::= SEQUENCE +{ + eASID [1] EASID, + eASEndpoint [2] EASEndpoint, + aCIDs [3] ACIDs OPTIONAL, + aSPID [4] UTF8String OPTIONAL, + eASType [5] UTF8String OPTIONAL, + eASDescription [6] UTF8String OPTIONAL, + eASSchedule [7] Daytime OPTIONAL, + eASServiceArea [8] Location OPTIONAL, + eASServiceKPIs [9] ServiceKPIs OPTIONAL, + eASServicePermLevel [10] UTF8String OPTIONAL, + eASServiceFeatures [11] EASServiceFeatures OPTIONAL, + eASServiceContSupport [12] ACRScenarios OPTIONAL, + appLocs [13] RouteToLocations OPTIONAL, + eASStatus [14] EASStatus OPTIONAL +} + +EASStatus ::= ENUMERATED +{ + enabled(1), + disabled(2) +} + +EASEndpoint ::= SEQUENCE +{ + fQDN [1] FQDN OPTIONAL, + iPv4Addresses [2] IPv4Addresses OPTIONAL, + iPv6Addresses [3] IPv6Addresses OPTIONAL, + uRI [4] UTF8String OPTIONAL +} + +RouteToLocations ::= SET OF RouteToLocation +EASServiceFeatures ::= SET OF EASServiceFeature +EASServiceFeature ::= UTF8String +ACIDs ::= SET OF ACID +IPv4Addresses ::= SET OF IPv4Address +IPv6Addresses ::= SET OF IPv6Address + +SubscriptionType ::= ENUMERATED +{ + subscription(1), + subscriptionUpdate(2), + unsubscription(3) +} + +EASEventType ::= ENUMERATED +{ + eASAvailabilityChange(1), + eASDynamicInfoChange(2) +} + +EASDynamicInfoFilter ::= SEQUENCE +{ + eASId [1] EASID, + eASStatus [2] BOOLEAN, + eASAcIDs [3] BOOLEAN, + eASDesc [4] BOOLEAN, + eASPt [5] BOOLEAN, + eASFeature [6] BOOLEAN, + eASSchedule [7] BOOLEAN, + eASSvcArea [8] BOOLEAN, + eASSvcKpi [9] BOOLEAN, + eASSvcCont [10] BOOLEAN +} + +EASIDs ::= SET OF EASID + +ACREventIDs ::= ENUMERATED +{ + targetInformation(1), + aCRComplete(2) +} + +TargetInfo ::= SEQUENCE +{ + discoveredEAS [1] DiscoveredEAS, + targetEESInfo [2] EDNConfigurationInfo OPTIONAL +} + +EDNConfigurationInfo ::= SEQUENCE +{ + eDNConnectionInfo [1] EDNConnectionInfo, + eESsInfo [2] EESsInfo, + lifetime [3] INTEGER OPTIONAL +} + +EDNConnectionInfo ::= SEQUENCE +{ + dNN [1] DNN OPTIONAL, + sNSSAI [2] SNSSAI OPTIONAL, + serviceArea [3] Location OPTIONAL +} + +EESsInfo ::= SET OF EESInfo + +EESInfo ::= SEQUENCE +{ + eESID [1] EESID, + eESEndpoint [2] EESEndpoint, + eASIDs [3] EASIDs OPTIONAL, + serviceArea [4] Location OPTIONAL, + dNAIS [5] DNAIs OPTIONAL +} + +EESID ::= UTF8String + +EESEndpoint ::= SEQUENCE +{ + fQDN [1] FQDN OPTIONAL, + iPv4Addresses [2] IPv4Addresses OPTIONAL, + iPv6Addresses [3] IPv6Addresses OPTIONAL, + uRI [4] UTF8String OPTIONAL +} + + + -- =================== -- 5G LALS definitions -- =================== @@ -3460,7 +4170,8 @@ PDSummaryReport ::= SEQUENCE firstPacketTimestamp [10] Timestamp, lastPacketTimestamp [11] Timestamp, packetCount [12] INTEGER, - byteCount [13] INTEGER + byteCount [13] INTEGER, + useSessionTrigger [14] BOOLEAN } -- ==================== @@ -4030,6 +4741,8 @@ IMPU ::= CHOICE IMSI ::= NumericString (SIZE(6..15)) +IMSIUnauthenticatedIndication ::= BOOLEAN + Initiator ::= ENUMERATED { uE(1), @@ -4119,7 +4832,8 @@ NonLocalID ::= ENUMERATED NonIMEISVPEI ::= CHOICE { - mACAddress [1] MACAddress + mACAddress [1] MACAddress, + eUI64 [2] EUI64 } NPNAccessInformation ::= CHOICE @@ -4129,6 +4843,8 @@ NPNAccessInformation ::= CHOICE NSSAI ::= SEQUENCE OF SNSSAI +PagingRestrictionIndicator ::= OCTET STRING (SIZE(1..33)) + PLMNID ::= SEQUENCE { mCC [1] MCC, @@ -4137,6 +4853,15 @@ PLMNID ::= SEQUENCE PLMNList ::= SEQUENCE (SIZE(1..MAX)) OF PLMNID +PDNConnectionType ::= ENUMERATED +{ + iPv4(1), + iPv6(2), + iPv4v6(3), + nonIP(4), + ethernet(5) +} + PDUSessionID ::= INTEGER (0..255) PDUSessionResourceInformation ::= SEQUENCE @@ -4309,16 +5034,23 @@ SwitchOffIndicator ::= ENUMERATED TargetIdentifier ::= CHOICE { - sUPI [1] SUPI, - iMSI [2] IMSI, - pEI [3] PEI, - iMEI [4] IMEI, - gPSI [5] GPSI, - mSISDN [6] MSISDN, - nAI [7] NAI, - iPv4Address [8] IPv4Address, - iPv6Address [9] IPv6Address, - ethernetAddress [10] MACAddress + sUPI [1] SUPI, + iMSI [2] IMSI, + pEI [3] PEI, + iMEI [4] IMEI, + gPSI [5] GPSI, + mSISDN [6] MSISDN, + nAI [7] NAI, + iPv4Address [8] IPv4Address, + iPv6Address [9] IPv6Address, + ethernetAddress [10] MACAddress, + iMPU [11] IMPU, + iMPI [12] IMPI, + e164Number [13] E164Number, + emailAddress [14] EmailAddress, + mCPTTID [15] UTF8String, + instanceIdentifierURN [16] UTF8String, + pTCChatGroupID [17] PTCChatGroupID } TargetIdentifierProvenance ::= ENUMERATED diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 501e60a866c6202fa1fd46ea7e88e511e902f5cb..8918bc0d2b3eebfd858cb6998a978de451fde219 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,60 +1,22 @@ + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -81,92 +43,24 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -214,7 +108,6 @@ - @@ -225,4 +118,4 @@ - \ No newline at end of file + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd new file mode 100644 index 0000000000000000000000000000000000000000..d6856f5faff3e30d164ab3550e7be43b38e10587 --- /dev/null +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index d5f9cfef7976d6b5098595cd1df63e755f40c322..bef6ae33472a3901aac1733bf5624b2df090ddf7 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,8 +1,8 @@ @@ -36,6 +36,17 @@ + + + + + + + + + + + @@ -86,6 +97,7 @@ + @@ -196,6 +208,7 @@ + @@ -347,4 +360,15 @@ + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd new file mode 100644 index 0000000000000000000000000000000000000000..4e9dd41edc230c2003e208e7e7f9ff7ad740af3d --- /dev/null +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/dependencies/xsd/TS_103_280_v020401.xsd b/testing/dependencies/xsd/TS_103_280_v020401.xsd index e5c0bdea3682e1962175e2c84bd36a09a20ae821..3ff4ae13e53186ed51828193f383337448c8e3a1 100644 --- a/testing/dependencies/xsd/TS_103_280_v020401.xsd +++ b/testing/dependencies/xsd/TS_103_280_v020401.xsd @@ -1,5 +1,5 @@ - + @@ -236,4 +236,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd new file mode 100644 index 0000000000000000000000000000000000000000..abaf3235af1ecc6e64e1038c7ede7fe7e8e53020 --- /dev/null +++ b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/xsd_process.py b/testing/xsd_process.py index a7dcd617d7e9dd8550d7cd49c32de571cb5d716b..4340df3fd064abe851db434769b970d203b8fff0 100644 --- a/testing/xsd_process.py +++ b/testing/xsd_process.py @@ -4,6 +4,11 @@ from pathlib import Path from xmlschema.etree import etree_tostring from xmlschema import XMLSchema, XMLSchemaParseError +def getError(e): + try: + return f"{etree_tostring(e.elem, e.namespaces, ' ', 20)} - {e.message}" + except Exception as ex: + return repr(e) def BuildSchemaDictonary (fileList): if len(fileList) == 0: @@ -44,7 +49,7 @@ def ValidateXSDFiles (fileList): try: schema = XMLSchema(schemaFile, locations = schemaLocations, validation="lax") logging.info(schemaFile + ": OK") - errors[schemaFile] = [f"{etree_tostring(e.elem, e.namespaces, ' ', 20)} - {e.message}" for e in schema.all_errors] + errors[schemaFile] = [getError(e) for e in schema.all_errors] except XMLSchemaParseError as ex: logging.warning(schemaFile + ": Failed validation ({0})".format(ex.message)) if (ex.schema_url) and (ex.schema_url != ex.origin_url):