Commit 98f74ed3 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 657 v1.25.1 (2020-03-17) agreed at LI#53 (Sophia-Antipolis, 2020-02-04)

parent f37dd5be

102657/RDMessage.asn

+25 −10
Original line number Diff line number Diff line 
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)}

RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)}



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) version22(22)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)}



-- ======================================

-- Top level definitions for RDHI wrapper
@@ -1240,18 +1240,22 @@ TransmitterDetails ::= SEQUENCE 


TransmitterTechnology	::= ENUMERATED

{

	gen2G(0),		-- This corresponds to GERAN in 3GPP TS 29.274 [32]

	gen3G(1),		-- This corresponds to UTRAN in 3GPP TS 29.274 [32]

	gen2G(0),		-- This corresponds to GERAN in ETSI TS 129 274 [32]

	gen3G(1),		-- This corresponds to UTRAN in ETSI TS 129 274 [32]

	...,

	eUTRAN(2),

	wLAN(3),

	hSPAEvolution(4),

	gAN(5),

	vIRTUAL(6)

	-- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the

	-- enumeration values (0 to 6) are not.

	vIRTUAL(6),

	eUTRANNBIoT(7),

	lTEM(8),

	nR(9)

		-- Note that the labels are taken from ETSI TS 129 274 [32] v15.9.0 clause 8.17, though the

		-- enumeration values (0 to 9) are not.

}





NationalTransmitterDetails	::= SEQUENCE

{

	countryCode		[1] UTF8String (SIZE (2)),
@@ -1311,8 +1315,9 @@ Location ::= SEQUENCE 
		-- where: MCC+MNC = 3 octets, TAC (4G)   = 2 octets or

		-- TAC (5G) = 3 octets and without length indicator

	locationInformationSource	[19] UTF8String OPTIONAL,

	n3gppaLocation				[20] N3gppaLocation OPTIONAL

	n3gppaLocation				[20] N3gppaLocation OPTIONAL,

		-- format as specified in ETSI TS 129 571 [43] 

	transmitterDetails			[21] TransmitterDetails OPTIONAL

}



NCGI ::= SEQUENCE
@@ -2289,7 +2294,8 @@ NAServiceSubscription ::= SEQUENCE 
	registeredICCIDs			[21] SEQUENCE OF ICCIDInfo OPTIONAL,

	paymentTransactions			[22] SEQUENCE OF BillingRecords OPTIONAL,

	sUPI					[23] SUPI OPTIONAL,

	gPSI					[24] GPSI OPTIONAL

	gPSI					[24] GPSI OPTIONAL,

	timedIPAddresses		        [25] SEQUENCE OF TimedIPAddress OPTIONAL

}
@@ -2799,6 +2805,15 @@ IPMask ::= SEQUENCE 
	mask	[1] IPAddress

}



TimedIPAddress ::= SEQUENCE

{

	iPAddressSetOrRangeOrMask	[0] IPAddressSetOrRangeOrMask,

	validity			[1] TimeSpan,

		-- Time period during which the information given in this structure is or was valid.

		...



}



NABillingDetails ::= SEQUENCE

{

	subscriberID		[1] NaSubscriberID OPTIONAL,

102657/RDMessage.xsd

+21 −3
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.24.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.24.1#/RetainedData" elementFormDefault="qualified">

<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:annotation>

		<xsd:documentation xml:lang="en">

            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1

            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1

        </xsd:documentation>

	</xsd:annotation>

	<xsd:simpleType name="GeneralizedTime">
@@ -380,6 +380,13 @@ 
			<xsd:element name="mask" type="IPMask"/>

		</xsd:choice>

	</xsd:complexType>

	<xsd:complexType name="TimedIPAddress">

		<xsd:sequence>

			<xsd:element name="iPAddressSetOrRangeOrMask" type="IPAddressSetOrRangeOrMask"/>

			<xsd:element name="validity" type="TimeSpan"/>

			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

		</xsd:sequence>

	</xsd:complexType>

	<xsd:simpleType name="NADeviceId">

		<xsd:restriction base="xsd:string"/>

	</xsd:simpleType>
@@ -1460,6 +1467,7 @@ 
			</xsd:element>

			<xsd:element name="locationInformationSource" type="xsd:string" minOccurs="0"/>

			<xsd:element name="n3gppaLocation" type="N3gppaLocation" minOccurs="0"/>

			<xsd:element name="transmitterDetails" type="TransmitterDetails" minOccurs="0"/>

			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

		</xsd:sequence>

	</xsd:complexType>
@@ -1476,7 +1484,7 @@ 
			<xsd:element name="n3IwfId" minOccurs="0">

				<xsd:simpleType>

					<xsd:restriction base="xsd:hexBinary">

						<xsd:length value="6"/>

						<xsd:length value="5"/>

					</xsd:restriction>

				</xsd:simpleType>

			</xsd:element>
@@ -1607,6 +1615,9 @@ 
			<xsd:element name="hSPAEvolution" type="NULL"/>

			<xsd:element name="gAN" type="NULL"/>

			<xsd:element name="vIRTUAL" type="NULL"/>

			<xsd:element name="eUTRANNBIoT" type="NULL"/>

			<xsd:element name="lTEM" type="NULL"/>

			<xsd:element name="nR" type="NULL"/>

			<xsd:any namespace="##other" processContents="lax"/>

		</xsd:choice>

	</xsd:complexType>
@@ -1931,6 +1942,13 @@ 
			</xsd:element>

			<xsd:element name="sUPI" type="SUPI" minOccurs="0"/>

			<xsd:element name="gPSI" type="GPSI" minOccurs="0"/>

			<xsd:element name="timedIPAddresses" minOccurs="0">

				<xsd:complexType>

					<xsd:sequence minOccurs="0" maxOccurs="unbounded">

						<xsd:element name="TimedIPAddress" type="TimedIPAddress"/>

					</xsd:sequence>

				</xsd:complexType>

			</xsd:element>

			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

		</xsd:sequence>

	</xsd:complexType>

102657/portal/RDMessagever22.txt→102657/portal/RDMessagever23.txt

+25 −10
Original line number Diff line number Diff line 
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)}

RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)}



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) version22(22)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)}



-- ======================================

-- Top level definitions for RDHI wrapper
@@ -1240,18 +1240,22 @@ TransmitterDetails ::= SEQUENCE 


TransmitterTechnology	::= ENUMERATED

{

	gen2G(0),		-- This corresponds to GERAN in 3GPP TS 29.274 [32]

	gen3G(1),		-- This corresponds to UTRAN in 3GPP TS 29.274 [32]

	gen2G(0),		-- This corresponds to GERAN in ETSI TS 129 274 [32]

	gen3G(1),		-- This corresponds to UTRAN in ETSI TS 129 274 [32]

	...,

	eUTRAN(2),

	wLAN(3),

	hSPAEvolution(4),

	gAN(5),

	vIRTUAL(6)

	-- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the

	-- enumeration values (0 to 6) are not.

	vIRTUAL(6),

	eUTRANNBIoT(7),

	lTEM(8),

	nR(9)

		-- Note that the labels are taken from ETSI TS 129 274 [32] v15.9.0 clause 8.17, though the

		-- enumeration values (0 to 9) are not.

}





NationalTransmitterDetails	::= SEQUENCE

{

	countryCode		[1] UTF8String (SIZE (2)),
@@ -1311,8 +1315,9 @@ Location ::= SEQUENCE 
		-- where: MCC+MNC = 3 octets, TAC (4G)   = 2 octets or

		-- TAC (5G) = 3 octets and without length indicator

	locationInformationSource	[19] UTF8String OPTIONAL,

	n3gppaLocation				[20] N3gppaLocation OPTIONAL

	n3gppaLocation				[20] N3gppaLocation OPTIONAL,

		-- format as specified in ETSI TS 129 571 [43] 

	transmitterDetails			[21] TransmitterDetails OPTIONAL

}



NCGI ::= SEQUENCE
@@ -2289,7 +2294,8 @@ NAServiceSubscription ::= SEQUENCE 
	registeredICCIDs			[21] SEQUENCE OF ICCIDInfo OPTIONAL,

	paymentTransactions			[22] SEQUENCE OF BillingRecords OPTIONAL,

	sUPI					[23] SUPI OPTIONAL,

	gPSI					[24] GPSI OPTIONAL

	gPSI					[24] GPSI OPTIONAL,

	timedIPAddresses		        [25] SEQUENCE OF TimedIPAddress OPTIONAL

}
@@ -2799,6 +2805,15 @@ IPMask ::= SEQUENCE 
	mask	[1] IPAddress

}



TimedIPAddress ::= SEQUENCE

{

	iPAddressSetOrRangeOrMask	[0] IPAddressSetOrRangeOrMask,

	validity			[1] TimeSpan,

		-- Time period during which the information given in this structure is or was valid.

		...



}



NABillingDetails ::= SEQUENCE

{

	subscriberID		[1] NaSubscriberID OPTIONAL,

102657/portal/RDMessagever22.xsd→102657/portal/RDMessagever23.xsd

+21 −3
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.24.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.24.1#/RetainedData" elementFormDefault="qualified">

<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:annotation>

		<xsd:documentation xml:lang="en">

            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1

            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1

        </xsd:documentation>

	</xsd:annotation>

	<xsd:simpleType name="GeneralizedTime">
@@ -380,6 +380,13 @@ 
			<xsd:element name="mask" type="IPMask"/>

		</xsd:choice>

	</xsd:complexType>

	<xsd:complexType name="TimedIPAddress">

		<xsd:sequence>

			<xsd:element name="iPAddressSetOrRangeOrMask" type="IPAddressSetOrRangeOrMask"/>

			<xsd:element name="validity" type="TimeSpan"/>

			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

		</xsd:sequence>

	</xsd:complexType>

	<xsd:simpleType name="NADeviceId">

		<xsd:restriction base="xsd:string"/>

	</xsd:simpleType>
@@ -1460,6 +1467,7 @@ 
			</xsd:element>

			<xsd:element name="locationInformationSource" type="xsd:string" minOccurs="0"/>

			<xsd:element name="n3gppaLocation" type="N3gppaLocation" minOccurs="0"/>

			<xsd:element name="transmitterDetails" type="TransmitterDetails" minOccurs="0"/>

			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

		</xsd:sequence>

	</xsd:complexType>
@@ -1476,7 +1484,7 @@ 
			<xsd:element name="n3IwfId" minOccurs="0">

				<xsd:simpleType>

					<xsd:restriction base="xsd:hexBinary">

						<xsd:length value="6"/>

						<xsd:length value="5"/>

					</xsd:restriction>

				</xsd:simpleType>

			</xsd:element>
@@ -1607,6 +1615,9 @@ 
			<xsd:element name="hSPAEvolution" type="NULL"/>

			<xsd:element name="gAN" type="NULL"/>

			<xsd:element name="vIRTUAL" type="NULL"/>

			<xsd:element name="eUTRANNBIoT" type="NULL"/>

			<xsd:element name="lTEM" type="NULL"/>

			<xsd:element name="nR" type="NULL"/>

			<xsd:any namespace="##other" processContents="lax"/>

		</xsd:choice>

	</xsd:complexType>
@@ -1931,6 +1942,13 @@ 
			</xsd:element>

			<xsd:element name="sUPI" type="SUPI" minOccurs="0"/>

			<xsd:element name="gPSI" type="GPSI" minOccurs="0"/>

			<xsd:element name="timedIPAddresses" minOccurs="0">

				<xsd:complexType>

					<xsd:sequence minOccurs="0" maxOccurs="unbounded">

						<xsd:element name="TimedIPAddress" type="TimedIPAddress"/>

					</xsd:sequence>

				</xsd:complexType>

			</xsd:element>

			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

		</xsd:sequence>

	</xsd:complexType>