Commit d09bb6cd authored by canterburym's avatar canterburym

Merge branch 'cr/ts_103120/009' into 'meeting/LI#54e'

Update ts_103120_ETSIDictionaryDefinitions.xml

See merge request !11
parent 68e4138e
......@@ -6,7 +6,7 @@ BEGIN
IMPORTS
-- from ETSI TS 102 232-1 [2]
IPAddress
IPAddress,
Location
FROM LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)};
......@@ -53,7 +53,7 @@ IPIRIContents ::= SEQUENCE
{
accessEventType [0] AccessEventType,
targetUsername [1] OCTET STRING,
-- in ASCIIcharacters
-- in ASCII-characters
internetAccessType [2] InternetAccessType,
iPVersion [3] IPVersion,
targetIPAddress [4] IPAddress OPTIONAL,
......@@ -126,7 +126,7 @@ AccessEventType ::= ENUMERATED
accessReject(2),
-- IAS access is refused to the target
accessFailed(3),
-- The Access_attempt timed-out or failed otherwise
-- The accessAttempt timed-out or failed otherwise
sessionStart(4),
-- A target starts using the IAS; not in use anymore from version 4(4)
sessionEnd(5),
......@@ -241,7 +241,7 @@ OtherTargetIdentifiers ::= CHOICE
-- This list is extensible to accommodate other target identifiers which
-- may be required in future.
iPAddress [0] IPAddress,
-- IPAddress imported from TS 101 671 [1].
-- IPAddress imported from TS 102 232 [2].
-- This can be an IPv4 address (with or without a subnet range defined) or
-- an IPv6 address (with or without a prefix range defined).
...
......
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version24(24)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -12,7 +12,7 @@ BEGIN
retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
-- rdHeader
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)}
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version24(24)}
-- ======================================
-- Top level definitions for RDHI wrapper
......@@ -665,10 +665,13 @@ ICCIDInfo ::= SEQUENCE
-- PUK2 code associated with the ICCID
iMSI [5] IMSI OPTIONAL,
sUPI [6] SUPI OPTIONAL,
gPSI [7] GPSI OPTIONAL
gPSI [7] GPSI OPTIONAL,
eID [8] NumericString (SIZE (32)) OPTIONAL
-- Identifier of the eUICC according to GSMA SGP.02, clause 2.2.2 [53]
}
LoginInfo ::= SEQUENCE
{
login [1] UTF8String OPTIONAL,
......@@ -1322,10 +1325,12 @@ Location ::= SEQUENCE
NCGI ::= SEQUENCE
{
pLMNID [1] PLMNID,
nRCellID [2] NRCellID
pLMNID [1] PLMNID,
nRCellID [2] NRCellID,
...
}
N3gppaLocation ::= SEQUENCE
{
n3gppTai [1] OCTET STRING (SIZE (5..6)) OPTIONAL,
......@@ -2517,9 +2522,13 @@ NwAccessType ::= ENUMERATED
wimax(6),
mobilePacketData(7),
-- Network access over GSM/3GPP GPRS, UMTS, etc.
...
...,
gPON(8)
-- Gigabit capable Passive Optical Network access, based on Optical Line Terminal,
-- see ITU-T G.984-1 [54]
}
DialUpInformation ::= SEQUENCE
{
diallingNumber [1] PartyNumber OPTIONAL,
......@@ -2583,10 +2592,12 @@ EPSInformation ::= SEQUENCE
-- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17
-- NOTE - as of v1.23.1 of the present document, this field has changed to optional
ePSEvent [15] EPSEvent OPTIONAL,
...
...,
uERadioCapID [16] UERadioCapID OPTIONAL
}
IMSIUnauthenticatedFlag ::= BOOLEAN
-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI
......@@ -2628,59 +2639,65 @@ EPSEvent ::= ENUMERATED
FIVEGSInformation ::= SEQUENCE
{
sUPI [1] SUPI OPTIONAL,
dNN [2] UTF8String OPTIONAL,
gPSI [3] GPSI OPTIONAL,
pEI [4] PEI OPTIONAL,
sUPI [1] SUPI OPTIONAL,
dNN [2] UTF8String OPTIONAL,
gPSI [3] GPSI OPTIONAL,
pEI [4] PEI OPTIONAL,
pDUSessionID [6] INTEGER (0..255) OPTIONAL,
sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL,
sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL,
pDUIpv4Address [8] IPAddress OPTIONAL,
pDUIpv6Address [9] IPAddress OPTIONAL,
pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL,
rFSPIndex [11] INTEGER (1..255) OPTIONAL,
pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL,
rFSPIndex [11] INTEGER (1..255) OPTIONAL,
applicationId [12] UTF8String OPTIONAL,
applicationServiceProviderIdentity [13] UTF8String OPTIONAL,
serviceId [14] INTEGER OPTIONAL,
chargingId [15] UTF8String OPTIONAL,
pDUType [16] PDUSessionType OPTIONAL,
sSCMode [17] SSCMode OPTIONAL,
vPLMNId [18] PLMNID OPTIONAL,
hPLMNId [19] PLMNID OPTIONAL,
chargingCharacteristics [20] UTF8String OPTIONAL,
chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL,
applicationServiceProviderIdentity [13] UTF8String OPTIONAL,
serviceId [14] INTEGER OPTIONAL,
chargingId [15] UTF8String OPTIONAL,
pDUType [16] PDUSessionType OPTIONAL,
sSCMode [17] SSCMode OPTIONAL,
vPLMNId [18] PLMNID OPTIONAL,
hPLMNId [19] PLMNID OPTIONAL,
chargingCharacteristics [20] UTF8String OPTIONAL,
chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL,
pDUSessionStartTime [22] GeneralizedTime OPTIONAL,
pDUSessionStopTime [23] GeneralizedTime OPTIONAL,
lowPriorityIndicator [24] BOOLEAN OPTIONAL,
lowPriorityIndicator [24] BOOLEAN OPTIONAL,
dataOffStatus [25] BOOLEAN OPTIONAL,
diagnostics [26] INTEGER OPTIONAL,
uETimeZone [27] UTF8String OPTIONAL,
uPFAddress [28] IPAddress OPTIONAL,
aMFAddress [29] IPAddress OPTIONAL,
uDMAddress [30] IPAddress OPTIONAL,
sMFAddress [31] IPAddress OPTIONAL,
uPFId [32] UUID OPTIONAL,
diagnostics [26] INTEGER OPTIONAL,
uETimeZone [27] UTF8String OPTIONAL,
uPFAddress [28] IPAddress OPTIONAL,
aMFAddress [29] IPAddress OPTIONAL,
uDMAddress [30] IPAddress OPTIONAL,
sMFAddress [31] IPAddress OPTIONAL,
uPFId [32] UUID OPTIONAL,
aMFIdentifier [33] AMFID OPTIONAL,
uDMIdentifier [34] UUID OPTIONAL,
sMFIdentifier [35] UUID OPTIONAL,
uPFPDNAddress [36] IPAddress OPTIONAL,
uPFPDNAddressExtension [37] IPAddress OPTIONAL,
uPFPDNAddressExtension [37] IPAddress OPTIONAL,
dynamicAddressFlag [38] BOOLEAN OPTIONAL,
dynamicAddressFlagExt [39] BOOLEAN OPTIONAL,
rAT5Type [40] RAT5Type OPTIONAL,
flowQosInfo [41] OCTET STRING OPTIONAL,
serviceID [42] INTEGER OPTIONAL
dynamicAddressFlagExt [39] BOOLEAN OPTIONAL,
rAT5Type [40] RAT5Type OPTIONAL,
flowQosInfo [41] OCTET STRING OPTIONAL,
serviceID [42] INTEGER OPTIONAL,
...,
uERadioCapID [43] UERadioCapID OPTIONAL,
rANSecondaryRATType [44] RAT5Type OPTIONAL
}
PDUSessionType ::= ENUMERATED
{
iPv4(1),
iPv6(2),
iPv4v6(3),
unstructured(4),
ethernet(5)
ethernet(5),
...
}
-- ====================================
-- Definitions of Network Access Device
-- ====================================
......@@ -2699,9 +2716,11 @@ NADevice ::= SEQUENCE
dslID [5] UTF8String OPTIONAL,
imei [6] IMEI OPTIONAL,
...,
subscriberID [7] NaSubscriberID OPTIONAL
subscriberID [7] NaSubscriberID OPTIONAL,
uERadioCapID [8] UERadioCapID OPTIONAL
}
SUPI ::= CHOICE
{
iMSI [1] IMSI,
......@@ -2719,9 +2738,11 @@ GPSI ::= CHOICE
PEI ::= CHOICE
{
iMEI [1] IMEI,
iMEISV [2] IMEISV
iMEISV [2] IMEISV,
...
}
IMEI ::= OCTET STRING (SIZE(8))
-- format as per 3GPP TS 09.02 [8]
-- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even
......@@ -2734,6 +2755,9 @@ IMSI ::= OCTET STRING (SIZE(3..8))
NAI ::= UTF8String
UERadioCapID ::= UTF8String (SIZE(12..22))
-- format as per ETSI TS 123 003 [41] clause 29.2
-- ======================================
-- Definitions of Message Network element
-- ======================================
......@@ -2849,14 +2873,27 @@ RAT5Type ::= ENUMERATED
eutra(2),
wlan(3),
virtual(4),
...
...,
nBIoT(5),
wireline(6),
wirelineCable(7),
wirelineDSL(8),
wirelinePON(9),
lTEM(10),
nRU(11),
eUTRAU(12),
trustedN3GA(13),
trustedWLAN(14),
uTRA(15),
gERA(16)
}
AMFID ::= SEQUENCE
{
aMFRegionID [1] AMFRegionID,
aMFSetID [2] AMFSetID,
aMFPointer [3] AMFPointer
aMFPointer [3] AMFPointer,
...
}
AMFRegionID ::= INTEGER (0..255)
......
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.25.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.25.1#/RetainedData" elementFormDefault="qualified">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.26.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.26.1#/RetainedData" elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.26.1
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType name="GeneralizedTime">
......@@ -282,6 +282,7 @@
<xsd:element name="wirelessLAN" type="NULL"/>
<xsd:element name="wimax" type="NULL"/>
<xsd:element name="mobilePacketData" type="NULL"/>
<xsd:element name="gPON" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
......@@ -665,6 +666,14 @@
<xsd:element name="iMSI" type="IMSI" minOccurs="0"/>
<xsd:element name="sUPI" type="SUPI" minOccurs="0"/>
<xsd:element name="gPSI" type="GPSI" minOccurs="0"/>
<xsd:element name="eID" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:token">
<xsd:pattern value="[0-9]{32}"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="LoginInfo">
......@@ -1498,7 +1507,7 @@
<xsd:sequence>
<xsd:element name="pLMNID" type="PLMNID"/>
<xsd:element name="nRCellID" type="NRCellID"/>
<xsd:any namespace="##other" processContents="lax"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="ExtendedLocation">
......@@ -2251,6 +2260,7 @@
</xsd:simpleType>
</xsd:element>
<xsd:element name="ePSEvent" type="EPSEvent" minOccurs="0"/>
<xsd:element name="uERadioCapID" type="UERadioCapID" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -2354,6 +2364,9 @@
<xsd:element name="dynamicAddressFlagExtension" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="rAT5Type" type="RAT5Type" minOccurs="0"/>
<xsd:element name="flowQoSInfo" type="xsd:string" minOccurs="0"/>
<xsd:element name="uERadioCapID" type="UERadioCapID" minOccurs="0"/>
<xsd:element name="rANSecondaryRATType" type="RAT5Type" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="PDUSessionType">
......@@ -2381,6 +2394,18 @@
<xsd:element name="eutra" type="NULL"/>
<xsd:element name="wlan" type="NULL"/>
<xsd:element name="virtual" type="NULL"/>
<xsd:element name="nBIoT" type="NULL"/>
<xsd:element name="wireline" type="NULL"/>
<xsd:element name="wirelineCable" type="NULL"/>
<xsd:element name="wirelineDSL" type="NULL"/>
<xsd:element name="wirelinePON" type="NULL"/>
<xsd:element name="lTEM" type="NULL"/>
<xsd:element name="nRU" type="NULL"/>
<xsd:element name="eUTRAU" type="NULL"/>
<xsd:element name="trustedN3GA" type="NULL"/>
<xsd:element name="trustedWLAN" type="NULL"/>
<xsd:element name="uTRA" type="NULL"/>
<xsd:element name="gERA" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
......@@ -2435,6 +2460,7 @@
<xsd:element name="dslID" type="xsd:string" minOccurs="0"/>
<xsd:element name="imei" type="IMEI" minOccurs="0"/>
<xsd:element name="subscriberID" type="NaSubscriberID" minOccurs="0"/>
<xsd:element name="uERadioCapID" type="UERadioCapID" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -3240,4 +3266,10 @@
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:choice>
</xsd:complexType>
<xsd:simpleType name="UERadioCapID">
<xsd:restriction base="xsd:string">
<xsd:minLength value="12"/>
<xsd:maxLength value="22"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:schema>
......@@ -18,8 +18,16 @@
</DictionaryEntry>
<DictionaryEntry>
<Value>Task</Value>
<Meaning>A Task Object as defined in section 8.2</Meaning>
</DictionaryEntry>
<Meaning>An LI Task Object as defined in section 8.2</Meaning>
</DictionaryEntry>
<DictionaryEntry>
<Value>LDTask</Value>
<Meaning>An LD Task Object as defined in section 8.3</Meaning>
</DictionaryEntry>
<DictionaryEntry>
<Value>Delivery</Value>
<Meaning>A Delivery Object as defined in section 10</Meaning>
</DictionaryEntry>
</DictionaryEntries>
</Dictionary>
<Dictionary>
......@@ -361,6 +369,36 @@
<Value>IsEmergency</Value>
<Meaning>Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3)</Meaning>
</DictionaryEntry>
<DictionaryEntry>
<Value>IsNonLocal</Value>
<Meaning>Indicates that the current Task shall be intercepted as a non-local identity.</Meaning>
</DictionaryEntry>
<DictionaryEntry>
<Value>IsLocal</Value>
<Meaning>Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed.</Meaning>
</DictionaryEntry>
</DictionaryEntries>
</Dictionary>
<Dictionary>
<Owner>ETSI</Owner>
<Name>LDHandoverFormat</Name>
<DictionaryEntries>
<DictionaryEntry>
<Value>TS102657</Value>
<Meaning>Handed over in ETSI TS 102 657 format, using HI-B</Meaning>
</DictionaryEntry>
<DictionaryEntry>
<Value>EncapsulatedTS102657</Value>
<Meaning>Handed over as ETSI TS 102 657 format using the DeliveryObject as described in clause 10</Meaning>
</DictionaryEntry>
<DictionaryEntry>
<Value>TS103120</Value>
<Meaning>Handed over using the DeliveryObject as described in clause 10</Meaning>
</DictionaryEntry>
<DictionaryEntry>
<Value>TS103707</Value>
<Meaning>Handed over as ETSI TS 103 707, using the DeliveryObject as described in clause 10</Meaning>
</DictionaryEntry>
</DictionaryEntries>
</Dictionary>
</Dictionaries>
......@@ -25,7 +25,7 @@ if __name__ == '__main__':
xs = xmlschema.XMLSchema(schemaFile, validation='skip')
locations.append((xs.default_namespace, str(Path(schemaFile))[7:]))
coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations)
coreSchema = xmlschema.XMLSchema('schema/ts_103120v010601p0_Core.xsd', locations=locations)
for schema in schemaFiles:
newSchema = xmlschema.XMLSchema(schema, locations=locations)
......
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