Commit 42061c3b authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 657 v1.17.1 (2015-12-04) agreed at LI#40 (Aachen, 2015-09-08)

parent 8500087a
Loading
Loading
Loading
Loading
+347 −320
Original line number Diff line number Diff line
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version17(17)}

DEFINITIONS IMPLICIT TAGS ::=

@@ -12,8 +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) version16(16)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17)}

-- ======================================
-- Top level definitions for RDHI wrapper
@@ -29,6 +28,7 @@ RetainedDataMessage ::= SEQUENCE
		-- retainedDataPayload)
	...
}

-- ==========================================================================
-- Definitions for Retained Data header information, present in every message
-- ==========================================================================
@@ -107,11 +107,12 @@ RequestMessage ::= SEQUENCE
		-- Only to be used in case the present document cannot fulfil the national requirements
		-- or to transmit a warrant.
	...,
	maxRecordsPerBatch			[6] INTEGER OPTIONAL
	maxRecordsPerBatch			[6] INTEGER OPTIONAL,
		-- Indicates that multi-part delivery shall be used and each ResponseMessage shall not
		-- contain more records than specified. (see clause 6.3.3.3)


	requestedData				[7] SEQUENCE OF UTF8String OPTIONAL
		-- only to use in case of selective requests, it contains
		-- the path to the selected parameter in XPATH notation
}

DeliveryPointHIB ::= UTF8String
@@ -237,7 +238,6 @@ FurtherInformation ::= SEQUENCE
	categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4
}


CategorisedErrorDescription ::= SEQUENCE
{
	value				[1] INTEGER,
@@ -245,10 +245,6 @@ CategorisedErrorDescription ::= SEQUENCE
	...
}





-- ===================================================
-- Definitions of a cancel message and acknowledgement
-- ===================================================
@@ -367,6 +363,7 @@ NationalSupplementaryResponse ::= SEQUENCE
		-- extension marker (...).
		-- It is recommended that a version indicator is included.
}

TimeSpan ::= SEQUENCE
{
	startTime		[1] GeneralizedTime OPTIONAL,
@@ -415,8 +412,6 @@ OrganizationInfo ::= SEQUENCE
		-- time that subscriber account was created
	modifiedDate			[14] GeneralizedTime OPTIONAL
		-- date that subscriber account was modified


}

IndividualInfo ::= SEQUENCE
@@ -437,7 +432,6 @@ IndividualInfo ::= SEQUENCE
	otherAddresses			[8] SEQUENCE OF OtherAddress OPTIONAL,
	createTime				[9] GeneralizedTime OPTIONAL
		-- time that subscriber account was created

}

PersonName ::= SEQUENCE
@@ -489,10 +483,13 @@ AddressInformation ::= SEQUENCE
		-- Country code as defined in ISO 3166-1 [4]
	validity				[12] TimeSpan OPTIONAL,
		-- time from which the address was registered
	...
	...,
	relatedOrganizationInfo	[13] OrganizationInfo OPTIONAL,
	relatedPersonName		[14] PersonName OPTIONAL,
	otherInformation		[15] UTF8String OPTIONAL
		-- additional information in cases of divergent addresses
}


OtherAddress ::= SEQUENCE
{
	address			[1] AddressInformation OPTIONAL,
@@ -503,7 +500,6 @@ OtherAddress ::= SEQUENCE
	...
}


AuthenticationInfo ::= SEQUENCE
{
	authenticationType		[1] UTF8String OPTIONAL,
@@ -531,7 +527,9 @@ BankAccount ::= SEQUENCE
	nationalBankNumber					[5] UTF8String OPTIONAL,
		-- To be used in case that the account holding bank has neither IBAN nor BIC
	bankName							[6] UTF8String OPTIONAL,
	...
	...,
	sepaRefNumber						[7] UTF8String OPTIONAL
		-- To be used for referenceNumber of a SEPA direct debit mandate
}

IBAN ::= UTF8String
@@ -549,6 +547,7 @@ BillingMethod ::= ENUMERATED
	prepaid(2),
	...
}

TelephonyRecord ::= CHOICE
{
	telephonySubscriber			[1] TelephonySubscriber,
@@ -592,6 +591,40 @@ TelephonySubscriberId ::= UTF8String
TelephonySubscriberInfo ::= NULL
	-- Reserved

PartyNumberInfo ::= SEQUENCE
{
	partyNumber							[1] PartyNumber OPTIONAL,
		-- referenced partyNumber for the additional information in this type
	timeSpan							[2] TimeSpan OPTIONAL,
		-- start and end date if applicable in which the number was active
	disableReason						[3] UTF8String OPTIONAL,
		-- reason of temporarily disable procedure - if applicable
	...
}

ICCIDInfo ::= SEQUENCE
{
	iCCID								[1] UTF8String OPTIONAL,
	timeSpan							[2] TimeSpan OPTIONAL,
		-- activation- and deactivation-date if applicable in which the ICCID was active
	...
}

LoginInfo ::= SEQUENCE
{
	login								[1] UTF8String OPTIONAL,
		-- login used for authentication, usually a username or email address
	password							[2] UTF8String OPTIONAL,
	serviceName							[3] UTF8String OPTIONAL,
		-- short description of the kind of service the login / password is used for
	needsAdditionalAuthentication		[4] BOOLEAN OPTIONAL,
		-- true if additional authentication methods are required, like security questions or
		-- e-tokens
	timeSpan							[5] TimeSpan OPTIONAL,
		-- timespan when the login / password was valid
	...
}

SubscribedTelephonyServices ::= SEQUENCE
{
	serviceID							[1] UTF8String OPTIONAL,
@@ -626,19 +659,16 @@ SubscribedTelephonyServices ::= SEQUENCE
		-- Describes the nature of the subscription
	deliveryAddress						[19] AddressInformation OPTIONAL,
	resellerAddress						[20] AddressInformation OPTIONAL,
	otherAddresses						[21] SEQUENCE OF OtherAddress OPTIONAL

}

NationalTelephonySubscriptionInfo ::= SEQUENCE
{
	countryCode		[1] UTF8String (SIZE (2)),
		-- see comment in NationalRequestParameters
	...
	otherAddresses						[21] SEQUENCE OF OtherAddress OPTIONAL,
	registeredNumbersInfo				[22] SEQUENCE OF PartyNumberInfo OPTIONAL,
		-- information about timespan of the active number and deactivation events
	registeredICCIDs					[23] SEQUENCE OF ICCIDInfo OPTIONAL,
		-- in cases of MultiSIM card contracts
	loginInfos							[24] SEQUENCE OF LoginInfo OPTIONAL
		-- e.g. login information according a VMS/UMS account
}


SubscriptionType  ::= ENUMERATED    -- Describes the nature of the subscription   
SubscriptionType  ::= ENUMERATED
{
	unknown(0),
	postpay(1),
@@ -646,9 +676,14 @@ SubscriptionType ::= ENUMERATED -- Describes the nature of the subscription
	other(3),
	...
}
	-- Describes the nature of the subscription



NationalTelephonySubscriptionInfo ::= SEQUENCE
{
	countryCode		[1] UTF8String (SIZE (2)),
		-- see comment in NationalRequestParameters
	...
}

TelephonyBillingDetails ::= SEQUENCE
{
@@ -682,7 +717,7 @@ BillingRecords ::= SEQUENCE
	currency							[4] UTF8String (SIZE(3)) OPTIONAL,
		-- as per ISO 4217 [5]
	method								[5] UTF8String OPTIONAL,
		-- i.e. credit card etc. 
		-- i.e. credit card, etc.
	...,
	nationalTelephonyBillingRecords		[6] NationalTelephonyBillingRecords OPTIONAL,
		-- To be defined on a national basis
@@ -691,7 +726,7 @@ BillingRecords ::= SEQUENCE
		-- Unique reference for this transaction/billing record
		-- Details to be defined on a national basis
	transactionStatus					[8] UTF8String OPTIONAL
		-- Status of the transaction (i.e. “declined”, “succeeded” etc.)
		-- Status of the transaction (i.e. "declined", "succeeded", etc.)
		-- Details to be defined on a national bases
}

@@ -732,9 +767,12 @@ TelephonyServiceUsage ::= SEQUENCE
	ringDuration					[8] INTEGER OPTIONAL,
	...,
	mmsInformation					[9] MmsInformation OPTIONAL,
	nationalTelephonyServiceUsage	[10] NationalTelephonyServiceUsage OPTIONAL
	nationalTelephonyServiceUsage	[10] NationalTelephonyServiceUsage OPTIONAL,
		-- To be defined on a national basis
		-- Only to be used in case the present document cannot fulfil the national requirements
	operatorSpecificCallDetails		[11] UTF8String OPTIONAL
		-- CSP specific value which indicates the nature of a call
		-- (e.g. "CallIndicator: GPR, CallActionCode: 2")
}

NationalTelephonyServiceUsage ::= SEQUENCE
@@ -1020,7 +1058,6 @@ TelephonyLocation ::= SEQUENCE
	detailedLocation			[4] TelephonyNetworkElement OPTIONAL
		-- The extended information for this network element as it was at the time of the
		-- communication

}

NationalTelephonyLocation ::= SEQUENCE
@@ -1150,7 +1187,6 @@ TransmitterTechnology ::= ENUMERATED
	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.

}

NationalTransmitterDetails	::= SEQUENCE
@@ -1167,8 +1203,8 @@ NationalTransmitterDetails ::= SEQUENCE
Location ::= SEQUENCE
{
	e164-Number				[1] OCTET STRING (SIZE (1..25)) OPTIONAL,
		-- Coded in the same format as the ISUP location number (parameter
		-- field) of the ISUP (see EN 300 356 [7])
		-- Coded in the same format as the ISUP location number (parameter field)
		-- of the ISUP (see EN 300 356 [7])
	globalCellID			[2] OCTET STRING (SIZE (5..7)) OPTIONAL,
		-- See MAP format (see 3GPP TS 09.02 [8])
	rAI						[3] OCTET STRING (SIZE (6)) OPTIONAL,
@@ -1198,7 +1234,6 @@ Location ::= SEQUENCE
	eCGI					[12] OCTET STRING (SIZE (8)) OPTIONAL
		-- Only applicable to the CS traffic cases, such as SMS over SGs, according to
		-- 3GPP TS 23.272 [35]

}

GSMLocation ::= CHOICE
@@ -1399,6 +1434,7 @@ HorizontalExtent ::= INTEGER

PartyNumber ::= UTF8String
	-- E.164 address of the party in international format

MessageRecord ::= CHOICE
{
	msgSubscriber			[1] MsgSubscriber,
@@ -1446,11 +1482,11 @@ MsgStoreID ::= OCTET STRING
MsgAddress ::= UTF8String
	-- Messaging address, an address to which messages can be sent. In the case of Internet e-mail
	-- this will be an RFC822-style address
    -- NOTE – as of v1.2.1, this field has changed from OCTET STRING to UTF8String
	-- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String

MsgProviderID ::= UTF8String
	-- Unique identifier for a service provider, e.g. company name
     -- NOTE – as of v1.2.1, this field has changed from OCTET STRING to UTF8String
	-- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String

-- ====================================
-- Definitions of Message Service Usage
@@ -1586,7 +1622,7 @@ MsgBillingRecords ::= SEQUENCE
		-- Unique reference for this transaction/billing record
		-- Details to be defined on a national basis
	mgsTransactionStatus		[8] UTF8String OPTIONAL
		-- Status of the transaction (i.e. “declined”, “succeeded” etc.)
		-- Status of the transaction (i.e. "declined", "succeeded" etc.)
		-- Details to be defined on a national bases
}

@@ -1596,6 +1632,7 @@ NationalMsgBillingRecords ::= SEQUENCE
		-- see comment in NationalRequestParameters
	...
}

MultimediaRecord ::= CHOICE
{
	multimediaSubscriber		[1] MultimediaSubscriber,
@@ -1620,7 +1657,6 @@ MultimediaSubscriber ::= SEQUENCE
		-- a subscriber (or account) may have more than one service listed against them
	...,
	multimediaServiceRegistrationInfo	[5] MultimediaServiceRegistrationInfo OPTIONAL

}

MultimediaSubscriberInfo ::= SEQUENCE
@@ -1632,7 +1668,6 @@ MultimediaSubscriberInfo ::= SEQUENCE
MultimediaSubscriberID ::= UTF8String
	-- unique identifier for this subscriber, e.g. account number


MultimediaServiceRegistrationInfo ::= SEQUENCE
{
	emailAddress				[1] UTF8String OPTIONAL,
@@ -1648,9 +1683,6 @@ MultimediaServiceRegistrationInfo ::= SEQUENCE
	...
}




SubscribedMultimediaServices ::= SEQUENCE
{
	serviceID					[1] UTF8String OPTIONAL,
@@ -1686,8 +1718,6 @@ SubscribedMultimediaServices ::= SEQUENCE
		-- Service name used by the service provider which may be proprietary
	orderTime					[19] GeneralizedTime OPTIONAL
		-- Time when the subscribed service was ordered by the user


}

MultimediaServiceType ::= ENUMERATED
@@ -1740,8 +1770,6 @@ MultimediaServiceUsage ::= SEQUENCE
	relayIP							[20] IPAddress OPTIONAL,
	vmLength						[21] INTEGER OPTIONAL, -- number of seconds
	reason							[22] UTF8String OPTIONAL


}

MultimediaPartyInformation ::= SEQUENCE
@@ -1860,7 +1888,6 @@ MultimediaBillingDetails ::= SEQUENCE
		-- Only to be used in case the present document cannot fulfil the national requirements
	...,
	multimediaBillingAddress			[7] MultimediaBillingAddress OPTIONAL

}

MultimediaBillingAddress ::= SEQUENCE
@@ -1871,7 +1898,6 @@ MultimediaBillingAddress ::= SEQUENCE
	...
}


NationalMultimediaBillingDetails ::= SEQUENCE
{
	countryCode		[1] UTF8String (SIZE (2)),
@@ -1900,7 +1926,7 @@ MultimediaBillingRecords ::= SEQUENCE
		-- Unique reference for this transaction/billing record
		-- Details to be defined on a national basis
	multimediaTransactionStatus			[8] UTF8String OPTIONAL
		-- Status of the transaction (i.e. “declined”, “succeeded” etc.)
		-- Status of the transaction (i.e. "declined", "succeeded", etc.)
		-- Details to be defined on a national bases
}

@@ -1956,6 +1982,7 @@ NationalMultimediaMediaComponent ::= SEQUENCE
		-- see comment in NationalRequestParameters
	...
}

NetworkAccessRecord::= CHOICE
{
	naSubscriber		[1] NASubscriber,
@@ -1992,7 +2019,6 @@ NASubscriber ::= SEQUENCE
	...,
	allocatedDevices	[6] SEQUENCE OF NADevice OPTIONAL
		-- If present, contains device details for all elements from allocatedDeviceIDs

}

NAServiceSubscription ::= SEQUENCE
@@ -2083,13 +2109,19 @@ NAServiceUsage ::= SEQUENCE
	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
	naDevice					[19] NADevice OPTIONAL,
		-- If present, contains the device details for the device referenced in naDeviceID


	additionalLocations			[20] SEQUENCE OF TimedLocation OPTIONAL
		-- List of additional locations and optional access time during the network access service
		-- usage
}


TimedLocation	::= SEQUENCE
{
	location			[1]	Location,
	naAccessTime		[2] GeneralizedTime OPTIONAL,
	...
}

WifiInformation ::= SEQUENCE
{
@@ -2112,7 +2144,6 @@ WifiInformation ::= SEQUENCE
	authenticationType					[5] AuthenticationType OPTIONAL,
	additionalAuthenticationInformation	[6] AdditionalAuthenticationInformation OPTIONAL,
	...,

	accessPointIPAddress				[7] IPAddress  OPTIONAL,
	accessPointAdditionalDescriptions	[8] SEQUENCE OF UTF8String OPTIONAL,
			-- Informal description of location, category or type of access point,
@@ -2120,10 +2151,8 @@ WifiInformation ::= SEQUENCE
	accessPointAdditionalProviders		[9] SEQUENCE OF UTF8String OPTIONAL
			-- For WiFi, there may be other parties involved in hosting or owning the
			-- Access Points, e.g. access point provider or partner providers

}


AuthenticationType ::= ENUMERATED
{
	authenticationBySMS(1),
@@ -2139,10 +2168,10 @@ AuthenticationType ::= ENUMERATED
		-- additionalAuthenticationInformation shall contain the MAC Address unless it is already
		-- populated as NADeviceID in this record.
	authenticationByEAPSIM(4),
		-- If authenticated by EAP SIM see TS 33.234 [X]
		-- If authenticated by EAP SIM see TS 33.234 [36]
		-- additionalAuthenticationInformation shall contain the IMSI
	-- Other varieties of EAP could be added here later, together with any extra information they 
	-- could provide.
		-- Other varieties of EAP could be added here later, together with any extra information
		-- they could provide.
	authenticationByUsernameAndPassword(5),
		-- additionalAuthenticationInformation should contain username and password if appropriate
	authenticationByPaymentOrVoucher(6),
@@ -2166,8 +2195,6 @@ AdditionalAuthenticationInformation ::= SEQUENCE
	...
}



AddressTranslationRecord ::= SEQUENCE
{
	validity							[1] TimeSpan OPTIONAL,
@@ -2179,7 +2206,8 @@ AddressTranslationRecord ::= SEQUENCE
	publicIPAddress						[4] IPAddress OPTIONAL,
		-- the translated IP of the host, i.e. the address known by the remote host
	publicPort							[5] AddressTranslationPortAssignment OPTIONAL,
		-- the translated port(s) of the host, i.e. the port(s) known by the remote host, if 		   		   applicable
		-- the translated port(s) of the host, i.e. the port(s) known by the remote host, if
		-- applicable
	destinationIPAddress				[6] IPAddress OPTIONAL,
		-- the IP address of the remote host
	destinationPort						[7] INTEGER OPTIONAL,
@@ -2238,7 +2266,8 @@ 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.
	...
}

@@ -2275,7 +2304,7 @@ GPRSEvent ::= ENUMERATED
	gPRSAttach(5),
	gPRSDetach(6),
	locationInfoUpdate(10),
		-- sMS ommited from 3GPP TS 33.108 [11],
		-- sMS ommited from 3GPP TS 33.108 [11]
	pDPContextModification(11),
	servingSystem(12),
	...
@@ -2292,7 +2321,7 @@ EPSInformation ::= SEQUENCE
	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
		-- PDN/PDP Type number as defined in 3GPP TS 29.274 [32] 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
@@ -2302,7 +2331,7 @@ EPSInformation ::= SEQUENCE
	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
		-- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17
	ePSEvent					[15] EPSEvent OPTIONAL,
	...
}
@@ -2312,7 +2341,7 @@ IMSIUnauthenticatedFlag ::= BOOLEAN

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:
	-- specified in TS 29.274 [32] 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
@@ -2320,24 +2349,21 @@ P-GWPLMN-ID ::= OCTET STRING (SIZE (3))

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' 
	-- 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.
	-- 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
	-- The list of "EPSEvent" below is partly taken from 3GPP TS 33.108 [11] EpsHI2Operations
	-- from the "EPSEvent ::=ENUMERATED" module
{
	e-UTRANAttach(16),
	e-UTRANDetach(17),
@@ -2372,7 +2398,7 @@ NADevice ::= SEQUENCE

IMEI ::= OCTET STRING (SIZE(8))
	-- format as per 3GPP TS 09.02 [8]
	-- NOTE: When comparing IMEIs, an IMEI can be considered “equal to” the requested IMEI even
	-- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even
	-- if the checksum or software version digits are different or not present.

IMSI ::= OCTET STRING (SIZE(3..8))
@@ -2461,8 +2487,9 @@ NABillingDetails ::= SEQUENCE
		-- Unique reference for this transaction/billing record
		-- Details to be defined on a national basis
	naTransactionStatus	[7] UTF8String OPTIONAL
		-- Status of the transaction (i.e. “declined”, “succeeded” etc.)
		-- Status of the transaction (i.e. "declined", "succeeded", etc.)
		-- Details to be defined on a national basis
}

END -- end of RDMessage
+81 −9
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.16.1#/RetainedData"
            targetNamespace="http://uri.etsi.org/02657/v1.16.1#/RetainedData"
            xmlns="http://uri.etsi.org/02657/v1.17.1#/RetainedData"
            targetNamespace="http://uri.etsi.org/02657/v1.17.1#/RetainedData"
			elementFormDefault="qualified">

	<xsd:annotation>
		<xsd:documentation xml:lang="en">
			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 
			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.17.1 
		</xsd:documentation>
	</xsd:annotation>

@@ -491,6 +491,9 @@
         <xsd:element name="city" minOccurs="0" type="xsd:string"/>
         <xsd:element name="country" minOccurs="0" type="CountryCode"/>
         <xsd:element name="validity" minOccurs="0" type="TimeSpan"/>
         <xsd:element name="relatedOrganizationInfo" minOccurs="0" type="OrganizationInfo"/>
         <xsd:element name="relatedPersonName" minOccurs="0" type="PersonName"/>
         <xsd:element name="otherInformation" minOccurs="0" type="xsd:string"/>
         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
      </xsd:sequence>
   </xsd:complexType>
@@ -592,6 +595,7 @@
         <xsd:element name="nationalAccountNumber" minOccurs="0" type="xsd:string"/>
         <xsd:element name="nationalBankNumber" minOccurs="0" type="xsd:string"/>
         <xsd:element name="bankName" minOccurs="0" type="xsd:string"/>
         <xsd:element name="sepaRefNumber" minOccurs="0" type="xsd:string"/>
         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
      </xsd:sequence>
   </xsd:complexType>
@@ -648,6 +652,31 @@
      </xsd:sequence>
   </xsd:complexType>

   <xsd:complexType name="PartyNumberInfo">
      <xsd:sequence>
         <xsd:element name="partyNumber" minOccurs="0" type="PartyNumber"/>
         <xsd:element name="timeSpan" minOccurs="0" type="TimeSpan"/>
         <xsd:element name="disableReason" minOccurs="0" type="xsd:string"/>
      </xsd:sequence>
   </xsd:complexType>

   <xsd:complexType name="ICCIDInfo">
      <xsd:sequence>
         <xsd:element name="iCCID" minOccurs="0" type="xsd:string"/>
         <xsd:element name="timeSpan" minOccurs="0" type="TimeSpan"/>
      </xsd:sequence>
   </xsd:complexType>

   <xsd:complexType name="LoginInfo">
      <xsd:sequence>
         <xsd:element name="login" minOccurs="0" type="xsd:string"/>
         <xsd:element name="password" minOccurs="0" type="xsd:string"/>
         <xsd:element name="serviceName" minOccurs="0" type="xsd:string"/>
         <xsd:element name="needsAdditionalAuthentication" minOccurs="0" type="xsd:boolean"/>
         <xsd:element name="timeSpan" minOccurs="0" type="TimeSpan"/>
      </xsd:sequence>
   </xsd:complexType>

   <xsd:complexType name="SubscribedTelephonyServices">
      <xsd:sequence>
         <xsd:element name="serviceID" minOccurs="0" type="xsd:string"/>
@@ -689,6 +718,27 @@
            </xsd:sequence>
          </xsd:complexType>
     </xsd:element>
     <xsd:element name="registeredNumbersInfo" minOccurs="0">
          <xsd:complexType>
            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
              <xsd:element name="PartyNumberInfo" type="PartyNumberInfo"/>
            </xsd:sequence>
          </xsd:complexType>
     </xsd:element>
     <xsd:element name="registeredICCIDs" minOccurs="0">
          <xsd:complexType>
            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
              <xsd:element name="ICCIDInfo" type="ICCIDInfo"/>
            </xsd:sequence>
          </xsd:complexType>
     </xsd:element>
     <xsd:element name="loginInfos" minOccurs="0">
          <xsd:complexType>
            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
              <xsd:element name="LoginInfo" type="LoginInfo"/>
            </xsd:sequence>
          </xsd:complexType>
     </xsd:element>
     <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
      </xsd:sequence>
   </xsd:complexType>
@@ -1032,6 +1082,7 @@
		 <xsd:element name="ringDuration" minOccurs="0" type="xsd:integer"/>
		 <xsd:element name="mmsInformation" minOccurs="0" type="MmsInformation"/>
		 <xsd:element name="nationalTelephonyServiceUsage" minOccurs="0" type="NationalTelephonyServiceUsage"/>
         <xsd:element name="operatorSpecificCallDetails" minOccurs="0" type="xsd:string"/>	
         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
      </xsd:sequence>
   </xsd:complexType>
@@ -1931,10 +1982,24 @@
          </xsd:complexType>
        </xsd:element>
        <xsd:element name="naDevice" minOccurs="0" type="NADevice"/>
        <xsd:element name="additionalLocations" minOccurs="0">
          <xsd:complexType>
            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
              <xsd:element name="TimedLocation" type="TimedLocation"/>
            </xsd:sequence>
          </xsd:complexType>
        </xsd:element>
        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
      </xsd:sequence>
   </xsd:complexType>

  <xsd:complexType name="WifiInformation">
    <xsd:sequence>
        <xsd:element name="location" minOccurs="0" type="Location"/>
        <xsd:element name="naAccessTime" minOccurs="0" type="GeneralizedTime"/>
    </xsd:sequence>
  </xsd:complexType>

  <xsd:complexType name="WifiInformation">
    <xsd:sequence>
      <xsd:element name="bSSID" minOccurs="0">
@@ -2220,6 +2285,13 @@
         <xsd:element name="maxHits" minOccurs="0" type="xsd:integer"/>
         <xsd:element name="nationalRequestParameters" minOccurs="0" type="NationalRequestParameters"/>
         <xsd:element name="maxRecordsPerBatch" minOccurs="0" type="xsd:integer"/>
         <xsd:element name="requestedData" minOccurs="0">
            <xsd:complexType>
               <xsd:sequence minOccurs="0" maxOccurs="unbounded">
                  <xsd:element name="requestedData" type="xsd:string"/>
               </xsd:sequence>
            </xsd:complexType>            
         </xsd:element>        
         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
      </xsd:sequence>
   </xsd:complexType>
+347 −320

File changed and moved.

Preview size limit exceeded, changes collapsed.

+81 −9

File changed and moved.

Preview size limit exceeded, changes collapsed.