Commit 49fba19f authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 657 v1.15.1 (2014-08-12) agreed at LI#36 (Bad Homburg, 2014-06-24)

parent 393327c5

102657/RDMessage.asn

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

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



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) version14(14)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)}





-- ======================================
@@ -1976,7 +1976,10 @@ NASubscriber ::= SEQUENCE 
		-- List of all known devices allocated to this user. 

	subscriber			[5] GenericSubscriberInfo OPTIONAL ,

		-- Name, address and other generic subscriber information

	...

	...,

	allocatedDevices	[6] SEQUENCE OF NADevice OPTIONAL

		-- If present, contains device details for all elements from allocatedDeviceIDs



}



NAServiceSubscription ::= SEQUENCE
@@ -2007,9 +2010,9 @@ NAServiceSubscription ::= SEQUENCE 
		-- Describes the nature of the subscription

	deliveryAddress			[16] AddressInformation OPTIONAL,

	resellerAddress			[17] AddressInformation OPTIONAL,

	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL





	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL,

	allocatedDevices		[19] SEQUENCE OF NADevice OPTIONAL

		-- If present, contains device details for all elements from allocatedDeviceIDs

}



NationalNASubscription ::= SEQUENCE
@@ -2064,9 +2067,11 @@ NAServiceUsage ::= SEQUENCE 
		-- Identifier for a known user of this network access

	ePSInformation		[16] EPSInformation OPTIONAL,

	wifiInformation		[17] WifiInformation OPTIONAL,

	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL

	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL,

	-- contains extended information about the NAT or PAT operations carried out within this

	-- service usage session

	naDevice			[19] NADevice OPTIONAL

		-- If present, contains the device details for the device referenced in naDeviceID





}

102657/RDMessage.xsd

+27 −12
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.14.1#/RetainedData"

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

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

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

			elementFormDefault="qualified">



	<xsd:annotation>

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

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

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

		</xsd:documentation>

	</xsd:annotation>
@@ -1413,7 +1413,7 @@ 
      <xsd:sequence>

         <xsd:element name="centre" minOccurs="0" type="Spot"/>

         <xsd:element name="radius" minOccurs="0" type="xsd:int"/>

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

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1426,7 +1426,7 @@ 
               </xsd:sequence>

            </xsd:complexType>

         </xsd:element>

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

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1440,7 +1440,7 @@ 
            </xsd:complexType>

         </xsd:element>

         <xsd:element name="width" minOccurs="0" type="xsd:int"/>

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

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1768,6 +1768,13 @@ 
            </xsd:sequence>

          </xsd:complexType>

        </xsd:element>

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

		     <xsd:complexType>

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

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

			      </xsd:sequence>

		     </xsd:complexType>

		  </xsd:element>

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

     </xsd:sequence>

   </xsd:complexType>
@@ -1804,6 +1811,13 @@ 
            </xsd:complexType>

         </xsd:element>

         <xsd:element name="subscriber" minOccurs="0" type="GenericSubscriberInfo"/>

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

		        <xsd:complexType>

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

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

			         </xsd:sequence>

		        </xsd:complexType>

		     </xsd:element>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1916,6 +1930,7 @@ 
            </xsd:sequence>

          </xsd:complexType>

        </xsd:element>

        <xsd:element name="naDevice" minOccurs="0" type="NADevice"/>

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

      </xsd:sequence>

   </xsd:complexType>

102657/portal/RDMessage,ver14.xsd→102657/portal/RDMessage,ver15.xsd

+27 −12
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.14.1#/RetainedData"

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

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

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

			elementFormDefault="qualified">



	<xsd:annotation>

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

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

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

		</xsd:documentation>

	</xsd:annotation>
@@ -1413,7 +1413,7 @@ 
      <xsd:sequence>

         <xsd:element name="centre" minOccurs="0" type="Spot"/>

         <xsd:element name="radius" minOccurs="0" type="xsd:int"/>

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

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1426,7 +1426,7 @@ 
               </xsd:sequence>

            </xsd:complexType>

         </xsd:element>

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

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1440,7 +1440,7 @@ 
            </xsd:complexType>

         </xsd:element>

         <xsd:element name="width" minOccurs="0" type="xsd:int"/>

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

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1768,6 +1768,13 @@ 
            </xsd:sequence>

          </xsd:complexType>

        </xsd:element>

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

		     <xsd:complexType>

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

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

			      </xsd:sequence>

		     </xsd:complexType>

		  </xsd:element>

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

     </xsd:sequence>

   </xsd:complexType>
@@ -1804,6 +1811,13 @@ 
            </xsd:complexType>

         </xsd:element>

         <xsd:element name="subscriber" minOccurs="0" type="GenericSubscriberInfo"/>

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

		        <xsd:complexType>

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

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

			         </xsd:sequence>

		        </xsd:complexType>

		     </xsd:element>

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

      </xsd:sequence>

   </xsd:complexType>
@@ -1916,6 +1930,7 @@ 
            </xsd:sequence>

          </xsd:complexType>

        </xsd:element>

        <xsd:element name="naDevice" minOccurs="0" type="NADevice"/>

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

      </xsd:sequence>

   </xsd:complexType>

102657/portal/RDMessagever14.txt→102657/portal/RDMessagever15.txt

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

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



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) version14(14)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)}





-- ======================================
@@ -1976,7 +1976,10 @@ NASubscriber ::= SEQUENCE 
		-- List of all known devices allocated to this user. 

	subscriber			[5] GenericSubscriberInfo OPTIONAL ,

		-- Name, address and other generic subscriber information

	...

	...,

	allocatedDevices	[6] SEQUENCE OF NADevice OPTIONAL

		-- If present, contains device details for all elements from allocatedDeviceIDs



}



NAServiceSubscription ::= SEQUENCE
@@ -2007,9 +2010,9 @@ NAServiceSubscription ::= SEQUENCE 
		-- Describes the nature of the subscription

	deliveryAddress			[16] AddressInformation OPTIONAL,

	resellerAddress			[17] AddressInformation OPTIONAL,

	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL





	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL,

	allocatedDevices		[19] SEQUENCE OF NADevice OPTIONAL

		-- If present, contains device details for all elements from allocatedDeviceIDs

}



NationalNASubscription ::= SEQUENCE
@@ -2064,9 +2067,11 @@ NAServiceUsage ::= SEQUENCE 
		-- Identifier for a known user of this network access

	ePSInformation		[16] EPSInformation OPTIONAL,

	wifiInformation		[17] WifiInformation OPTIONAL,

	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL

	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL,

	-- contains extended information about the NAT or PAT operations carried out within this

	-- service usage session

	naDevice			[19] NADevice OPTIONAL

		-- If present, contains the device details for the device referenced in naDeviceID





}