Commit 5347ce87 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 657 v1.13.1 (2013-11-22) agreed at LI#34 (Edinburgh, 2013-09-24)

parent e9dfae43

102657/RDMessage.asn

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

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



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) version12(12)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version13(13)}





-- ======================================
@@ -567,14 +567,7 @@ SubscribedTelephonyServices ::= SEQUENCE 
		-- To be defined on a national basis 

		-- Only to be used in case the present document cannot fulfil the national requirements

	paymentDetails						[17] PaymentDetails OPTIONAL,

	subscriptionType					[18] ENUMERATED

	{

		unknown(0),

		postpay(1),

		prepay(2),

		other(3),

		...

	} OPTIONAL

	subscriptionType					[18] SubscriptionType OPTIONAL  

		-- Describes the nature of the subscription



}
@@ -586,6 +579,19 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE 
	...

}





SubscriptionType  ::= ENUMERATED    -- Describes the nature of the subscription   

	{

		unknown(0),

		postpay(1),

		prepay(2),

		other(3),

		...

	}

		







TelephonyBillingDetails ::= SEQUENCE

{

	subscriberID						[1] TelephonySubscriberId OPTIONAL,
@@ -1576,7 +1582,10 @@ SubscribedMultimediaServices ::= SEQUENCE 
	nationalMultimediaServices	[12] NationalMultimediaServices OPTIONAL,

		-- national extension

	...,

	paymentDetails				[13] PaymentDetails OPTIONAL

	paymentDetails				[13] PaymentDetails OPTIONAL,

	subscriptionType			[14] SubscriptionType OPTIONAL  

		-- Describes the nature of the subscription



}



MultimediaServiceType ::= ENUMERATED
@@ -1885,7 +1894,9 @@ NAServiceSubscription ::= SEQUENCE 
	registeredICCID			[11] UTF8String OPTIONAL,

	nationalNASubscription	[12] NationalNASubscription OPTIONAL,

	paymentDetails			[13] PaymentDetails OPTIONAL,

	additionalIPAddresses	[14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL

	additionalIPAddresses	[14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,

	subscriptionType		[15] SubscriptionType OPTIONAL  

		-- Describes the nature of the subscription

}



NationalNASubscription ::= SEQUENCE
@@ -2235,16 +2246,3 @@ NABillingDetails ::= SEQUENCE 
}



END -- end of RDMessage
 


Please consider the environment before printing this email.

 

This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately.

 

Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. 

 

The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm.

 

Detica Limited is a BAE Systems company trading as BAE Systems Detica.

Detica Limited is registered in England and Wales under No: 1337451.

Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England.

102657/RDMessage.xsd

+20 −19
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.12.1#/RetainedData"

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

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

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

			elementFormDefault="qualified">



	<xsd:annotation>

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

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

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

		</xsd:documentation>

	</xsd:annotation>
@@ -645,19 +645,7 @@ 
		 <xsd:element name="iMEI" minOccurs="0" type="IMEI"/>

		 <xsd:element name="nationalTelephonySubscriptionInfo" minOccurs="0" type="NationalTelephonySubscriptionInfo"/>

		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>

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

          <xsd:complexType>

            <xsd:choice>

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

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

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

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

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

            </xsd:choice>

          </xsd:complexType>

        </xsd:element>

        

        

     <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -738,6 +726,16 @@ 
      </xsd:sequence>

   </xsd:complexType>



  <xsd:complexType name="SubscriptionType">

    <xsd:choice>

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

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

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

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

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

    </xsd:choice>

  </xsd:complexType>



  <xsd:complexType name="TelephonyBillingDetails">

      <xsd:sequence>

         <xsd:element name="subscriberID" minOccurs="0" type="TelephonySubscriberId"/>
@@ -1698,6 +1696,7 @@ 
               </xsd:sequence>

            </xsd:complexType>

         </xsd:element>

        <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -2258,6 +2257,7 @@ 
         <xsd:element name="lineStatus" minOccurs="0" type="xsd:string"/>		 

         <xsd:element name="nationalMultimediaServices" minOccurs="0" type="NationalMultimediaServices"/>

		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>

        <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -2618,4 +2618,5 @@ 
         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

      </xsd:sequence>

   </xsd:complexType>   



</xsd:schema>
 
 No newline at end of file

102657/portal/RDMessage,ver12 (MSC).xsd→102657/portal/RDMessage,ver13.xsd

+20 −19
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.12.1#/RetainedData"

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

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

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

			elementFormDefault="qualified">



	<xsd:annotation>

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

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

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

		</xsd:documentation>

	</xsd:annotation>
@@ -645,19 +645,7 @@ 
		 <xsd:element name="iMEI" minOccurs="0" type="IMEI"/>

		 <xsd:element name="nationalTelephonySubscriptionInfo" minOccurs="0" type="NationalTelephonySubscriptionInfo"/>

		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>

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

          <xsd:complexType>

            <xsd:choice>

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

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

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

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

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

            </xsd:choice>

          </xsd:complexType>

        </xsd:element>

        

        

     <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -738,6 +726,16 @@ 
      </xsd:sequence>

   </xsd:complexType>



  <xsd:complexType name="SubscriptionType">

    <xsd:choice>

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

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

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

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

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

    </xsd:choice>

  </xsd:complexType>



  <xsd:complexType name="TelephonyBillingDetails">

      <xsd:sequence>

         <xsd:element name="subscriberID" minOccurs="0" type="TelephonySubscriberId"/>
@@ -1698,6 +1696,7 @@ 
               </xsd:sequence>

            </xsd:complexType>

         </xsd:element>

        <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -2258,6 +2257,7 @@ 
         <xsd:element name="lineStatus" minOccurs="0" type="xsd:string"/>		 

         <xsd:element name="nationalMultimediaServices" minOccurs="0" type="NationalMultimediaServices"/>

		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>

        <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -2618,4 +2618,5 @@ 
         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

      </xsd:sequence>

   </xsd:complexType>   



</xsd:schema>
 
 No newline at end of file

102657/portal/RDMessage,ver12 (MSC).txt→102657/portal/RDMessagever13.txt

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

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



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) version12(12)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version13(13)}





-- ======================================
@@ -567,14 +567,7 @@ SubscribedTelephonyServices ::= SEQUENCE 
		-- To be defined on a national basis 

		-- Only to be used in case the present document cannot fulfil the national requirements

	paymentDetails						[17] PaymentDetails OPTIONAL,

	subscriptionType					[18] ENUMERATED

	{

		unknown(0),

		postpay(1),

		prepay(2),

		other(3),

		...

	} OPTIONAL

	subscriptionType					[18] SubscriptionType OPTIONAL  

		-- Describes the nature of the subscription



}
@@ -586,6 +579,19 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE 
	...

}





SubscriptionType  ::= ENUMERATED    -- Describes the nature of the subscription   

	{

		unknown(0),

		postpay(1),

		prepay(2),

		other(3),

		...

	}

		







TelephonyBillingDetails ::= SEQUENCE

{

	subscriberID						[1] TelephonySubscriberId OPTIONAL,
@@ -1576,7 +1582,10 @@ SubscribedMultimediaServices ::= SEQUENCE 
	nationalMultimediaServices	[12] NationalMultimediaServices OPTIONAL,

		-- national extension

	...,

	paymentDetails				[13] PaymentDetails OPTIONAL

	paymentDetails				[13] PaymentDetails OPTIONAL,

	subscriptionType			[14] SubscriptionType OPTIONAL  

		-- Describes the nature of the subscription



}



MultimediaServiceType ::= ENUMERATED
@@ -1885,7 +1894,9 @@ NAServiceSubscription ::= SEQUENCE 
	registeredICCID			[11] UTF8String OPTIONAL,

	nationalNASubscription	[12] NationalNASubscription OPTIONAL,

	paymentDetails			[13] PaymentDetails OPTIONAL,

	additionalIPAddresses	[14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL

	additionalIPAddresses	[14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,

	subscriptionType		[15] SubscriptionType OPTIONAL  

		-- Describes the nature of the subscription

}



NationalNASubscription ::= SEQUENCE
@@ -2235,16 +2246,3 @@ NABillingDetails ::= SEQUENCE 
}



END -- end of RDMessage
 


Please consider the environment before printing this email.

 

This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately.

 

Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. 

 

The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm.

 

Detica Limited is a BAE Systems company trading as BAE Systems Detica.

Detica Limited is registered in England and Wales under No: 1337451.

Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England.