From 06930351d2365f6ee51bc16cd574b0d74d2a029b Mon Sep 17 00:00:00 2001 From: courbon Date: Mon, 4 Jul 2022 14:34:23 +0000 Subject: [PATCH 01/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 69 +++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index b0469013..b412c029 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1336,7 +1336,9 @@ SMFPDUSessionModification ::= SEQUENCE servingNetwork [14] SMFServingNetwork OPTIONAL, handoverState [15] HandoverState OPTIONAL, gTPTunnelInfo [16] GTPTunnelInfo OPTIONAL, - pCCRules [17] PCCRuleSet OPTIONAL + pCCRules [17] PCCRuleSet OPTIONAL, + uPPathChange [18] UPPathChange OPTIONAL, + pFDDataForApp [19] PFDDataForApp OPTIONAL } -- See clause 6.2.3.2.4 for details of this structure @@ -1384,7 +1386,8 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL, servingNetwork [22] SMFServingNetwork OPTIONAL, gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL + pCCRules [24] PCCRuleSet OPTIONAL, + pFDDataForApps [25] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -1485,7 +1488,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 +1537,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 +1719,20 @@ 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,6 +1868,47 @@ EASServerAddress ::= SEQUENCE port [2] PortNumber } + +PFDDataForApps ::= SET OF PFDDataForApp + +PFDDataForApp ::= SEQUENCE +{ + aPPId [1] UTF8String, + pFDs [2] PFDs +} + +PFDs ::= SET OF PFD + +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 +} + +DnProtocol ::= ENUMERATED +{ + dns_qname(1), + tls_sni(2), + tls_san(3), + tls_scn(4) +} + -- ====================== -- PGW-C + SMF Parameters -- ====================== -- GitLab From ed4af3c8cb5a0b1523c445cf1c5e5c5ceef11b49 Mon Sep 17 00:00:00 2001 From: courbon Date: Mon, 4 Jul 2022 14:47:43 +0000 Subject: [PATCH 02/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index b412c029..c73a3dd7 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1903,10 +1903,10 @@ PFDFlowDescription ::= SEQUENCE DnProtocol ::= ENUMERATED { - dns_qname(1), - tls_sni(2), - tls_san(3), - tls_scn(4) + dnsQname(1), + tlsSni(2), + tlsSan(3), + tlsScn(4) } -- ====================== -- GitLab From 24302043b8ed03c8f117e9083703d0d8c54d89f2 Mon Sep 17 00:00:00 2001 From: courbon Date: Mon, 4 Jul 2022 15:43:07 +0000 Subject: [PATCH 03/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index c73a3dd7..2c30950f 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1710,12 +1710,19 @@ PCCRule ::= SEQUENCE trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, sourceDNAI [11] DNAI OPTIONAL, +-- Not used in practice targetDNAI [12] DNAI OPTIONAL, +-- Not used in practice dNAIChangeType [13] DNAIChangeType OPTIONAL, +-- Not used in practice sourceUEIPAddr [14] IPAddress OPTIONAL, +-- Not used in practice targetUEIPAddr [15] IPAddress OPTIONAL, +-- Not used in practice sourceTrafficRouting [16] RouteToLocation OPTIONAL, +-- Not used in practice targetTrafficRouting [17] RouteToLocation OPTIONAL, +-- Not used in practice eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } -- GitLab From 5f18cbc27d54f1f562a992a1ea16f5ffda9fc36b Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 4 Jul 2022 17:26:14 +0000 Subject: [PATCH 04/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 70 +++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 30502982..8537f8cf 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1370,7 +1370,10 @@ SMFPDUSessionModification ::= SEQUENCE servingNetwork [14] SMFServingNetwork OPTIONAL, handoverState [15] HandoverState OPTIONAL, gTPTunnelInfo [16] GTPTunnelInfo OPTIONAL, - pCCRules [17] PCCRuleSet OPTIONAL + pCCRules [17] PCCRuleSet OPTIONAL, + uPPathChange [18] UPPathChange OPTIONAL, + pFDDataForApp [19] PFDDataForApp OPTIONAL + } -- See clause 6.2.3.2.4 for details of this structure @@ -1418,7 +1421,8 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL, servingNetwork [22] SMFServingNetwork OPTIONAL, gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL + pCCRules [24] PCCRuleSet OPTIONAL, + pFDDataForApps [25] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -1519,7 +1523,10 @@ 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 +1573,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 +1755,20 @@ 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,6 +1904,46 @@ EASServerAddress ::= SEQUENCE port [2] PortNumber } +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 [AA] +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 -- ====================== -- GitLab From f83f3198d2d72c9f1b251c47df12a849d3b378b5 Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 4 Jul 2022 17:54:09 +0000 Subject: [PATCH 05/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 1 + 1 file changed, 1 insertion(+) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 8537f8cf..df971812 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1745,6 +1745,7 @@ PCCRule ::= SEQUENCE trafficRoutes [8] RouteToLocationSet, trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, +-- sourceDNAI, targetDNAI, dNAIChangeType, sourceUEIPAddr, targetUEIPAddr, sourceTrafficRouting, targetTrafficRouting are not used in practice sourceDNAI [11] DNAI OPTIONAL, targetDNAI [12] DNAI OPTIONAL, dNAIChangeType [13] DNAIChangeType OPTIONAL, -- GitLab From 2ed7707c465c88651d07d50c783a47fa35b333e3 Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 4 Jul 2022 19:54:24 +0000 Subject: [PATCH 06/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index df971812..8258a0fc 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -17,7 +17,7 @@ iRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID iRI(3)} cCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID cC(4)} lINotificationPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID lINotification(5)} --- =============== +-- ===============f -- X2 xIRI payload -- =============== -- GitLab From 671cf5f560b443ed1fc13e1525b2c585caafcfc7 Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 4 Jul 2022 20:55:25 +0000 Subject: [PATCH 07/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 2c30950f..e7b29add 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1710,19 +1710,19 @@ PCCRule ::= SEQUENCE trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, sourceDNAI [11] DNAI OPTIONAL, --- Not used in practice +-- sourceDNAI not used in practice targetDNAI [12] DNAI OPTIONAL, --- Not used in practice +-- targetDNAI not used in practice dNAIChangeType [13] DNAIChangeType OPTIONAL, --- Not used in practice +-- dNAIChangeType not used in practice sourceUEIPAddr [14] IPAddress OPTIONAL, --- Not used in practice +-- sourceUEIPAddr not used in practice targetUEIPAddr [15] IPAddress OPTIONAL, --- Not used in practice +-- targetUEIPAddr not used in practice sourceTrafficRouting [16] RouteToLocation OPTIONAL, --- Not used in practice +-- sourceTrafficRouting not used in practice targetTrafficRouting [17] RouteToLocation OPTIONAL, --- Not used in practice +-- targetTrafficRouting not used in practice eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } @@ -1875,7 +1875,6 @@ EASServerAddress ::= SEQUENCE port [2] PortNumber } - PFDDataForApps ::= SET OF PFDDataForApp PFDDataForApp ::= SEQUENCE @@ -1886,6 +1885,7 @@ PFDDataForApp ::= SEQUENCE PFDs ::= SET OF PFD +-- See Table 5.6.2.5-1 of TS 29.551 [AA] PFD ::= SEQUENCE { pFDId [1] UTF8String, @@ -1908,6 +1908,7 @@ PFDFlowDescription ::= SEQUENCE serverPortNumber [3] PortNumber } +-- See Table 5.14.2.2.4-1 of TS 29.122 [63] DnProtocol ::= ENUMERATED { dnsQname(1), -- GitLab From d82afa1f1cefbe43f8a5b41cac3458e51b1029a6 Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 4 Jul 2022 21:04:49 +0000 Subject: [PATCH 08/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 8258a0fc..90f21ae0 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1745,14 +1745,20 @@ PCCRule ::= SEQUENCE trafficRoutes [8] RouteToLocationSet, trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, --- sourceDNAI, targetDNAI, dNAIChangeType, sourceUEIPAddr, targetUEIPAddr, sourceTrafficRouting, targetTrafficRouting are not used in practice sourceDNAI [11] DNAI OPTIONAL, +-- sourceDNAI not used in practice targetDNAI [12] DNAI OPTIONAL, +-- targetDNAI not used in practice dNAIChangeType [13] DNAIChangeType OPTIONAL, +-- dNAIChangeType not used in practice sourceUEIPAddr [14] IPAddress OPTIONAL, +-- sourceUEIPAddr not used in practice targetUEIPAddr [15] IPAddress OPTIONAL, +-- targetUEIPAddress not used in practice sourceTrafficRouting [16] RouteToLocation OPTIONAL, +-- sourceTrafficRouting not used in practice targetTrafficRouting [17] RouteToLocation OPTIONAL, +-- targetTrafficRouting not used in practice eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } -- GitLab From 648379d4f7ff342ad9646859b2254cdd54f86a62 Mon Sep 17 00:00:00 2001 From: courbon Date: Tue, 5 Jul 2022 14:55:27 +0000 Subject: [PATCH 09/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 90f21ae0..b05bf737 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -17,7 +17,7 @@ iRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID iRI(3)} cCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID cC(4)} lINotificationPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID lINotification(5)} --- ===============f +-- =============== -- X2 xIRI payload -- =============== -- GitLab From cf71c505e4c0d784f7543095bf8059df766133c2 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 14 Jul 2022 12:24:10 +0000 Subject: [PATCH 10/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index e7b29add..a4b2e4b3 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1709,20 +1709,20 @@ PCCRule ::= SEQUENCE trafficRoutes [8] RouteToLocationSet, trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, - sourceDNAI [11] DNAI OPTIONAL, -- sourceDNAI not used in practice - targetDNAI [12] DNAI OPTIONAL, + sourceDNAI [11] DNAI OPTIONAL, -- targetDNAI not used in practice - dNAIChangeType [13] DNAIChangeType OPTIONAL, + targetDNAI [12] DNAI OPTIONAL, -- dNAIChangeType not used in practice - sourceUEIPAddr [14] IPAddress OPTIONAL, + dNAIChangeType [13] DNAIChangeType OPTIONAL, -- sourceUEIPAddr not used in practice - targetUEIPAddr [15] IPAddress OPTIONAL, + sourceUEIPAddr [14] IPAddress OPTIONAL, -- targetUEIPAddr not used in practice - sourceTrafficRouting [16] RouteToLocation OPTIONAL, + targetUEIPAddr [15] IPAddress OPTIONAL, -- sourceTrafficRouting not used in practice - targetTrafficRouting [17] RouteToLocation OPTIONAL, + sourceTrafficRouting [16] RouteToLocation OPTIONAL, -- targetTrafficRouting not used in practice + targetTrafficRouting [17] RouteToLocation OPTIONAL, eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } -- GitLab From 5b2e7b80dc9cf95e7ca4160bf54b7e31c9d87828 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 14 Jul 2022 13:24:02 +0000 Subject: [PATCH 11/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index b05bf737..d18e041f 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1745,20 +1745,20 @@ PCCRule ::= SEQUENCE trafficRoutes [8] RouteToLocationSet, trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, - sourceDNAI [11] DNAI OPTIONAL, -- sourceDNAI not used in practice - targetDNAI [12] DNAI OPTIONAL, + sourceDNAI [11] DNAI OPTIONAL, -- targetDNAI not used in practice - dNAIChangeType [13] DNAIChangeType OPTIONAL, + targetDNAI [12] DNAI OPTIONAL, -- dNAIChangeType not used in practice - sourceUEIPAddr [14] IPAddress OPTIONAL, + dNAIChangeType [13] DNAIChangeType OPTIONAL, -- sourceUEIPAddr not used in practice - targetUEIPAddr [15] IPAddress OPTIONAL, + sourceUEIPAddr [14] IPAddress OPTIONAL, -- targetUEIPAddress not used in practice - sourceTrafficRouting [16] RouteToLocation OPTIONAL, + targetUEIPAddr [15] IPAddress OPTIONAL, -- sourceTrafficRouting not used in practice - targetTrafficRouting [17] RouteToLocation OPTIONAL, + sourceTrafficRouting [16] RouteToLocation OPTIONAL, -- targetTrafficRouting not used in practice + targetTrafficRouting [17] RouteToLocation OPTIONAL, eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } -- GitLab From 84c2dd1c2bf77ffc06cdda0b83600a645e2e9b6a Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Fri, 15 Jul 2022 09:18:16 +0000 Subject: [PATCH 12/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r18/TS33128Payloads.asn | 1 + 1 file changed, 1 insertion(+) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index d18e041f..47fdad59 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1374,6 +1374,7 @@ SMFPDUSessionModification ::= SEQUENCE uPPathChange [18] UPPathChange OPTIONAL, pFDDataForApp [19] PFDDataForApp OPTIONAL + pFDDataForApp [19] PFDDataForApp OPTIONAL } -- See clause 6.2.3.2.4 for details of this structure -- GitLab From b2d14dda22be80c4ce3488ba7c99519800916428 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Fri, 15 Jul 2022 09:18:43 +0000 Subject: [PATCH 13/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r18/TS33128Payloads.asn | 1 - 1 file changed, 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 47fdad59..e5a72aa2 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1527,7 +1527,6 @@ SMFMAPDUSessionModification ::= SEQUENCE 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 -- GitLab From a7faf32aca057dd182decbe57f35feb7269bda86 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Fri, 15 Jul 2022 09:20:44 +0000 Subject: [PATCH 14/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r18/TS33128Payloads.asn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index e5a72aa2..3989f1ba 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1762,8 +1762,7 @@ 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. - +-- 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, -- GitLab From a48c55261162a31ff2ccdb64ad10b62d0bb07b41 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Fri, 15 Jul 2022 09:20:55 +0000 Subject: [PATCH 15/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r18/TS33128Payloads.asn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 3989f1ba..17cee31d 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1931,7 +1931,9 @@ PFD ::= SEQUENCE } PFDURLs ::= SET OF UTF8String + PFDFlowDescriptions ::= SET OF PFDFlowDescription + DomainNames ::= SET OF UTF8String PFDFlowDescription ::= SEQUENCE -- GitLab From 2f278711e7fb288460fe54d3add21dea955555a8 Mon Sep 17 00:00:00 2001 From: courbon Date: Fri, 15 Jul 2022 09:24:23 +0000 Subject: [PATCH 16/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 -- 1 file changed, 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 17cee31d..f6df5c9c 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1373,8 +1373,6 @@ SMFPDUSessionModification ::= SEQUENCE pCCRules [17] PCCRuleSet OPTIONAL, uPPathChange [18] UPPathChange OPTIONAL, pFDDataForApp [19] PFDDataForApp OPTIONAL - - pFDDataForApp [19] PFDDataForApp OPTIONAL } -- See clause 6.2.3.2.4 for details of this structure -- GitLab From fbfb6ea928abfd03b083031ac303c968439808d5 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 20 Jul 2022 14:44:27 +0100 Subject: [PATCH 17/83] First draft --- 33128/r17/TS33128Payloads.asn | 25 ++++++- .../r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 67 +++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index b0469013..6d649de1 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -190,7 +190,10 @@ XIRIEvent ::= CHOICE positioningInfoTransfer [111] AMFPositioningInfoTransfer, -- MME Events, see clause 6.3.2.2.8 - mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer + mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, + + -- Location Acquisition response, see clause 5.X.2.3 + locationResponseDetails [9999] LocationResponseDetails } -- ============== @@ -373,7 +376,10 @@ IRIEvent ::= CHOICE positioningInfoTransfer [111] AMFPositioningInfoTransfer, -- MME Events, see clause 6.3.2.2.8 - mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer + mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, + + -- Location Acquisition response, see clause 5.X.2.3 + locationResponseDetails [9999] LocationResponseDetails } IRITargetIdentifier ::= SEQUENCE @@ -3712,6 +3718,21 @@ SeparatedLocationReporting ::= SEQUENCE rATType [8] RATType OPTIONAL } +-- ========================================= +-- Location Acquisition Response definitons +-- ========================================= + +LocationResponseDetails ::= SEQUENCE +{ + locations ::= SEQUENCE OF LocationRecord +} + +LocationRecord ::= SEQUENCE +{ + SUPI [1] SUPI, + location [2] Location +} + -- ================= -- Common Parameters -- ================= diff --git a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd new file mode 100644 index 00000000..242f82a1 --- /dev/null +++ b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From eaf0aa91e5c7a256c448307a198efe1a8843e0af Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 20 Jul 2022 14:48:56 +0100 Subject: [PATCH 18/83] Fixes --- 33128/r17/TS33128Payloads.asn | 4 ++-- 33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 6d649de1..21a4f909 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -3724,12 +3724,12 @@ SeparatedLocationReporting ::= SEQUENCE LocationResponseDetails ::= SEQUENCE { - locations ::= SEQUENCE OF LocationRecord + locations [1] SEQUENCE OF LocationRecord } LocationRecord ::= SEQUENCE { - SUPI [1] SUPI, + sUPI [1] SUPI, location [2] Location } diff --git a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 242f82a1..b11d867c 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -34,7 +34,7 @@ - + -- GitLab From e31cfe0580a66c396639c5acebceefec6bd1951d Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 28 Jul 2022 17:01:14 +0100 Subject: [PATCH 19/83] Updating --- 33128/r17/TS33128Payloads.asn | 2 +- 33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 21a4f909..78522439 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -3724,12 +3724,12 @@ SeparatedLocationReporting ::= SEQUENCE LocationResponseDetails ::= SEQUENCE { + sUPI [1] SUPI, locations [1] SEQUENCE OF LocationRecord } LocationRecord ::= SEQUENCE { - sUPI [1] SUPI, location [2] Location } diff --git a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index b11d867c..3357faeb 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -34,7 +34,7 @@ - + -- GitLab From 92b92f0b54818672400c132c51e199f3a961aca3 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 28 Jul 2022 17:04:50 +0100 Subject: [PATCH 20/83] Fixed linting error --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 78522439..5b72f26d 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -3730,7 +3730,7 @@ LocationResponseDetails ::= SEQUENCE LocationRecord ::= SEQUENCE { - location [2] Location + location [1] Location } -- ================= -- GitLab From 4e32015a802cf3a913db5253b7ed8e5dd22e2a11 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 1 Aug 2022 14:10:32 +0000 Subject: [PATCH 21/83] First Attempt at Generic LI QR definitions --- .../ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd diff --git a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd new file mode 100644 index 00000000..36645778 --- /dev/null +++ b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From b8f61a9c1ec5335e93ee4faa0db70af14f169536 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 1 Aug 2022 14:11:06 +0000 Subject: [PATCH 22/83] attempting to use generic definitions --- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 132 ++---------------- 1 file changed, 10 insertions(+), 122 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 501e60a8..8e4fa3dc 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -3,57 +3,15 @@ xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" + xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3" elementFormDefault="qualified"> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -81,86 +39,17 @@ - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -214,7 +103,6 @@ - @@ -225,4 +113,4 @@ - \ No newline at end of file + -- GitLab From f957cec43b0a5ee3c4fd3f5909b8dc0b4faa5678 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 1 Aug 2022 14:22:59 +0000 Subject: [PATCH 23/83] Added Task Flags --- 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index 36645778..49f1a857 100644 --- a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -14,6 +14,7 @@ + @@ -27,6 +28,12 @@ + + + + + + @@ -77,7 +84,7 @@ - + @@ -92,7 +99,7 @@ - + -- GitLab From e775b8d88c93ea0326ffc954e6d6d5e545379f4c Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 1 Aug 2022 15:37:14 +0000 Subject: [PATCH 24/83] Added Error Response --- .../ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index 49f1a857..c1403abb 100644 --- a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -54,6 +54,24 @@ + + + + + + + + + + + + + + + + + + @@ -131,4 +149,8 @@ + + + + -- GitLab From 9eb6dfb691a21db8a2bc4fa52046d0dd1ddcf51b Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 1 Aug 2022 19:32:12 +0000 Subject: [PATCH 25/83] Update 33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- .../r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 40 ++++++------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 3357faeb..dbb1c8d5 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -2,33 +2,14 @@ - - + - - - - - - - - - - - - - - - - - - + @@ -50,18 +31,21 @@ - + - - + + - - - + + + + + + -- GitLab From cfb5f0d7881203d164c37e70f4bcd085bb38dec9 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 1 Aug 2022 19:49:23 +0000 Subject: [PATCH 26/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 5b72f26d..098370f0 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -3722,13 +3722,13 @@ SeparatedLocationReporting ::= SEQUENCE -- Location Acquisition Response definitons -- ========================================= -LocationResponseDetails ::= SEQUENCE +LocationResponseDetails ::= SEQUENCE { sUPI [1] SUPI, locations [1] SEQUENCE OF LocationRecord } -LocationRecord ::= SEQUENCE +LocationRecord ::= SEQUENCE { location [1] Location } @@ -4118,7 +4118,8 @@ Location ::= SEQUENCE locationInfo [1] LocationInfo OPTIONAL, positioningInfo [2] PositioningInfo OPTIONAL, locationPresenceReport [3] LocationPresenceReport OPTIONAL, - ePSLocationInfo [4] EPSLocationInfo OPTIONAL + ePSLocationInfo [4] EPSLocationInfo OPTIONAL, + tS29518ProvideLocInfo [5] SBIType OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -4787,4 +4788,6 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) +SBIType ::= UTF8String + END -- GitLab From 7a34659710bea5f80f0eb7486bbb03f0b1b7b3ae Mon Sep 17 00:00:00 2001 From: courbon Date: Mon, 15 Aug 2022 15:20:36 +0000 Subject: [PATCH 27/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 7 ------- 1 file changed, 7 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index a4b2e4b3..10462cf1 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1709,19 +1709,12 @@ PCCRule ::= SEQUENCE trafficRoutes [8] RouteToLocationSet, trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, --- sourceDNAI not used in practice sourceDNAI [11] DNAI OPTIONAL, --- targetDNAI not used in practice targetDNAI [12] DNAI OPTIONAL, --- dNAIChangeType not used in practice dNAIChangeType [13] DNAIChangeType OPTIONAL, --- sourceUEIPAddr not used in practice sourceUEIPAddr [14] IPAddress OPTIONAL, --- targetUEIPAddr not used in practice targetUEIPAddr [15] IPAddress OPTIONAL, --- sourceTrafficRouting not used in practice sourceTrafficRouting [16] RouteToLocation OPTIONAL, --- targetTrafficRouting not used in practice targetTrafficRouting [17] RouteToLocation OPTIONAL, eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } -- GitLab From 616f12013058017dee7d9b82fed0532da8025518 Mon Sep 17 00:00:00 2001 From: courbon Date: Mon, 15 Aug 2022 15:36:08 +0000 Subject: [PATCH 28/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 7 ------- 1 file changed, 7 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index f6df5c9c..e1f30c06 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1743,19 +1743,12 @@ PCCRule ::= SEQUENCE trafficRoutes [8] RouteToLocationSet, trafficSteeringPolIdDl [9] UTF8String OPTIONAL, trafficSteeringPolIdUl [10] UTF8String OPTIONAL, --- sourceDNAI not used in practice sourceDNAI [11] DNAI OPTIONAL, --- targetDNAI not used in practice targetDNAI [12] DNAI OPTIONAL, --- dNAIChangeType not used in practice dNAIChangeType [13] DNAIChangeType OPTIONAL, --- sourceUEIPAddr not used in practice sourceUEIPAddr [14] IPAddress OPTIONAL, --- targetUEIPAddress not used in practice targetUEIPAddr [15] IPAddress OPTIONAL, --- sourceTrafficRouting not used in practice sourceTrafficRouting [16] RouteToLocation OPTIONAL, --- targetTrafficRouting not used in practice targetTrafficRouting [17] RouteToLocation OPTIONAL, eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL } -- GitLab From 4424d44277d817a67c37e4fd54324d647f35e149 Mon Sep 17 00:00:00 2001 From: courbon Date: Tue, 16 Aug 2022 14:32:58 +0000 Subject: [PATCH 29/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 1 - 1 file changed, 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 10462cf1..9953d84b 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1720,7 +1720,6 @@ PCCRule ::= SEQUENCE } --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, -- GitLab From c4ec162d952732ca1acf8561d86ec3b29aaf83e9 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 18:02:13 +0000 Subject: [PATCH 30/83] Update 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd --- 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index c1403abb..cba4bfa3 100644 --- a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -3,18 +3,20 @@ xmlns="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" + xmlns:etsi103120common="http://uri.etsi.org/03120/common/2016/02/Common" targetNamespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3" elementFormDefault="qualified"> + - + @@ -30,7 +32,7 @@ - + -- GitLab From 25a62eec33317e38efbb161bebbdd93a7d25637e Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 18:23:33 +0000 Subject: [PATCH 31/83] Update 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd --- 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index cba4bfa3..418c1524 100644 --- a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -155,4 +155,8 @@ + + + + -- GitLab From d91ff5c9704f7140a5134f9252f712187fd34781 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 18:27:37 +0000 Subject: [PATCH 32/83] Update 33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index dbb1c8d5..33432510 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -9,7 +9,7 @@ - + -- GitLab From c4be2fc01180cb010f17e608f22a414ce711d6a0 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 18:29:45 +0000 Subject: [PATCH 33/83] Update 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 8e4fa3dc..8971cfc2 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -11,7 +11,7 @@ - + -- GitLab From b20eed414cc3cd6472d6ab7b38a4d1add98c7256 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 18:33:37 +0000 Subject: [PATCH 34/83] Update 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 8971cfc2..97b28879 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -55,7 +55,7 @@ - + -- GitLab From 85f92cac242bb1e6692a157f24625a7750a7d7e4 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 19:33:20 +0000 Subject: [PATCH 35/83] Update 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd --- 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index 418c1524..474ec16b 100644 --- a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -58,7 +58,7 @@ - + -- GitLab From 85a6b3d8915d93afdec04344b1510fd98e70248d Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 19:39:00 +0000 Subject: [PATCH 36/83] ETSI 103 120 Common --- .../xsd/ts_103120v011102p0_Common.xsd | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 testing/dependencies/xsd/ts_103120v011102p0_Common.xsd diff --git a/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd new file mode 100644 index 00000000..abaf3235 --- /dev/null +++ b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 53ab718f76b7a4472b65f22ce4aa46b817cf0508 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 16 Aug 2022 19:55:34 +0000 Subject: [PATCH 37/83] Update testing/dependencies/xsd/TS_103_280_v020401.xsd --- .../dependencies/xsd/TS_103_280_v020401.xsd | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/testing/dependencies/xsd/TS_103_280_v020401.xsd b/testing/dependencies/xsd/TS_103_280_v020401.xsd index e5c0bdea..3ff4ae13 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 5b7194e8a3af2bbe1c83fde2f3edf2ab2397a23e Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 18 Aug 2022 23:33:01 +0000 Subject: [PATCH 38/83] Update 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd, 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd, 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd files --- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 134 ++------------ .../urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 163 ++++++++++++++++++ .../r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 52 ++++++ 3 files changed, 226 insertions(+), 123 deletions(-) create mode 100644 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd create mode 100644 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 501e60a8..97b28879 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -3,57 +3,15 @@ xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" + xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3" elementFormDefault="qualified"> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -81,92 +39,23 @@ - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -214,7 +103,6 @@ - @@ -225,4 +113,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 00000000..8e24107f --- /dev/null +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 00000000..0cb4af73 --- /dev/null +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 8cc0597496572f2df65c76735a7cafe46f527961 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 19 Aug 2022 00:03:31 +0000 Subject: [PATCH 39/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 30502982..1264b81f 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4364,7 +4364,8 @@ Location ::= SEQUENCE locationInfo [1] LocationInfo OPTIONAL, positioningInfo [2] PositioningInfo OPTIONAL, locationPresenceReport [3] LocationPresenceReport OPTIONAL, - ePSLocationInfo [4] EPSLocationInfo OPTIONAL + ePSLocationInfo [4] EPSLocationInfo OPTIONAL, + tS29518ProvideLocInfo [5] SBIType OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -5033,4 +5034,6 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) +SBIType ::= UTF8String + END -- GitLab From 3fd0c85f450896a134eb78051f7142bc929771c0 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Fri, 19 Aug 2022 06:44:50 +0000 Subject: [PATCH 40/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 9953d84b..6b8eca7d 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1719,7 +1719,7 @@ 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. +--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, -- GitLab From ae990c3a9859edff5209ce8dcc129fc0681c1347 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Fri, 19 Aug 2022 06:45:02 +0000 Subject: [PATCH 41/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 6b8eca7d..5cb2385b 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1877,7 +1877,7 @@ PFDDataForApp ::= SEQUENCE PFDs ::= SET OF PFD --- See Table 5.6.2.5-1 of TS 29.551 [AA] +-- See table 5.6.2.5-1 of TS 29.551 [AA] PFD ::= SEQUENCE { pFDId [1] UTF8String, -- GitLab From a76ded26c873b646fd31bae653a07a9c0c3d415d Mon Sep 17 00:00:00 2001 From: Steije van Schelt <22-vanschelts@users.noreply.gitlab.example.com> Date: Fri, 19 Aug 2022 06:45:14 +0000 Subject: [PATCH 42/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 5cb2385b..97533609 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1900,7 +1900,7 @@ PFDFlowDescription ::= SEQUENCE serverPortNumber [3] PortNumber } --- See Table 5.14.2.2.4-1 of TS 29.122 [63] +-- See table 5.14.2.2.4-1 of TS 29.122 [63] DnProtocol ::= ENUMERATED { dnsQname(1), -- GitLab From 57d3b337a2ebf94d776ccdebd883873632d8b0e3 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 Aug 2022 16:19:07 +0100 Subject: [PATCH 43/83] Reverting R17 changes --- 33128/r17/TS33128Payloads.asn | 30 +--- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 134 ++++++++++++++++-- 2 files changed, 126 insertions(+), 38 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 098370f0..b0469013 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -190,10 +190,7 @@ XIRIEvent ::= CHOICE positioningInfoTransfer [111] AMFPositioningInfoTransfer, -- MME Events, see clause 6.3.2.2.8 - mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, - - -- Location Acquisition response, see clause 5.X.2.3 - locationResponseDetails [9999] LocationResponseDetails + mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer } -- ============== @@ -376,10 +373,7 @@ IRIEvent ::= CHOICE positioningInfoTransfer [111] AMFPositioningInfoTransfer, -- MME Events, see clause 6.3.2.2.8 - mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, - - -- Location Acquisition response, see clause 5.X.2.3 - locationResponseDetails [9999] LocationResponseDetails + mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer } IRITargetIdentifier ::= SEQUENCE @@ -3718,21 +3712,6 @@ SeparatedLocationReporting ::= SEQUENCE rATType [8] RATType OPTIONAL } --- ========================================= --- Location Acquisition Response definitons --- ========================================= - -LocationResponseDetails ::= SEQUENCE -{ - sUPI [1] SUPI, - locations [1] SEQUENCE OF LocationRecord -} - -LocationRecord ::= SEQUENCE -{ - location [1] Location -} - -- ================= -- Common Parameters -- ================= @@ -4118,8 +4097,7 @@ Location ::= SEQUENCE locationInfo [1] LocationInfo OPTIONAL, positioningInfo [2] PositioningInfo OPTIONAL, locationPresenceReport [3] LocationPresenceReport OPTIONAL, - ePSLocationInfo [4] EPSLocationInfo OPTIONAL, - tS29518ProvideLocInfo [5] SBIType OPTIONAL + ePSLocationInfo [4] EPSLocationInfo OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -4788,6 +4766,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -SBIType ::= UTF8String - END diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 97b28879..501e60a8 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -3,15 +3,57 @@ xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" - xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3" elementFormDefault="qualified"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -39,23 +81,92 @@ - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -103,6 +214,7 @@ + @@ -113,4 +225,4 @@ - + \ No newline at end of file -- GitLab From 6c1ac21e94004148323e796306239fe0086c0a9f Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 Aug 2022 16:22:34 +0100 Subject: [PATCH 44/83] Removing files added to R17 --- .../ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 162 ------------------ .../r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 51 ------ 2 files changed, 213 deletions(-) delete mode 100644 33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd delete mode 100644 33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd diff --git a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd deleted file mode 100644 index 474ec16b..00000000 --- a/33128/r17/ urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd deleted file mode 100644 index 33432510..00000000 --- a/33128/r17/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- GitLab From 0106aefb3cb333fedd022aa0728c79f6d6cdc967 Mon Sep 17 00:00:00 2001 From: canterburym Date: Tue, 30 Aug 2022 18:11:13 +0000 Subject: [PATCH 45/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 97b28879..62416558 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -11,7 +11,11 @@ - + + + + + -- GitLab From 2b355a4bfa969a440419727df74cd0a346e8364a Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 00:20:00 +0000 Subject: [PATCH 46/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- .../r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 0cb4af73..702ff331 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -9,7 +9,17 @@ - + + + + + + + + + + + @@ -21,6 +31,13 @@ + + + + + + + @@ -45,6 +62,7 @@ + -- GitLab From 448c188f1c07bce5c5adf238a69637f812be017d Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 00:22:48 +0000 Subject: [PATCH 47/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 702ff331..2bc4ecad 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -33,7 +33,7 @@ - + -- GitLab From 3c2ca3b66c3581aeb94fa5eb255c61ff86d8b061 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 1 Sep 2022 07:17:12 +0100 Subject: [PATCH 48/83] Updating LocationResponseDetails to match latest draft (I think) --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 2bc4ecad..e4b03beb 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -42,7 +42,9 @@ - + + + @@ -54,17 +56,9 @@ - - + - - - - - - - -- GitLab From 36123234212a0ce91c87134e04ff1fb0501877b1 Mon Sep 17 00:00:00 2001 From: eisenschmidm Date: Thu, 1 Sep 2022 09:24:19 +0000 Subject: [PATCH 49/83] Apply 1 suggestion(s) to 1 file(s) --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index e4b03beb..c10a6690 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -38,7 +38,9 @@ - + + + -- GitLab From e78d3294bf0961d6c885ac21fcad86b3f73121b2 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 10:44:50 +0000 Subject: [PATCH 50/83] Corrected ListOfDestinations --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index c10a6690..9467f8e0 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -34,13 +34,17 @@ - + - + + + + + -- GitLab From e125f150c81503444399a4cfe59db662e12178dd Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 1 Sep 2022 14:16:23 +0100 Subject: [PATCH 51/83] Updating LocationRecord to LocationOutcomes, hopefully with correct cardinality --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index e4b03beb..2a700333 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -44,20 +44,21 @@ - + - + - + - - - - + + + + + -- GitLab From dbc34a9e490e318876827994fa909ef38fae5c4a Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 13:49:51 +0000 Subject: [PATCH 52/83] Update 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index 8e24107f..c0ba1d5c 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -68,9 +68,9 @@ - - - + + + -- GitLab From 4530287d0b589fff400211741461a0d73a0b6c30 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 13:49:54 +0000 Subject: [PATCH 53/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 0bff963c..63d1e9a9 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -63,7 +63,7 @@ - + -- GitLab From 5aae96ce1f4a82153f2b49a73c059d2f45734ca7 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 14:41:21 +0000 Subject: [PATCH 54/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 63d1e9a9..a73e8dc4 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -61,7 +61,7 @@ - + -- GitLab From 355bd4da8a4f7a10521b5af036354ab1a69d9ec6 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 15:16:29 +0000 Subject: [PATCH 55/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index a73e8dc4..ed3b16a8 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -62,8 +62,8 @@ - - + + -- GitLab From 5b76d43b763d5c28f750092540b04515f9db0cb5 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 15:58:40 +0000 Subject: [PATCH 56/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index ed3b16a8..a132864a 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -61,9 +61,9 @@ - - - + + + -- GitLab From 22f914a6a23824f142449dc5bff28dcb75ee1244 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Sep 2022 16:02:55 +0000 Subject: [PATCH 57/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index a132864a..0917e9af 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -64,7 +64,7 @@ - + -- GitLab From 8c732b48cd1f6044a67d0ac99b14a46f89bdb1df Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 2 Sep 2022 08:04:39 +0000 Subject: [PATCH 58/83] Update 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 0917e9af..07ec5f5e 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -48,14 +48,14 @@ - - + + -- GitLab From b12b2a02601b717abb3f0b84fea0b3563506a0c6 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Sep 2022 09:08:09 +0100 Subject: [PATCH 59/83] Pushing identifiers down to LocationOutcome --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 07ec5f5e..bd40567f 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -54,14 +54,14 @@ - - + + -- GitLab From 19215cb9c84afec5b23689cd514e9a1ca596e315 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Sep 2022 10:58:44 +0100 Subject: [PATCH 60/83] Reverting SBI type addition --- 33128/r18/TS33128Payloads.asn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 1264b81f..30502982 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4364,8 +4364,7 @@ Location ::= SEQUENCE locationInfo [1] LocationInfo OPTIONAL, positioningInfo [2] PositioningInfo OPTIONAL, locationPresenceReport [3] LocationPresenceReport OPTIONAL, - ePSLocationInfo [4] EPSLocationInfo OPTIONAL, - tS29518ProvideLocInfo [5] SBIType OPTIONAL + ePSLocationInfo [4] EPSLocationInfo OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -5034,6 +5033,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -SBIType ::= UTF8String - END -- GitLab From 7a3e2723552793400ea4cfc21009c6348ff9277a Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 5 Sep 2022 07:38:06 +0000 Subject: [PATCH 61/83] TS 33.128 CR 0356 for LI for Edge Computing for Edge Aware devices for R18 of 3GPP --- 33128/r18/TS33128Payloads.asn | 398 +++++++++++++++++- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 11 + 2 files changed, 407 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 30502982..efaac5f9 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -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.X.2 + eESEECRegistration [201] EESEECRegistration, + eESEASDiscovery [202] EESEASDiscovery, + eESEASDiscoverySubscription [203] EESEASDiscoverySubscription, + eESEASDiscoveryNotification [204] EESEASDiscoveryNotification, + eESAppContextRelocation [205] EESAppContextRelocation, + eESACRSubscription [206] EESACRSubscription, + eESACRNotification [207] EESACRNotification, + eESEECContextRelocation [208] EESEECContextRelocation, + eESStartOfInterceptionWithRegisteredEEC [209] EESStartOfInterceptionWithRegisteredEEC } -- ============== @@ -379,7 +390,19 @@ 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.X.2 + eESEECRegistration [201] EESEECRegistration, + eESEASDiscovery [202] EESEASDiscovery, + eESEASDiscoverySubscription [203] EESEASDiscoverySubscription, + eESEASDiscoveryNotification [204] EESEASDiscoveryNotification, + eESAppContextRelocation [205] EESAppContextRelocation, + eESACRSubscription [206] EESACRSubscription, + eESACRNotification [207] EESACRNotification, + eESEECContextRelocation [208] EESEECContextRelocation, + eESStartOfInterceptionWithRegisteredEEC [209] EESStartOfInterceptionWithRegisteredEEC + } IRITargetIdentifier ::= SEQUENCE @@ -452,6 +475,7 @@ S8HRBearerInfo ::= SEQUENCE -- ================ -- HR LI parameters + -- ================ N9HRMessageCause ::= ENUMERATED @@ -3414,6 +3438,376 @@ RCDDisplayInfo ::= SEQUENCE jcl [3] OCTET STRING OPTIONAL } +-- ================= +-- EES definitions +-- ================= + +-- See clause 7.X.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.X.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.X.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.X.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.X.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.X.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.X.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.X.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.X.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 -- =================== diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index d5f9cfef..f5a58f28 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -36,6 +36,17 @@ + + + + + + + + + + + -- GitLab From 1f773135dcba7a6bc1ae08174a7b75aafc2cbfd7 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Wed, 6 Jul 2022 11:35:16 +0000 Subject: [PATCH 62/83] updates reflect changes in s3i220319 --- 33128/r18/TS33128Payloads.asn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index efaac5f9..db27f3fe 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1333,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) -- GitLab From 0a9e40d0d6d63ba9a2c6249ed3d4683b1d1dfe08 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Mon, 5 Sep 2022 07:53:26 +0000 Subject: [PATCH 63/83] TS 33.128 CR0370 - Addition of EUI64 and Paging Restriction Indicator to AMFRegistration Record --- 33128/r18/TS33128Payloads.asn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index db27f3fe..1779a15d 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1182,7 +1182,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 @@ -4516,7 +4517,8 @@ NonLocalID ::= ENUMERATED NonIMEISVPEI ::= CHOICE { - mACAddress [1] MACAddress + mACAddress [1] MACAddress, + eUI64 [2] EUI64 } NPNAccessInformation ::= CHOICE @@ -4526,6 +4528,8 @@ NPNAccessInformation ::= CHOICE NSSAI ::= SEQUENCE OF SNSSAI +PagingRestrictionIndicator ::= OCTET STRING (SIZE(1..33)) + PLMNID ::= SEQUENCE { mCC [1] MCC, -- GitLab From 6e33c83bf0987d2f7e738aec7389a10b190dc588 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 7 Jul 2022 14:12:49 +0000 Subject: [PATCH 64/83] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 365 +++++++++++++++++++++++++++++----- 1 file changed, 312 insertions(+), 53 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 1779a15d..98b1d4c9 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1351,32 +1351,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 @@ -1398,7 +1399,8 @@ 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 } -- See clause 6.2.3.2.4 for details of this structure @@ -1417,36 +1419,38 @@ 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 } -- See clause 6.2.3.2.6 for details of this structure @@ -1910,10 +1914,113 @@ 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 +} + -- ====================== -- PGW-C + SMF Parameters -- ====================== +CSRMFI ::= BOOLEAN + EPS5GSComboInfo ::= SEQUENCE { ePSInterworkingIndication [1] EPSInterworkingIndication, @@ -1952,13 +2059,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 -- ================== @@ -4428,6 +4676,8 @@ IMPU ::= CHOICE IMSI ::= NumericString (SIZE(6..15)) +IMSIUnauthenticatedIndication ::= BOOLEAN + Initiator ::= ENUMERATED { uE(1), @@ -4538,6 +4788,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 -- GitLab From 2dd6fd98d23cc8efca6b0d2eeb5f9fa6c46514cb Mon Sep 17 00:00:00 2001 From: hawbaker Date: Thu, 14 Jul 2022 13:25:52 +0000 Subject: [PATCH 65/83] Update 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd --- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 501e60a8..1f64454e 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -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 + -- GitLab From ed4156e2440879c021655546b192c0eadda60e3f Mon Sep 17 00:00:00 2001 From: hawbaker Date: Mon, 5 Sep 2022 08:26:10 +0000 Subject: [PATCH 66/83] TS 33.128 CR0380 - Correction to UDMServingSystemMessage Record --- 33128/r18/TS33128Payloads.asn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 98b1d4c9..909f2b30 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -2246,7 +2246,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 @@ -2405,6 +2406,9 @@ UDMInvalidParameters ::= SEQUENCE parameter [1] UTF8String OPTIONAL, reason [2] UTF8String OPTIONAL } + +RoamingIndicator ::= BOOLEAN + -- =================== -- 5G SMSF definitions -- =================== -- GitLab From afd85cd256d8450d096c908cfd36abc58b631518 Mon Sep 17 00:00:00 2001 From: chavanne Date: Mon, 5 Sep 2022 08:55:50 +0000 Subject: [PATCH 67/83] TS 33.128 CR0383 - R18 Alignment of target identifiers with services in ASN.1 --- 33128/r18/TS33128Payloads.asn | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 909f2b30..8ee3f994 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4973,16 +4973,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 -- GitLab From aa8c6a6bd46987f17b90803380695a93fe326421 Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 5 Sep 2022 08:57:56 +0000 Subject: [PATCH 68/83] TS 33.128 CR0385 - STIR/SHAKEN: Enhancements to stage 3 LI descriptions (LI_X1 provisioning) in R18. --- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index f5a58f28..bc256677 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -97,6 +97,7 @@ + @@ -358,4 +359,15 @@ + + + + + + + + + + + -- GitLab From e897e72faae6d6c8de27be516c1feead634678e5 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 5 Sep 2022 09:05:53 +0000 Subject: [PATCH 69/83] TS 33.128 CR0399 - Adding support for Session Based Triggers to PDSR --- 33128/r18/TS33128Payloads.asn | 3 ++- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 8ee3f994..532b13dd 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4110,7 +4110,8 @@ PDSummaryReport ::= SEQUENCE firstPacketTimestamp [10] Timestamp, lastPacketTimestamp [11] Timestamp, packetCount [12] INTEGER, - byteCount [13] INTEGER + byteCount [13] INTEGER, + useSessionTrigger [14] BOOLEAN } -- ==================== diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index bc256677..908cebc4 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -208,6 +208,7 @@ + -- GitLab From 3f3ffa95022da162634038723aea1f0fa943d0af Mon Sep 17 00:00:00 2001 From: chavanne Date: Mon, 5 Sep 2022 09:24:04 +0000 Subject: [PATCH 70/83] TS 33.128 CR0381 - R16 Alignment of target identifiers with services in ASN.1 --- 33128/r16/TS33128Payloads.asn | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 3ce8d6a0..8bb55d31 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -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 -- GitLab From d2f42b1536161240f264594b9128cbf324eac5bb Mon Sep 17 00:00:00 2001 From: hawbaker Date: Wed, 6 Jul 2022 11:16:40 +0000 Subject: [PATCH 71/83] updates based off of s3i220318 --- 33128/r17/TS33128Payloads.asn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index b0469013..6baf78f3 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1277,7 +1277,10 @@ AMFRegistrationType ::= ENUMERATED initial(1), mobility(2), periodic(3), - emergency(4) + emergency(4), + sNPNOnboarding(5), + disasterMobility(6), + disasterInitial(7) } AMFSetID ::= INTEGER (0..1023) -- GitLab From 5e551e9bdee270830b1e45e279f2f09ae6da82bf Mon Sep 17 00:00:00 2001 From: hawbaker Date: Mon, 5 Sep 2022 11:05:59 +0000 Subject: [PATCH 72/83] TS 33.128 CR0369 - Addition of EUI64 and Paging Restriction Indicator to AMFRegistration Record --- 33128/r17/TS33128Payloads.asn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 6baf78f3..9e8f0d12 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -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 @@ -3901,11 +3902,14 @@ 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, -- GitLab From 3d8a6ad5f9d09f5aeeb123eef9f144ac3457409b Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 7 Jul 2022 13:11:05 +0000 Subject: [PATCH 73/83] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 365 +++++++++++++++++++++++++++++----- 1 file changed, 312 insertions(+), 53 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 9e8f0d12..d125b1b8 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1293,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 @@ -1340,7 +1341,8 @@ 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 } -- See clause 6.2.3.2.4 for details of this structure @@ -1359,36 +1361,38 @@ 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 } -- See clause 6.2.3.2.6 for details of this structure @@ -1852,10 +1856,113 @@ 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 +} + -- ====================== -- PGW-C + SMF Parameters -- ====================== +CSRMFI ::= BOOLEAN + EPS5GSComboInfo ::= SEQUENCE { ePSInterworkingIndication [1] EPSInterworkingIndication, @@ -1894,13 +2001,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 -- ================== @@ -3846,6 +4094,8 @@ IMPU ::= CHOICE IMSI ::= NumericString (SIZE(6..15)) +IMSIUnauthenticatedIndication ::= BOOLEAN + Initiator ::= ENUMERATED { uE(1), @@ -3916,6 +4166,15 @@ PLMNID ::= SEQUENCE mNC [2] MNC } +PDNConnectionType ::= ENUMERATED +{ + iPv4(1), + iPv6(2), + iPv4v6(3), + nonIP(4), + ethernet(5) +} + PDUSessionID ::= INTEGER (0..255) PDUSessionType ::= ENUMERATED -- GitLab From ce419116a2760b244cab08cf73a887937d0ba100 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Mon, 5 Sep 2022 11:32:00 +0000 Subject: [PATCH 74/83] TS 33.128 CR0372 - Correction of Identity Association Record --- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 501e60a8..1f64454e 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -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 + -- GitLab From fc14883aebb40e16ee9ecad65f7770ef4b7e17b6 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Mon, 5 Sep 2022 11:34:20 +0000 Subject: [PATCH 75/83] TS 33.128 CR0379 - Correction to UDMServingSystemMessage Record --- 33128/r17/TS33128Payloads.asn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index d125b1b8..84d18bfa 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -2188,7 +2188,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 @@ -2347,6 +2348,9 @@ UDMInvalidParameters ::= SEQUENCE parameter [1] UTF8String OPTIONAL, reason [2] UTF8String OPTIONAL } + +RoamingIndicator ::= BOOLEAN + -- =================== -- 5G SMSF definitions -- =================== -- GitLab From 87c7ee8a425414eb1d74647ebd37363c7737a829 Mon Sep 17 00:00:00 2001 From: chavanne Date: Mon, 5 Sep 2022 11:36:08 +0000 Subject: [PATCH 76/83] TS 33.128 CR0382 - R17 Alignment of target identifiers with services in ASN.1 --- 33128/r17/TS33128Payloads.asn | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 84d18bfa..9b605ee0 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -4318,16 +4318,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 -- GitLab From 6c5d8db05faa1651764de32be63d7f615e19a650 Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 5 Sep 2022 11:38:07 +0000 Subject: [PATCH 77/83] TS 33.128 CR0384 - STIR/SHAKEN: Enhancements to stage 3 LI descriptions (LI_X1 provisioning) in R17. --- 33128/r17/TS33128IdentityAssociation.asn | 2 +- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/33128/r17/TS33128IdentityAssociation.asn b/33128/r17/TS33128IdentityAssociation.asn index 707aaa27..72d66c5e 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/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index d5f9cfef..481c50d0 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -86,6 +86,7 @@ + @@ -347,4 +348,15 @@ + + + + + + + + + + + -- GitLab From 29aeb80e92b9b1fc2c51c8d01c391afec42a3133 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 5 Sep 2022 11:42:51 +0000 Subject: [PATCH 78/83] TS 33.128 CR0398 - Adding support for Session Based Triggers to PDSR --- 33128/r17/TS33128Payloads.asn | 3 ++- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 9b605ee0..9c4b5644 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -3682,7 +3682,8 @@ PDSummaryReport ::= SEQUENCE firstPacketTimestamp [10] Timestamp, lastPacketTimestamp [11] Timestamp, packetCount [12] INTEGER, - byteCount [13] INTEGER + byteCount [13] INTEGER, + perSessionTrigger [14] BOOLEAN } -- ==================== diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 481c50d0..e6519a07 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -197,6 +197,7 @@ + -- GitLab From 4fd659b52aaac1c3d70f66837e131ede29982508 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 5 Sep 2022 13:50:38 +0000 Subject: [PATCH 79/83] Adding artefacts to Merge Requests --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4e3df33..c54d1309 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 -- GitLab From b39d566596a6bffc86236e5d125e3239ab03eafa Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 5 Sep 2022 15:00:48 +0100 Subject: [PATCH 80/83] Updating OIDs and namespaces --- 33128/r16/TS33128Payloads.asn | 4 ++-- 33128/r17/TS33128Payloads.asn | 4 ++-- 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 4 ++-- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 4 ++-- 33128/r18/TS33128Payloads.asn | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 8 ++++---- 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 8 ++++---- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 8bb55d31..6576c098 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)} diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index ad035329..4dd57088 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)} diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 1f64454e..1204f498 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index e6519a07..5f29b559 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,8 +1,8 @@ diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index fe42999f..5c53dcec 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)} diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 5bd0e2b9..8918bc0d 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,15 +1,15 @@ - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index c83f62ff..d6856f5f 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -1,10 +1,10 @@ diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 908cebc4..bef6ae33 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,8 +1,8 @@ diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index bd40567f..4e9dd41e 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -1,13 +1,13 @@ - + -- GitLab From 97bee0a8d386d5e8d017859027281014673cac43 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 5 Sep 2022 15:05:33 +0100 Subject: [PATCH 81/83] Removing whitespace --- 33128/r18/TS33128Payloads.asn | 1 - 1 file changed, 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5c53dcec..034c3f57 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -402,7 +402,6 @@ IRIEvent ::= CHOICE eESACRNotification [207] EESACRNotification, eESEECContextRelocation [208] EESEECContextRelocation, eESStartOfInterceptionWithRegisteredEEC [209] EESStartOfInterceptionWithRegisteredEEC - } IRITargetIdentifier ::= SEQUENCE -- GitLab From 777d3f197c5cd0f72f101efe848f378e601e48b0 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 7 Sep 2022 10:03:21 +0100 Subject: [PATCH 82/83] Fixing whitespace and tag numbers --- 33128/r17/TS33128Payloads.asn | 4 ++-- 33128/r18/TS33128Payloads.asn | 40 +++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 4dd57088..a22fd2af 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1395,7 +1395,7 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, pCCRules [24] PCCRuleSet OPTIONAL, ePSStartOfInterceptionWithEstablishedPDNConnection [25] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL, - pFDDataForApps [26] PFDDataForApps OPTIONAL + pFDDataForApps [26] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -2066,7 +2066,7 @@ EPSBearerContext ::= SEQUENCE { ePSBearerID [1] EPSBearerID, uPGTPTunnelInfo [2] GTPTunnelInfo, - bearerQOS [3] EPSBearerQOS + bearerQOS [3] EPSBearerQOS } EPSBearerContextCreated ::= SEQUENCE diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 034c3f57..97de590e 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -197,15 +197,15 @@ XIRIEvent ::= CHOICE aMFRANHandoverRequest [114] AMFRANHandoverRequest, -- EES events, see clause 7.X.2 - eESEECRegistration [201] EESEECRegistration, - eESEASDiscovery [202] EESEASDiscovery, - eESEASDiscoverySubscription [203] EESEASDiscoverySubscription, - eESEASDiscoveryNotification [204] EESEASDiscoveryNotification, - eESAppContextRelocation [205] EESAppContextRelocation, - eESACRSubscription [206] EESACRSubscription, - eESACRNotification [207] EESACRNotification, - eESEECContextRelocation [208] EESEECContextRelocation, - eESStartOfInterceptionWithRegisteredEEC [209] EESStartOfInterceptionWithRegisteredEEC + 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 } -- ============== @@ -393,15 +393,15 @@ IRIEvent ::= CHOICE aMFRANHandoverRequest [114] AMFRANHandoverRequest, -- EES events, see clause 7.X.2 - eESEECRegistration [201] EESEECRegistration, - eESEASDiscovery [202] EESEASDiscovery, - eESEASDiscoverySubscription [203] EESEASDiscoverySubscription, - eESEASDiscoveryNotification [204] EESEASDiscoveryNotification, - eESAppContextRelocation [205] EESAppContextRelocation, - eESACRSubscription [206] EESACRSubscription, - eESACRNotification [207] EESACRNotification, - eESEECContextRelocation [208] EESEECContextRelocation, - eESStartOfInterceptionWithRegisteredEEC [209] EESStartOfInterceptionWithRegisteredEEC + 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 @@ -1452,7 +1452,7 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, pCCRules [24] PCCRuleSet OPTIONAL, ePSStartOfInterceptionWithEstablishedPDNConnection [25] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL, - pFDDataForApps [26] PFDDataForApps OPTIONAL + pFDDataForApps [26] PFDDataForApps OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -2123,7 +2123,7 @@ EPSBearerContext ::= SEQUENCE { ePSBearerID [1] EPSBearerID, uPGTPTunnelInfo [2] GTPTunnelInfo, - bearerQOS [3] EPSBearerQOS + bearerQOS [3] EPSBearerQOS } EPSBearerContextCreated ::= SEQUENCE -- GitLab From 04037f1d64c79851a462d9c370f6c9dcd125f259 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 12 Sep 2022 08:31:05 +0100 Subject: [PATCH 83/83] Updating references --- 33128/r17/TS33128Payloads.asn | 2 +- 33128/r18/TS33128Payloads.asn | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index a22fd2af..1304ee37 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1986,7 +1986,7 @@ PFDDataForApp ::= SEQUENCE PFDs ::= SET OF PFD --- See table 5.6.2.5-1 of TS 29.551 [AA] +-- See table 5.6.2.5-1 of TS 29.551 [94] PFD ::= SEQUENCE { pFDId [1] UTF8String, diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 97de590e..95a474f3 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -196,7 +196,7 @@ XIRIEvent ::= CHOICE aMFRANHandoverCommand [113] AMFRANHandoverCommand, aMFRANHandoverRequest [114] AMFRANHandoverRequest, - -- EES events, see clause 7.X.2 + -- EES events, see clause 7.14.2 eESEECRegistration [115] EESEECRegistration, eESEASDiscovery [116] EESEASDiscovery, eESEASDiscoverySubscription [117] EESEASDiscoverySubscription, @@ -392,7 +392,7 @@ IRIEvent ::= CHOICE aMFRANHandoverCommand [113] AMFRANHandoverCommand, aMFRANHandoverRequest [114] AMFRANHandoverRequest, - -- EES events, see clause 7.X.2 + -- EES events, see clause 7.14.2 eESEECRegistration [115] EESEECRegistration, eESEASDiscovery [116] EESEASDiscovery, eESEASDiscoverySubscription [117] EESEASDiscoverySubscription, @@ -2043,7 +2043,7 @@ PFDDataForApp ::= SEQUENCE PFDs ::= SET OF PFD --- See clause 5.6.2.5 of TS 29.551 [AA] +-- See clause 5.6.2.5 of TS 29.551 [96] PFD ::= SEQUENCE { pFDId [1] UTF8String, @@ -3758,7 +3758,7 @@ RCDDisplayInfo ::= SEQUENCE -- EES definitions -- ================= --- See clause 7.X.2.2 for details of this structure +-- See clause 7.14.2.2 for details of this structure EESEECRegistration ::= SEQUENCE { registrationType [1] RegistrationType, @@ -3773,7 +3773,7 @@ EESEECRegistration ::= SEQUENCE failureResponse [10] FailureResponse OPTIONAL } --- See clause 7.X.2.3 for details of this structure +-- See clause 7.14.2.3 for details of this structure EESEASDiscovery ::= SEQUENCE { eECID [1] UTF8String, @@ -3786,7 +3786,7 @@ EESEASDiscovery ::= SEQUENCE failureResponse [8] FailureResponse OPTIONAL } --- See clause 7.X.2.4 for details of this structure +-- See clause 7.14.2.4 for details of this structure EESEASDiscoverySubscription ::= SEQUENCE { eECID [1] UTF8String, @@ -3801,7 +3801,7 @@ EESEASDiscoverySubscription ::= SEQUENCE failureResponse [10] FailureResponse OPTIONAL } --- See clause 7.X.2.5 for details of this structure +-- See clause 7.14.2.5 for details of this structure EESEASDiscoveryNotification ::= SEQUENCE { subscriptionID [1] UTF8String, @@ -3810,7 +3810,7 @@ EESEASDiscoveryNotification ::= SEQUENCE failureResponse [4] FailureResponse OPTIONAL } --- See clause 7.X.2.6 for details of this structure +-- See clause 7.14.2.6 for details of this structure EESAppContextRelocation ::= SEQUENCE { eECID [1] UTF8String, @@ -3841,7 +3841,7 @@ ACRInitiateReq ::= SEQUENCE routeReq [6] RouteToLocation OPTIONAL } --- See clause 7.X.2.7 for details of this structure +-- See clause 7.14.2.7 for details of this structure EESACRSubscription ::= SEQUENCE { eECID [1] UTF8String, @@ -3855,7 +3855,7 @@ EESACRSubscription ::= SEQUENCE failureResponse [9] FailureResponse OPTIONAL } --- See clause 7.X.2.8 for details of this structure +-- See clause 7.14.2.8 for details of this structure EESACRNotification ::= SEQUENCE { subscriptionID [1] UTF8String, @@ -3866,7 +3866,7 @@ EESACRNotification ::= SEQUENCE failReason [6] UTF8String OPTIONAL } --- See clause 7.X.2.9 for details of this structure +-- See clause 7.14.2.9 for details of this structure EESEECContextRelocation ::= SEQUENCE { eECID [1] UTF8String, @@ -3876,7 +3876,7 @@ EESEECContextRelocation ::= SEQUENCE aCProfiles [5] ACProfiles OPTIONAL } --- See clause 7.X.2.10 for details of this structure +-- See clause 7.14.2.10 for details of this structure EESStartOfInterceptionWithRegisteredEEC ::= SEQUENCE { eECID [1] UTF8String, -- GitLab