Commit ecd285d5 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 657 v1.8.1 (2011-06-24) agreed at LI#26 (Sophia Antipolis, 2011-02-15)

parent a96df855

102657/RDMessage.asn

+30 −18
Original line number Diff line number Diff line 
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version7(7)}

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



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) version7(7)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version8(8)}



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

-- Top level definitions for RDHI wrapper
@@ -350,7 +350,8 @@ IndividualInfo ::= SEQUENCE 
		...

	} OPTIONAL,

	identificationNumber	[5] UTF8String OPTIONAL,

	authenticationInfo		[6] AuthenticationInfo OPTIONAL,	...,

	authenticationInfo		[6] AuthenticationInfo OPTIONAL,

	...,

	profession				[7] UTF8String OPTIONAL

}
@@ -414,6 +415,7 @@ AuthenticationInfo ::= SEQUENCE 
		-- the number of the document used to authenticate

	...

}



TelephonyRecord ::= CHOICE

{

	telephonySubscriber			[1] TelephonySubscriber,
@@ -1683,7 +1685,6 @@ PartyIdentity ::= UTF8String 
	-- E164 address of the node in international format, or

	-- SIP URL or TEL URL as in ETSI EN 300 356 [7]





QualityOfService ::= UTF8String

	-- Free text description of the invoked quality of service
@@ -1828,7 +1829,20 @@ NAServiceUsage ::= SEQUENCE 
	gprsInformation		[11] GprsInformation OPTIONAL,

	...,

	octetsDownloaded	[12] INTEGER OPTIONAL,

	octetsUploaded		[13] INTEGER OPTIONAL

	octetsUploaded		[13] INTEGER OPTIONAL,

	endReason			[14] NAEndReason OPTIONAL

}



NAEndReason ::= ENUMERATED

{

	unknownReason(0),

	timeout(1),

	userDisconnect(2),

		-- e.g. user logs off

	networkDisconnect(3),

		-- e.g. user’s time/credits have been used up

	networkError(4),

	...

}



NwAccessType ::= ENUMERATED
@@ -1845,8 +1859,7 @@ NwAccessType ::= ENUMERATED 
	wirelessLAN(5),		

		-- Wireless LAN access (e.g. hotspot)

	wimax(6),

	mobilePacketData(7),

		-- Network access over GSM/3GPP GPRS, UMTS, etc.

	mobilePacketData(7),	-- Network access over GSM/3GPP GPRS, UMTS, etc.

	...

}
@@ -1998,4 +2011,3 @@ NABillingDetails ::= SEQUENCE 
}



END -- end of RDMessage

102657/RDMessage.xsd

+23 −11
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.7.1#/RetainedData"

            targetNamespace="http://uri.etsi.org/02657/v1.7.1#/RetainedData"

            xmlns="http://uri.etsi.org/02657/v1.8.1#/RetainedData"

            targetNamespace="http://uri.etsi.org/02657/v1.8.1#/RetainedData"

			elementFormDefault="qualified">



	<xsd:annotation>

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

			XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.7.1) 

			XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.8.1) 

		</xsd:documentation>

	</xsd:annotation>
@@ -1555,7 +1555,7 @@ 
   

   <xsd:complexType name="MsgBillingDetails">

      <xsd:sequence>

         <xsd:element name="subscriberID" minOccurs="0" type="MsgSubscriberId"/>

         <xsd:element name="subscriberID" minOccurs="0" type="MsgSubscriberID"/>

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

         <xsd:element name="billingAddress" minOccurs="0" type="ContactDetails"/>

         <xsd:element name="billingIdentifier" minOccurs="0" type="MsgBillingIdentifier"/>
@@ -1751,10 +1751,22 @@ 
         <xsd:element name="gprsInformation" minOccurs="0" type="GprsInformation"/>

         <xsd:element name="octetsDownloaded" minOccurs="0" type="xsd:integer"/>

         <xsd:element name="octetsUploaded" minOccurs="0" type="xsd:integer"/>

         <xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>

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

      </xsd:sequence>

   </xsd:complexType>



   <xsd:complexType name="NAEndReason">

      <xsd:choice>

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

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

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

         <xsd:element name="networkDisconnect" type="FurtherInformation"/>

         <xsd:element name="networkError" type="FurtherInformation"/>

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

      </xsd:choice>

   </xsd:complexType>

   

   <xsd:complexType name="NADevice">

      <xsd:sequence>

         <xsd:element name="naDeviceId" minOccurs="0" type="NADeviceId"/>

102657/portal/RDMessage,ver7.xml→102657/portal/RDMessage,ver8.xsd

+23 −11
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.7.1#/RetainedData"

            targetNamespace="http://uri.etsi.org/02657/v1.7.1#/RetainedData"

            xmlns="http://uri.etsi.org/02657/v1.8.1#/RetainedData"

            targetNamespace="http://uri.etsi.org/02657/v1.8.1#/RetainedData"

			elementFormDefault="qualified">



	<xsd:annotation>

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

			XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.7.1) 

			XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.8.1) 

		</xsd:documentation>

	</xsd:annotation>
@@ -1555,7 +1555,7 @@ 
   

   <xsd:complexType name="MsgBillingDetails">

      <xsd:sequence>

         <xsd:element name="subscriberID" minOccurs="0" type="MsgSubscriberId"/>

         <xsd:element name="subscriberID" minOccurs="0" type="MsgSubscriberID"/>

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

         <xsd:element name="billingAddress" minOccurs="0" type="ContactDetails"/>

         <xsd:element name="billingIdentifier" minOccurs="0" type="MsgBillingIdentifier"/>
@@ -1751,10 +1751,22 @@ 
         <xsd:element name="gprsInformation" minOccurs="0" type="GprsInformation"/>

         <xsd:element name="octetsDownloaded" minOccurs="0" type="xsd:integer"/>

         <xsd:element name="octetsUploaded" minOccurs="0" type="xsd:integer"/>

         <xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>

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

      </xsd:sequence>

   </xsd:complexType>



   <xsd:complexType name="NAEndReason">

      <xsd:choice>

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

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

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

         <xsd:element name="networkDisconnect" type="FurtherInformation"/>

         <xsd:element name="networkError" type="FurtherInformation"/>

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

      </xsd:choice>

   </xsd:complexType>

   

   <xsd:complexType name="NADevice">

      <xsd:sequence>

         <xsd:element name="naDeviceId" minOccurs="0" type="NADeviceId"/>

102657/portal/RDMessage,ver7.txt→102657/portal/RDMessagever8.txt

+30 −18
Original line number Diff line number Diff line 
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version7(7)}

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



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) version7(7)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version8(8)}



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

-- Top level definitions for RDHI wrapper
@@ -350,7 +350,8 @@ IndividualInfo ::= SEQUENCE 
		...

	} OPTIONAL,

	identificationNumber	[5] UTF8String OPTIONAL,

	authenticationInfo		[6] AuthenticationInfo OPTIONAL,	...,

	authenticationInfo		[6] AuthenticationInfo OPTIONAL,

	...,

	profession				[7] UTF8String OPTIONAL

}
@@ -414,6 +415,7 @@ AuthenticationInfo ::= SEQUENCE 
		-- the number of the document used to authenticate

	...

}



TelephonyRecord ::= CHOICE

{

	telephonySubscriber			[1] TelephonySubscriber,
@@ -1683,7 +1685,6 @@ PartyIdentity ::= UTF8String 
	-- E164 address of the node in international format, or

	-- SIP URL or TEL URL as in ETSI EN 300 356 [7]





QualityOfService ::= UTF8String

	-- Free text description of the invoked quality of service
@@ -1828,7 +1829,20 @@ NAServiceUsage ::= SEQUENCE 
	gprsInformation		[11] GprsInformation OPTIONAL,

	...,

	octetsDownloaded	[12] INTEGER OPTIONAL,

	octetsUploaded		[13] INTEGER OPTIONAL

	octetsUploaded		[13] INTEGER OPTIONAL,

	endReason			[14] NAEndReason OPTIONAL

}



NAEndReason ::= ENUMERATED

{

	unknownReason(0),

	timeout(1),

	userDisconnect(2),

		-- e.g. user logs off

	networkDisconnect(3),

		-- e.g. user’s time/credits have been used up

	networkError(4),

	...

}



NwAccessType ::= ENUMERATED
@@ -1845,8 +1859,7 @@ NwAccessType ::= ENUMERATED 
	wirelessLAN(5),		

		-- Wireless LAN access (e.g. hotspot)

	wimax(6),

	mobilePacketData(7),

		-- Network access over GSM/3GPP GPRS, UMTS, etc.

	mobilePacketData(7),	-- Network access over GSM/3GPP GPRS, UMTS, etc.

	...

}
@@ -1998,4 +2011,3 @@ NABillingDetails ::= SEQUENCE 
}



END -- end of RDMessage