Commit cea02d9a authored by markc's avatar markc

TS 102 657 v1.11.1 (2012-11-21) agreed at LI#31 (Split, 2012-09-25)

parent d4191bdc
Pipeline #4013 passed with stage
in 6 seconds
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version11(11)}
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) version10(10)}
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)}
-- ======================================
-- Top level definitions for RDHI wrapper
......@@ -1102,7 +1102,9 @@ Location ::= SEQUENCE
-- This parameter is duplicated from 3GPP TS 33.108 [11]
...,
postalLocation [8] AddressInformation OPTIONAL,
extendedLocation [9] ExtendedLocation OPTIONAL
extendedLocation [9] ExtendedLocation OPTIONAL,
userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL
-- coded according to 3GPP TS 29.274 [32]; the type IE is not included
}
GSMLocation ::= CHOICE
......@@ -1919,8 +1921,9 @@ NAServiceUsage ::= SEQUENCE
octetsDownloaded [12] INTEGER OPTIONAL,
octetsUploaded [13] INTEGER OPTIONAL,
endReason [14] NAEndReason OPTIONAL,
subscriberID [15] NaSubscriberID OPTIONAL
subscriberID [15] NaSubscriberID OPTIONAL,
-- Identifier for a known user of this network access
ePSInformation [16] EPSInformation OPTIONAL
}
NAEndReason ::= ENUMERATED
......@@ -1992,6 +1995,74 @@ GPRSEvent ::= ENUMERATED
...
}
EPSInformation ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL,
mSISDN [3] PartyNumber OPTIONAL,
iMEISV [4] IMEI OPTIONAL,
s-GWAddress [5] IPAddress OPTIONAL,
p-GWAddress [6] IPAddress OPTIONAL,
p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL,
aPNNetworkID [8] AccessPointNameNI OPTIONAL,
pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL,
-- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34
pDP-PDNAddress [10] IPAddress OPTIONAL,
-- IP address allocated to the PDP context / PDN connection
-- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix
-- when PDP/PDN Type is IPv6 or IPv4v6.
pDP-PDNAddressExtension [11] IPAddress OPTIONAL,
-- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6
dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL,
dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL,
rATType [14] INTEGER (0..255),
-- RAT Type coding according to 3GPP TS 29.274 clause 8.17
ePSEvent [15] EPSEvent OPTIONAL,
...
}
IMSIUnauthenticatedFlag ::= BOOLEAN
-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI
P-GWPLMN-ID ::= OCTET STRING (SIZE (3))
-- This is a copy from the Tracking Area Identity (TAI) IE
-- specified in TS 29.274 clause 8.21.4:
-- Bits 8 7 6 5 4 3 2 1
-- 1st OCTET MCC digit 2 MCC digit 1
-- 2nd OCTET MNC digit 3 MCC digit 3
-- 3rd OCTET MNC digit 2 MNC digit 1
AccessPointNameNI ::= IA5String (SIZE(1..63))
-- Network Identifier part of APN in dot representation.
-- For example, if the complete APN is
-- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs'
-- NI is 'apn1a.apn1b.apn1c'
DynamicAddressFlag ::= BOOLEAN
-- TRUE if the PDP/PDN address is dynamic.
-- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6
DynamicAddressFlagExt ::= BOOLEAN
-- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated
-- during IP CAN bearer activation, initial attach and UE requested
-- PDN connectivity with PDP/PDN type IPv4v6.
-- FALSE if IPv4 address is static.
EPSEvent ::= ENUMERATED
-- The list of “EPSEvent” below is partly taken from 3GPP TS 33.108
-- EpsHI2Operations from the “EPSEvent ::=ENUMERATED” module
{
e-UTRANAttach (16),
e-UTRANDetach (17),
bearerActivation (18),
bearerModification (20),
bearerDeactivation (21),
trackingAreaUpdate (25),
servingEvolvedPacketSystem (26),
...
}
-- ====================================
-- Definitions of Network Access Device
-- ====================================
......
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns="http://uri.etsi.org/02657/v1.10.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.10.1#/RetainedData"
xmlns="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.11.1
</xsd:documentation>
</xsd:annotation>
......@@ -1310,6 +1310,14 @@
</xsd:element>
<xsd:element name="postalLocation" minOccurs="0" type="AddressInformation"/>
<xsd:element name="extendedLocation" minOccurs="0" type="ExtendedLocation"/>
<xsd:element name="userLocationInformation" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:hexBinary">
<xsd:minLength value="1"/>
<xsd:maxLength value="35"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -1815,10 +1823,83 @@
<xsd:element name="octetsUploaded" minOccurs="0" type="xsd:integer"/>
<xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>
<xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
<xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="EPSInformation">
<xsd:sequence>
<xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
<xsd:element name="iMSIUnauthenticatedFlag" minOccurs="0" type="IMSIUnauthenticatedFlag"/>
<xsd:element name="mSISDN" minOccurs="0" type="PartyNumber"/>
<xsd:element name="iMEISV" minOccurs="0" type="IMEI"/>
<xsd:element name="s-GWAddress" minOccurs="0" type="IPAddress"/>
<xsd:element name="p-GWAddress" minOccurs="0" type="IPAddress"/>
<xsd:element name="p-GWPLMNIdentifier" minOccurs="0" type="P-GWPLMN-ID"/>
<xsd:element name="aPNNetworkID" minOccurs="0" type="AccessPointNameNI"/>
<xsd:element name="pDP_PDNType" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:hexBinary">
<xsd:length value="1"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="pDP-PDNAddress" minOccurs="0" type="IPAddress"/>
<xsd:element name="pDP-PDNAddressExtension" minOccurs="0" type="IPAddress"/>
<xsd:element name="dynamicAddressFlag" minOccurs="0" type="DynamicAddressFlag"/>
<xsd:element name="dynamicAddressFlagExt" minOccurs="0" type="DynamicAddressFlagExt"/>
<xsd:element name="rATType" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:unsignedShort">
<xsd:minInclusive value="0"/>
<xsd:maxInclusive value="255"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="ePSEvent" minOccurs="0" type="EPSEvent"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:simpleType name="IMSIUnauthenticatedFlag">
<xsd:restriction base="xsd:boolean"/>
</xsd:simpleType>
<xsd:simpleType name="P-GWPLMN-ID">
<xsd:restriction base="xsd:hexBinary">
<xsd:length value="3"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="AccessPointNameNI">
<xsd:restriction base="xsd:string">
<xsd:minLength value="1"/>
<xsd:maxLength value="63"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="DynamicAddressFlag">
<xsd:restriction base="xsd:boolean"/>
</xsd:simpleType>
<xsd:simpleType name="DynamicAddressFlagExt">
<xsd:restriction base="xsd:boolean"/>
</xsd:simpleType>
<xsd:complexType name="EPSEvent">
<xsd:choice>
<xsd:element name="e-UTRANAttach" type="NULL"/>
<xsd:element name="e-UTRANDetach" type="NULL"/>
<xsd:element name="bearerActivation" type="NULL"/>
<xsd:element name="bearerDeactivation" type="NULL"/>
<xsd:element name="trackingAreaUpdate" type="NULL"/>
<xsd:element name="servingEvolvedPacketSystem" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
<xsd:complexType name="NAEndReason">
<xsd:choice>
<xsd:element name="unknownReason" type="NULL"/>
......
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version11(11)}
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) version10(10)}
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)}
-- ======================================
-- Top level definitions for RDHI wrapper
......@@ -1102,7 +1102,9 @@ Location ::= SEQUENCE
-- This parameter is duplicated from 3GPP TS 33.108 [11]
...,
postalLocation [8] AddressInformation OPTIONAL,
extendedLocation [9] ExtendedLocation OPTIONAL
extendedLocation [9] ExtendedLocation OPTIONAL,
userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL
-- coded according to 3GPP TS 29.274 [32]; the type IE is not included
}
GSMLocation ::= CHOICE
......@@ -1919,8 +1921,9 @@ NAServiceUsage ::= SEQUENCE
octetsDownloaded [12] INTEGER OPTIONAL,
octetsUploaded [13] INTEGER OPTIONAL,
endReason [14] NAEndReason OPTIONAL,
subscriberID [15] NaSubscriberID OPTIONAL
subscriberID [15] NaSubscriberID OPTIONAL,
-- Identifier for a known user of this network access
ePSInformation [16] EPSInformation OPTIONAL
}
NAEndReason ::= ENUMERATED
......@@ -1992,6 +1995,74 @@ GPRSEvent ::= ENUMERATED
...
}
EPSInformation ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL,
mSISDN [3] PartyNumber OPTIONAL,
iMEISV [4] IMEI OPTIONAL,
s-GWAddress [5] IPAddress OPTIONAL,
p-GWAddress [6] IPAddress OPTIONAL,
p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL,
aPNNetworkID [8] AccessPointNameNI OPTIONAL,
pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL,
-- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34
pDP-PDNAddress [10] IPAddress OPTIONAL,
-- IP address allocated to the PDP context / PDN connection
-- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix
-- when PDP/PDN Type is IPv6 or IPv4v6.
pDP-PDNAddressExtension [11] IPAddress OPTIONAL,
-- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6
dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL,
dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL,
rATType [14] INTEGER (0..255),
-- RAT Type coding according to 3GPP TS 29.274 clause 8.17
ePSEvent [15] EPSEvent OPTIONAL,
...
}
IMSIUnauthenticatedFlag ::= BOOLEAN
-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI
P-GWPLMN-ID ::= OCTET STRING (SIZE (3))
-- This is a copy from the Tracking Area Identity (TAI) IE
-- specified in TS 29.274 clause 8.21.4:
-- Bits 8 7 6 5 4 3 2 1
-- 1st OCTET MCC digit 2 MCC digit 1
-- 2nd OCTET MNC digit 3 MCC digit 3
-- 3rd OCTET MNC digit 2 MNC digit 1
AccessPointNameNI ::= IA5String (SIZE(1..63))
-- Network Identifier part of APN in dot representation.
-- For example, if the complete APN is
-- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs'
-- NI is 'apn1a.apn1b.apn1c'
DynamicAddressFlag ::= BOOLEAN
-- TRUE if the PDP/PDN address is dynamic.
-- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6
DynamicAddressFlagExt ::= BOOLEAN
-- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated
-- during IP CAN bearer activation, initial attach and UE requested
-- PDN connectivity with PDP/PDN type IPv4v6.
-- FALSE if IPv4 address is static.
EPSEvent ::= ENUMERATED
-- The list of “EPSEvent” below is partly taken from 3GPP TS 33.108
-- EpsHI2Operations from the “EPSEvent ::=ENUMERATED” module
{
e-UTRANAttach (16),
e-UTRANDetach (17),
bearerActivation (18),
bearerModification (20),
bearerDeactivation (21),
trackingAreaUpdate (25),
servingEvolvedPacketSystem (26),
...
}
-- ====================================
-- Definitions of Network Access Device
-- ====================================
......
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns="http://uri.etsi.org/02657/v1.10.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.10.1#/RetainedData"
xmlns="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.11.1
</xsd:documentation>
</xsd:annotation>
......@@ -1310,6 +1310,14 @@
</xsd:element>
<xsd:element name="postalLocation" minOccurs="0" type="AddressInformation"/>
<xsd:element name="extendedLocation" minOccurs="0" type="ExtendedLocation"/>
<xsd:element name="userLocationInformation" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:hexBinary">
<xsd:minLength value="1"/>
<xsd:maxLength value="35"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -1815,10 +1823,83 @@
<xsd:element name="octetsUploaded" minOccurs="0" type="xsd:integer"/>
<xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>
<xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
<xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="EPSInformation">
<xsd:sequence>
<xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
<xsd:element name="iMSIUnauthenticatedFlag" minOccurs="0" type="IMSIUnauthenticatedFlag"/>
<xsd:element name="mSISDN" minOccurs="0" type="PartyNumber"/>
<xsd:element name="iMEISV" minOccurs="0" type="IMEI"/>
<xsd:element name="s-GWAddress" minOccurs="0" type="IPAddress"/>
<xsd:element name="p-GWAddress" minOccurs="0" type="IPAddress"/>
<xsd:element name="p-GWPLMNIdentifier" minOccurs="0" type="P-GWPLMN-ID"/>
<xsd:element name="aPNNetworkID" minOccurs="0" type="AccessPointNameNI"/>
<xsd:element name="pDP_PDNType" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:hexBinary">
<xsd:length value="1"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="pDP-PDNAddress" minOccurs="0" type="IPAddress"/>
<xsd:element name="pDP-PDNAddressExtension" minOccurs="0" type="IPAddress"/>
<xsd:element name="dynamicAddressFlag" minOccurs="0" type="DynamicAddressFlag"/>
<xsd:element name="dynamicAddressFlagExt" minOccurs="0" type="DynamicAddressFlagExt"/>
<xsd:element name="rATType" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:unsignedShort">
<xsd:minInclusive value="0"/>
<xsd:maxInclusive value="255"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="ePSEvent" minOccurs="0" type="EPSEvent"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:simpleType name="IMSIUnauthenticatedFlag">
<xsd:restriction base="xsd:boolean"/>
</xsd:simpleType>
<xsd:simpleType name="P-GWPLMN-ID">
<xsd:restriction base="xsd:hexBinary">
<xsd:length value="3"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="AccessPointNameNI">
<xsd:restriction base="xsd:string">
<xsd:minLength value="1"/>
<xsd:maxLength value="63"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="DynamicAddressFlag">
<xsd:restriction base="xsd:boolean"/>
</xsd:simpleType>
<xsd:simpleType name="DynamicAddressFlagExt">
<xsd:restriction base="xsd:boolean"/>
</xsd:simpleType>
<xsd:complexType name="EPSEvent">
<xsd:choice>
<xsd:element name="e-UTRANAttach" type="NULL"/>
<xsd:element name="e-UTRANDetach" type="NULL"/>
<xsd:element name="bearerActivation" type="NULL"/>
<xsd:element name="bearerDeactivation" type="NULL"/>
<xsd:element name="trackingAreaUpdate" type="NULL"/>
<xsd:element name="servingEvolvedPacketSystem" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
<xsd:complexType name="NAEndReason">
<xsd:choice>
<xsd:element name="unknownReason" type="NULL"/>
......
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