Commit eff8a36c authored by canterburym's avatar canterburym
Browse files

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

parent 9d85837b
Pipeline #3145 passed with stages
in 59 seconds
TS33128IdentityAssociation 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 ::= DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
BEGIN 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)} iEFRecordOID RELATIVE-OID ::= {tS33128IdentityAssociationOID iEF(1)}
...@@ -51,8 +51,7 @@ IEFKeepaliveMessage ::= SEQUENCE ...@@ -51,8 +51,7 @@ IEFKeepaliveMessage ::= SEQUENCE
sequenceNumber [1] INTEGER sequenceNumber [1] INTEGER
} }
FiveGGUTI ::= OCTET STRING (SIZE(10))
FiveGGUTI ::= OCTET STRING (SIZE(14))
NCGI ::= SEQUENCE NCGI ::= SEQUENCE
{ {
......
TS33128Payloads 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 ::= DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
...@@ -9,7 +9,7 @@ BEGIN ...@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs -- 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)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
...@@ -113,9 +113,12 @@ XIRIEvent ::= CHOICE ...@@ -113,9 +113,12 @@ XIRIEvent ::= CHOICE
startOfInterceptionWithEstablishedMAPDUSession [60] SMFStartOfInterceptionWithEstablishedMAPDUSession, startOfInterceptionWithEstablishedMAPDUSession [60] SMFStartOfInterceptionWithEstablishedMAPDUSession,
unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, 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, 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 ...@@ -224,7 +227,10 @@ IRIEvent ::= CHOICE
-- 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, 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 IRITargetIdentifier ::= SEQUENCE
...@@ -416,7 +422,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE ...@@ -416,7 +422,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE
requestType [15] FiveGSMRequestType, requestType [15] FiveGSMRequestType,
accessType [16] AccessType OPTIONAL, accessType [16] AccessType OPTIONAL,
rATType [17] RATType 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 -- See clause 6.2.3.2.3 for details of this structure
...@@ -431,7 +438,8 @@ SMFPDUSessionModification ::= SEQUENCE ...@@ -431,7 +438,8 @@ SMFPDUSessionModification ::= SEQUENCE
location [7] Location OPTIONAL, location [7] Location OPTIONAL,
requestType [8] FiveGSMRequestType, requestType [8] FiveGSMRequestType,
accessType [9] AccessType OPTIONAL, 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 -- See clause 6.2.3.2.4 for details of this structure
...@@ -445,7 +453,8 @@ SMFPDUSessionRelease ::= SEQUENCE ...@@ -445,7 +453,8 @@ SMFPDUSessionRelease ::= SEQUENCE
timeOfLastPacket [6] Timestamp OPTIONAL, timeOfLastPacket [6] Timestamp OPTIONAL,
uplinkVolume [7] INTEGER OPTIONAL, uplinkVolume [7] INTEGER OPTIONAL,
downlinkVolume [8] 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 -- See clause 6.2.3.2.5 for details of this structure
...@@ -496,6 +505,24 @@ SMFUnsuccessfulProcedure ::= SEQUENCE ...@@ -496,6 +505,24 @@ SMFUnsuccessfulProcedure ::= SEQUENCE
location [19] Location OPTIONAL 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 -- See clause 6.2.3.2.7.1 for details of this structure
SMFMAPDUSessionEstablishment ::= SEQUENCE SMFMAPDUSessionEstablishment ::= SEQUENCE
{ {
...@@ -653,6 +680,22 @@ SMFMAAcceptedIndication ::= BOOLEAN ...@@ -653,6 +680,22 @@ SMFMAAcceptedIndication ::= BOOLEAN
-- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure. -- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure.
SMFErrorCodes ::= UTF8String 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 -- 5G UPF definitions
-- ================== -- ==================
...@@ -2636,7 +2679,8 @@ PositioningMethodAndUsage ::= SEQUENCE ...@@ -2636,7 +2679,8 @@ PositioningMethodAndUsage ::= SEQUENCE
{ {
method [1] PositioningMethod, method [1] PositioningMethod,
mode [2] PositioningMode, mode [2] PositioningMode,
usage [3] Usage usage [3] Usage,
methodCode [4] MethodCode OPTIONAL
} }
-- TS 29.572 [24], clause 6.1.6.2.16 -- TS 29.572 [24], clause 6.1.6.2.16
...@@ -2779,11 +2823,18 @@ PositioningMethod ::= ENUMERATED ...@@ -2779,11 +2823,18 @@ PositioningMethod ::= ENUMERATED
cellID(1), cellID(1),
eCID(2), eCID(2),
oTDOA(3), oTDOA(3),
barometricPresure(4), barometricPressure(4),
wLAN(5), wLAN(5),
bluetooth(6), bluetooth(6),
mBS(7), 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 -- TS 29.572 [24], clause 6.1.6.3.7
...@@ -2802,7 +2853,9 @@ GNSSID ::= ENUMERATED ...@@ -2802,7 +2853,9 @@ GNSSID ::= ENUMERATED
sBAS(3), sBAS(3),
modernizedGPS(4), modernizedGPS(4),
qZSS(5), qZSS(5),
gLONASS(6) gLONASS(6),
bDS(7),
nAVIC(8)
} }
-- TS 29.572 [24], clause 6.1.6.3.9 -- TS 29.572 [24], clause 6.1.6.3.9
...@@ -2821,4 +2874,7 @@ TimeZone ::= UTF8String ...@@ -2821,4 +2874,7 @@ TimeZone ::= UTF8String
-- Open Geospatial Consortium URN [35] -- Open Geospatial Consortium URN [35]
OGCURN ::= UTF8String OGCURN ::= UTF8String
-- TS 29.572 [24], clause 6.1.6.2.15
MethodCode ::= INTEGER (16..31)
END END
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" <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:x1="http://uri.etsi.org/03221/X1/2017/10"
xmlns:common="http://uri.etsi.org/03280/common/2017/07" 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"> elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"></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:import> <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:complexType name="IdentityAssociationRequest"> <xs:complexType name="IdentityAssociationRequest">
<xs:complexContent> <xs:complexContent>
...@@ -21,17 +21,15 @@ ...@@ -21,17 +21,15 @@
<xs:complexType name="RequestDetails"> <xs:complexType name="RequestDetails">
<xs:sequence> <xs:sequence>
<xs:element name="Type" type="DictionaryEntry" minOccurs="0"/> <xs:element name="Type" type="DictionaryEntry"/>
<xs:element name="StartTime" type="common:QualifiedDateTime" minOccurs="0"/> <xs:element name="ObservedTime" type="common:QualifiedDateTime"/>
<xs:element name="EndTime" type="common:QualifiedDateTime" minOccurs="0"/> <xs:element name="RequestValues" type="RequestValues"/>
<xs:element name="ObservedTime" type="common:QualifiedDateTime" minOccurs="0"/>
<xs:element name="RequestValues" type="RequestValues" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="RequestValues"> <xs:complexType name="RequestValues">
<xs:sequence> <xs:sequence>
<xs:element name="RequestValue" type="RequestValue" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="RequestValue" type="RequestValue" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
...@@ -67,40 +65,51 @@ ...@@ -67,40 +65,51 @@
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="IdentityResponseDetails"> <xs:element name="LIHIQRResponse" type="IdentityResponseDetails"/>
<xs:complexType name="IdentityResponseDetails">
<xs:sequence> <xs:sequence>
<xs:element name="Associations" type="IdentityAssociationRecords" minOccurs="1"></xs:element> <xs:element name="Associations" type="IdentityAssociationRecords"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="IdentityAssociationRecords"> <xs:complexType name="IdentityAssociationRecords">
<xs:sequence> <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:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="IdentityAssociationRecord"> <xs:complexType name="IdentityAssociationRecord">
<xs:sequence> <xs:sequence>
<xs:element name="SUPI" type="SUPI" minOccurs="0"></xs:element> <xs:element name="SUPI" type="SUPI"/>
<xs:element name="FiveGGUTI" type="common:NAI" minOccurs="0"></xs:element> <xs:element name="SUCI" type="SUCI" minOccurs="0"/>
<xs:element name="PEI" type="PEI" minOccurs="0"></xs:element> <xs:element name="FiveGGUTI" type="FiveGGUTI"/>
<xs:element name="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"></xs:element> <xs:element name="PEI" type="PEI" minOccurs="0"/>
<xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime"></xs:element> <xs:element name="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"/>
<xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="SUPI"> <xs:complexType name="SUPI">
<xs:choice> <xs:choice>
<xs:element name="SUPIIMSI" type="common:SUPIIMSI"></xs:element> <xs:element name="SUPIIMSI" type="common:SUPIIMSI"/>
<xs:element name="SUPINAI" type="common:SUPINAI"></xs:element> <xs:element name="SUPINAI" type="common:SUPINAI"/>
</xs:choice> </xs:choice>
</xs:complexType> </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:complexType name="PEI">
<xs:choice> <xs:choice>
<xs:element name="PEIIMEI" type="common:PEIIMEI"></xs:element> <xs:element name="PEIIMEI" type="common:PEIIMEI"/>
<xs:element name="PEIIMEISV" type="common:PEIIMEISV"></xs:element> <xs:element name="PEIIMEISV" type="common:PEIIMEISV"/>
<xs:element name="PEIMAC" type="common:MACAddress"></xs:element> <xs:element name="PEIMAC" type="common:MACAddress"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
......
...@@ -245,4 +245,4 @@ ...@@ -245,4 +245,4 @@
</xs:simpleType> </xs:simpleType>
<xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"></xs:element> <xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"></xs:element>
</xs:schema> </xs:schema>
\ No newline at end of file
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