Skip to content

GitLab

Commit 8b279403 authored by canterburym's avatar canterburym
Browse files

TS 33.128 v16.6.0 (2021-04-01) agreed at SA#91-e

parent b42137cb
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 44 deletions
33128/r16/TS33128IdentityAssociation.asn
View file @ 8b279403
TS33128IdentityAssociation
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r16(16) version1(1)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r16(16) version2(2)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
BEGIN
tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r16(16) version1(1)}
tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r16(16) version2(2)}
iEFRecordOID RELATIVE-OID ::= {tS33128IdentityAssociationOID iEF(1)}
......@@ -51,8 +51,7 @@ IEFKeepaliveMessage ::= SEQUENCE
sequenceNumber [1] INTEGER
}
FiveGGUTI ::= OCTET STRING (SIZE(14))
FiveGGUTI ::= OCTET STRING (SIZE(10))
NCGI ::= SEQUENCE
{
......@@ -97,4 +96,4 @@ EUI64 ::= OCTET STRING (SIZE(8))
SUCI ::= OCTET STRING (SIZE(8..3008))
END
\ No newline at end of file
END
33128/r16/TS33128Payloads.asn
View file @ 8b279403
TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version4(4)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version5(5)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
......@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs
-- =============
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version4(4)}
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version5(5)}
xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
......@@ -113,9 +113,12 @@ XIRIEvent ::= CHOICE
startOfInterceptionWithEstablishedMAPDUSession [60] SMFStartOfInterceptionWithEstablishedMAPDUSession,
unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure,
-- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2
-- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2
aMFIdentifierAssocation [62] AMFIdentifierAssocation,
mMEIdentifierAssocation [63] MMEIdentifierAssocation
mMEIdentifierAssocation [63] MMEIdentifierAssocation,
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification
}
-- ==============
......@@ -224,7 +227,10 @@ IRIEvent ::= CHOICE
-- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2
aMFIdentifierAssocation [62] AMFIdentifierAssocation,
mMEIdentifierAssocation [63] MMEIdentifierAssocation
mMEIdentifierAssocation [63] MMEIdentifierAssocation,
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification
}
IRITargetIdentifier ::= SEQUENCE
......@@ -416,7 +422,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE
requestType [15] FiveGSMRequestType,
accessType [16] AccessType OPTIONAL,
rATType [17] RATType OPTIONAL,
sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL
sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL,
uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL
}
-- See clause 6.2.3.2.3 for details of this structure
......@@ -431,7 +438,8 @@ SMFPDUSessionModification ::= SEQUENCE
location [7] Location OPTIONAL,
requestType [8] FiveGSMRequestType,
accessType [9] AccessType OPTIONAL,
rATType [10] RATType OPTIONAL
rATType [10] RATType OPTIONAL,
pDUSessionID [11] PDUSessionID OPTIONAL
}
-- See clause 6.2.3.2.4 for details of this structure
......@@ -445,7 +453,8 @@ SMFPDUSessionRelease ::= SEQUENCE
timeOfLastPacket [6] Timestamp OPTIONAL,
uplinkVolume [7] INTEGER OPTIONAL,
downlinkVolume [8] INTEGER OPTIONAL,
location [9] Location OPTIONAL
location [9] Location OPTIONAL,
cause [10] SMFErrorCodes OPTIONAL
}
-- See clause 6.2.3.2.5 for details of this structure
......@@ -496,6 +505,24 @@ SMFUnsuccessfulProcedure ::= SEQUENCE
location [19] Location OPTIONAL
}
-- See clause 6.2.3.2.8 for details of this structure
SMFPDUtoMAPDUSessionModification ::= SEQUENCE
{
sUPI [1] SUPI OPTIONAL,
sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL,
pEI [3] PEI OPTIONAL,
gPSI [4] GPSI OPTIONAL,
sNSSAI [5] SNSSAI OPTIONAL,
non3GPPAccessEndpoint [6] UEEndpointAddress OPTIONAL,
location [7] Location OPTIONAL,
requestType [8] FiveGSMRequestType,
accessType [9] AccessType OPTIONAL,
rATType [10] RATType OPTIONAL,
pDUSessionID [11] PDUSessionID,
requestIndication [12] RequestIndication,
aTSSSContainer [13] ATSSSContainer
}
-- See clause 6.2.3.2.7.1 for details of this structure
SMFMAPDUSessionEstablishment ::= SEQUENCE
{
......@@ -653,6 +680,22 @@ SMFMAAcceptedIndication ::= BOOLEAN
-- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure.
SMFErrorCodes ::= UTF8String
-- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure.
UEEPSPDNConnection ::= OCTET STRING
-- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure.
RequestIndication ::= ENUMERATED
{
uEREQPDUSESMOD(0),
uEREQPDUSESREL(1),
pDUSESMOB(2),
nWREQPDUSESAUTH(3),
nWREQPDUSESMOD(4),
nWREQPDUSESREL(5),
eBIASSIGNMENTREQ(6),
rELDUETO5GANREQUEST(7)
}
-- ==================
-- 5G UPF definitions
-- ==================
......@@ -2636,7 +2679,8 @@ PositioningMethodAndUsage ::= SEQUENCE
{
method [1] PositioningMethod,
mode [2] PositioningMode,
usage [3] Usage
usage [3] Usage,
methodCode [4] MethodCode OPTIONAL
}
-- TS 29.572 [24], clause 6.1.6.2.16
......@@ -2779,11 +2823,18 @@ PositioningMethod ::= ENUMERATED
cellID(1),
eCID(2),
oTDOA(3),
barometricPresure(4),
barometricPressure(4),
wLAN(5),
bluetooth(6),
mBS(7),
motionSensor(8)
motionSensor(8),
dLTDOA(9),
dLAOD(10),
multiRTT(11),
nRECID(12),
uLTDOA(13),
uLAOA(14),
networkSpecific(15)
}
-- TS 29.572 [24], clause 6.1.6.3.7
......@@ -2802,7 +2853,9 @@ GNSSID ::= ENUMERATED
sBAS(3),
modernizedGPS(4),
qZSS(5),
gLONASS(6)
gLONASS(6),
bDS(7),
nAVIC(8)
}
-- TS 29.572 [24], clause 6.1.6.3.9
......@@ -2821,4 +2874,7 @@ TimeZone ::= UTF8String
-- Open Geospatial Consortium URN [35]
OGCURN ::= UTF8String
END
\ No newline at end of file
-- TS 29.572 [24], clause 6.1.6.2.15
MethodCode ::= INTEGER (16..31)
END
33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions_r16_v1.xsd
View file @ 8b279403
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v1"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v2"
xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"
xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v1"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v2"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"></xs:import>
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"></xs:import>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:complexType name="IdentityAssociationRequest">
<xs:complexContent>
......@@ -21,17 +21,15 @@
<xs:complexType name="RequestDetails">
<xs:sequence>
<xs:element name="Type" type="DictionaryEntry" minOccurs="0"/>
<xs:element name="StartTime" type="common:QualifiedDateTime" minOccurs="0"/>
<xs:element name="EndTime" type="common:QualifiedDateTime" minOccurs="0"/>
<xs:element name="ObservedTime" type="common:QualifiedDateTime" minOccurs="0"/>
<xs:element name="RequestValues" type="RequestValues" minOccurs="0"/>
<xs:element name="Type" type="DictionaryEntry"/>
<xs:element name="ObservedTime" type="common:QualifiedDateTime"/>
<xs:element name="RequestValues" type="RequestValues"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RequestValues">
<xs:sequence>
<xs:element name="RequestValue" type="RequestValue" minOccurs="1" maxOccurs="unbounded"/>
<xs:element name="RequestValue" type="RequestValue" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
......@@ -67,41 +65,52 @@
</xs:complexContent>
</xs:complexType>
<xs:complexType name="IdentityResponseDetails">
<xs:element name="LIHIQRResponse" type="IdentityResponseDetails"/>
<xs:complexType name="IdentityResponseDetails">
<xs:sequence>
<xs:element name="Associations" type="IdentityAssociationRecords" minOccurs="1"></xs:element>
<xs:element name="Associations" type="IdentityAssociationRecords"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="IdentityAssociationRecords">
<xs:sequence>
<xs:element name="IdentityAssociationRecord" type="IdentityAssociationRecord" minOccurs="0" maxOccurs="unbounded"></xs:element>
<xs:element name="IdentityAssociationRecord" type="IdentityAssociationRecord" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="IdentityAssociationRecord">
<xs:sequence>
<xs:element name="SUPI" type="SUPI" minOccurs="0"></xs:element>
<xs:element name="FiveGGUTI" type="common:NAI" minOccurs="0"></xs:element>
<xs:element name="PEI" type="PEI" minOccurs="0"></xs:element>
<xs:element name="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"></xs:element>
<xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime"></xs:element>
<xs:element name="SUPI" type="SUPI"/>
<xs:element name="SUCI" type="SUCI" minOccurs="0"/>
<xs:element name="FiveGGUTI" type="FiveGGUTI"/>
<xs:element name="PEI" type="PEI" minOccurs="0"/>
<xs:element name="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"/>
<xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="SUPI">
<xs:choice>
<xs:element name="SUPIIMSI" type="common:SUPIIMSI"></xs:element>
<xs:element name="SUPINAI" type="common:SUPINAI"></xs:element>
<xs:element name="SUPIIMSI" type="common:SUPIIMSI"/>
<xs:element name="SUPINAI" type="common:SUPINAI"/>
</xs:choice>
</xs:complexType>
<xs:simpleType name="SUCI">
<xs:restriction base="xs:string"/>
</xs:simpleType>
<xs:simpleType name="FiveGGUTI">
<xs:restriction base="xs:string"/>
</xs:simpleType>
<xs:complexType name="PEI">
<xs:choice>
<xs:element name="PEIIMEI" type="common:PEIIMEI"></xs:element>
<xs:element name="PEIIMEISV" type="common:PEIIMEISV"></xs:element>
<xs:element name="PEIMAC" type="common:MACAddress"></xs:element>
<xs:element name="PEIIMEI" type="common:PEIIMEI"/>
<xs:element name="PEIIMEISV" type="common:PEIIMEISV"/>
<xs:element name="PEIMAC" type="common:MACAddress"/>
</xs:choice>
</xs:complexType>
</xs:complexType>
</xs:schema>
\ No newline at end of file
</xs:schema>
33128/r16/urn_3GPP_ns_li_3GPPX1Extensions_r16_v3.xsd
View file @ 8b279403
......@@ -245,4 +245,4 @@
</xs:simpleType>
<xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"></xs:element>
</xs:schema>
\ No newline at end of file
</xs:schema>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment