Commit b90173fd authored by canterburym's avatar canterburym
Browse files

TS 102 657 v1.23.1 (2019-08-20) agreed at LI#51 (Texel, 2019-06-11)

parent 3f90a296
Pipeline #4177 failed with stage
in 7 seconds
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)}
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) version20(20)}
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version21(21)}
-- ======================================
-- Top level definitions for RDHI wrapper
......@@ -396,6 +396,16 @@ TimeSpan ::= SEQUENCE
-- duration in seconds
}
File ::= SEQUENCE
{
mediaType [1] UTF8String,
-- Media type of the file, e.g. image/jpeg, application/pdf
-- Media types (formerly known as MIME types) are assigned and listed by the IANA
content [2] OCTET STRING,
-- Content of the file
...
}
-- ==============================================
-- Definitions for Generic Subscriber Information
-- ==============================================
......@@ -526,13 +536,18 @@ OtherAddress ::= SEQUENCE
AuthenticationInfo ::= SEQUENCE
{
authenticationType [1] UTF8String OPTIONAL,
authenticationNumber [2] UTF8String OPTIONAL,
...,
issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL,
issuingOrganization [4] UTF8String OPTIONAL,
nationality [5] UTF8String OPTIONAL
nationality [5] UTF8String OPTIONAL,
authenticationDocument [6] SEQUENCE OF File OPTIONAL
}
PaymentDetails ::= SEQUENCE
{
billingMethod [1] BillingMethod OPTIONAL,
......@@ -637,9 +652,12 @@ ICCIDInfo ::= SEQUENCE
-- PUK code associated with the ICCID
pUK2 [4] UTF8String OPTIONAL,
-- PUK2 code associated with the ICCID
iMSI [5] IMSI OPTIONAL
iMSI [5] IMSI OPTIONAL,
sUPI [6] SUPI OPTIONAL,
gPSI [7] GPSI OPTIONAL
}
LoginInfo ::= SEQUENCE
{
login [1] UTF8String OPTIONAL,
......@@ -694,10 +712,12 @@ SubscribedTelephonyServices ::= SEQUENCE
-- 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
loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL,
-- e.g. login information according a VMS/UMS account
paymentTransactions [25] SEQUENCE OF BillingRecords OPTIONAL
}
SubscriptionType ::= ENUMERATED
{
unknown(0),
......@@ -755,11 +775,13 @@ BillingRecords ::= SEQUENCE
transactionID [7] UTF8String OPTIONAL,
-- Unique reference for this transaction/billing record
-- Details to be defined on a national basis
transactionStatus [8] UTF8String OPTIONAL
transactionStatus [8] UTF8String OPTIONAL,
-- Status of the transaction (i.e. "declined", "succeeded", etc.)
-- Details to be defined on a national bases
copyOfBill [9] SEQUENCE OF File OPTIONAL
}
NationalTelephonyBillingRecords ::= SEQUENCE
{
countryCode [1] UTF8String (SIZE (2)),
......@@ -1234,12 +1256,12 @@ 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])
-- of the ISUP (see ETSI EN 300 356 [7])
globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL,
-- See MAP format (see 3GPP TS 09.02 [8])
-- See MAP format (see ETSI TS 100 974 [8])
rAI [3] OCTET STRING (SIZE (6)) OPTIONAL,
-- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with
-- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the
-- ETSI TS 124 008 [9] without the Routing Area Identification IEI (only the
-- last 6 octets are used)
gsmLocation [4] GSMLocation OPTIONAL,
umtsLocation [5] UMTSLocation OPTIONAL,
......@@ -1247,33 +1269,45 @@ Location ::= SEQUENCE
-- format: PLMN-ID 3 octets (no. 1-3)
-- LAC 2 octets (no. 4-5)
-- SAC 2 octets (no. 6-7)
-- (according to 3GPP TS 25.413 [31])
-- (according to ETSI TS 125 413 [31])
oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL,
-- the "Routeing Area Identifier" in the old SGSN is coded in accordance with
-- 3GPP TS 24.008 [9] without the Routing Area Identification IEI
-- ETSI TS 124 008 [9] without the Routing Area Identification IEI
-- (only the last 6 octets are used)
-- This parameter is duplicated from 3GPP TS 33.108 [11]
-- This parameter is duplicated from ETSI TS 133 108 [11]
...,
postalLocation [8] AddressInformation OPTIONAL,
extendedLocation [9] ExtendedLocation OPTIONAL,
userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL,
-- coded according to 3GPP TS 29.274 [32]; the type IE is not included
-- coded according to ETSI TS 129 274 [32]; the type IE is not included
tAI [11] OCTET STRING (SIZE (6)) OPTIONAL,
-- Only applicable to the CS traffic cases, such as SMS over SGs, according to
-- 3GPP TS 23.272 [35]
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]
maritimeTransport [13] MaritimeTransport OPTIONAL,
-- Information about the mobile cells embarked on ships using
-- satellite transponder backhaul
airTransport [14] AirTransport OPTIONAL,
-- Information about the mobile cells embarked on aircraft using
-- satellite transponder backhaul
bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL
bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL,
-- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID
nCGI [16] NCGI OPTIONAL,
-- format as specified in 3GPP TS 38.413 [42].
n3gaLocation [17] OCTET STRING (SIZE (4)) OPTIONAL,
-- format as specified in 3GPP TS 29.571 [43]
trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL
-- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or
-- TAC (5G) = 3 octets and without length indicator
}
NCGI ::= SEQUENCE
{
pLMNID [1] PLMNID,
nRCellID [2] NRCellID
}
NRCellID ::= BIT STRING (SIZE(36))
-- TS 38.413 [23], clause 9.3.1.7
GSMLocation ::= CHOICE
{
geoCoordinates [1] SEQUENCE
......@@ -1378,10 +1412,13 @@ MapDatum ::= ENUMERATED
iTM(12),
-- Irish Transverse Mercator
...,
cH1903(13)
cH1903(13),
-- Swiss reference system
cH1903Plus(14)
-- New Swiss reference system
}
UMTSLocation ::= CHOICE
{
point [1] GA-Point,
......@@ -1660,9 +1697,11 @@ MsgBillingDetails ::= SEQUENCE
nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
...
...,
copyOfBill [7] SEQUENCE OF File OPTIONAL
}
NationalMsgBillingDetails ::= SEQUENCE
{
countryCode [1] UTF8String (SIZE (2)),
......@@ -1791,9 +1830,11 @@ SubscribedMultimediaServices ::= SEQUENCE
iMEIs [20] SEQUENCE OF IMEI OPTIONAL,
registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL,
allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL
allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL,
paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL
}
MultimediaServiceType ::= ENUMERATED
{
private(0),
......@@ -2012,9 +2053,11 @@ MultimediaBillingDetails ::= SEQUENCE
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
...,
multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL
multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL,
copyOfBill [8] SEQUENCE OF File OPTIONAL
}
MultimediaBillingAddress ::= SEQUENCE
{
addressSuppliedTime [1] GeneralizedTime OPTIONAL,
......@@ -2214,9 +2257,13 @@ NAServiceSubscription ::= SEQUENCE
allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL,
-- If present, contains device details for all elements from allocatedDeviceIDs
mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL,
registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL
registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
paymentTransactions [22] SEQUENCE OF BillingRecords OPTIONAL,
sUPI [23] SUPI OPTIONAL,
gPSI [24] GPSI OPTIONAL
}
NationalNASubscription ::= SEQUENCE
-- Description of the subscription to a Network Access service
{
......@@ -2274,11 +2321,15 @@ NAServiceUsage ::= SEQUENCE
-- service usage session
naDevice [19] NADevice OPTIONAL,
-- If present, contains the device details for the device referenced in naDeviceID
additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL
additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL,
-- List of additional locations and optional access time during the network access service
-- usage
sNSSAI [21] OCTET STRING (SIZE(4)) OPTIONAL,
notifyUri [22] OCTET STRING (SIZE(3..8)) OPTIONAL,
fiveGSInformation [23] FIVEGSInformation OPTIONAL
}
TimedLocation ::= SEQUENCE
{
location [1] Location,
......@@ -2484,7 +2535,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 [32] clause 8.34
-- PDN/PDP Type number as defined in ETSI TS 129 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
......@@ -2493,12 +2544,14 @@ EPSInformation ::= SEQUENCE
-- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6
dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL,
dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL,
rATType [14] INTEGER (0..255),
-- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17
rATType [14] INTEGER (0..255) OPTIONAL,
-- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17
-- NOTE - as of v1.23.1 of the present document, this field has changed to optional
ePSEvent [15] EPSEvent OPTIONAL,
...
}
IMSIUnauthenticatedFlag ::= BOOLEAN
-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI
......@@ -2538,6 +2591,61 @@ EPSEvent ::= ENUMERATED
...
}
FIVEGSInformation ::= SEQUENCE
{
sUPI [1] SUPI OPTIONAL,
dNN [2] UTF8String OPTIONAL,
gPSI [3] GPSI OPTIONAL,
pEI [4] PEI OPTIONAL,
pDUSessionID [6] INTEGER (0..255) OPTIONAL,
sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL,
pDUIpv4Address [8] IPAddress OPTIONAL,
pDUIpv6Address [9] IPAddress OPTIONAL,
pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL,
rFSPIndex [11] INTEGER (1..255) OPTIONAL,
applicationId [12] UTF8String OPTIONAL,
applicationServiceProviderIdentity [13] UTF8String OPTIONAL,
serviceId [14] INTEGER OPTIONAL,
chargingId [15] UTF8String OPTIONAL,
pDUType [16] PDUSessionType OPTIONAL,
sSCMode [17] SSCMode OPTIONAL,
vPLMNId [18] PLMNID OPTIONAL,
hPLMNId [19] PLMNID OPTIONAL,
chargingCharacteristics [20] UTF8String OPTIONAL,
chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL,
pDUSessionStartTime [22] GeneralizedTime OPTIONAL,
pDUSessionStopTime [23] GeneralizedTime OPTIONAL,
lowPriorityIndicator [24] BOOLEAN OPTIONAL,
dataOffStatus [25] BOOLEAN OPTIONAL,
diagnostics [26] INTEGER OPTIONAL,
uETimeZone [27] UTF8String OPTIONAL,
uPFAddress [28] IPAddress OPTIONAL,
aMFAddress [29] IPAddress OPTIONAL,
uDMAddress [30] IPAddress OPTIONAL,
sMFAddress [31] IPAddress OPTIONAL,
uPFId [32] UUID OPTIONAL,
aMFIdentifier [33] AMFID OPTIONAL,
uDMIdentifier [34] UUID OPTIONAL,
sMFIdentifier [35] UUID OPTIONAL,
uPFPDNAddress [36] IPAddress OPTIONAL,
uPFPDNAddressExtension [37] IPAddress OPTIONAL,
dynamicAddressFlag [38] BOOLEAN OPTIONAL,
dynamicAddressFlagExt [39] BOOLEAN OPTIONAL,
rAT5Type [40] RAT5Type OPTIONAL,
flowQosInfo [41] OCTET STRING OPTIONAL,
serviceID [42] INTEGER OPTIONAL
}
PDUSessionType ::= ENUMERATED
{
iPv4(1),
iPv6(2),
iPv4v6(3),
unstructured(4),
ethernet(5)
}
-- ====================================
-- Definitions of Network Access Device
-- ====================================
......@@ -2559,14 +2667,38 @@ NADevice ::= SEQUENCE
subscriberID [7] NaSubscriberID OPTIONAL
}
SUPI ::= CHOICE
{
iMSI [1] IMSI,
nAI [2] NAI,
...
}
GPSI ::= CHOICE
{
mSISDN [1] PartyNumber,
nAI [2] NAI,
...
}
PEI ::= CHOICE
{
iMEI [1] IMEI,
iMEISV [2] IMEISV
}
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
-- if the checksum or software version digits are different or not present.
IMEISV ::= NumericString (SIZE(16))
IMSI ::= OCTET STRING (SIZE(3..8))
-- format as per 3GPP TS 09.02 [8]
NAI ::= UTF8String
-- ======================================
-- Definitions of Message Network element
-- ======================================
......@@ -2654,5 +2786,40 @@ NABillingDetails ::= SEQUENCE
-- Details to be defined on a national basis
}
SSCMode ::= ENUMERATED
{
sSCMode1(1),
sSCMode2(2),
sSCMode3MultiPDUSession(3),
sSCMode3Multihome(4),
...
}
PLMNID ::= OCTET STRING (SIZE(3))
UUID ::= OCTET STRING (SIZE(16))
RAT5Type ::= ENUMERATED
{
nr(1),
eutra(2),
wlan(3),
virtual(4),
...
}
AMFID ::= SEQUENCE
{
aMFRegionID [1] AMFRegionID,
aMFSetID [2] AMFSetID,
aMFPointer [3] AMFPointer
}
AMFRegionID ::= INTEGER (0..255)
AMFSetID ::= INTEGER (0..63)
AMFPointer ::= INTEGER (0..1023)
END -- end of RDMessage
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.22.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.22.1#/RetainedData" elementFormDefault="qualified">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.23.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.23.1#/RetainedData" elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType name="GeneralizedTime">
......@@ -21,7 +21,7 @@
<xsd:element name="rdHeaderId" type="ObjectIdentifier"/>
<xsd:element name="retainedDataHeader" type="RetainedDataHeader"/>
<xsd:element name="retainedDataPayload" type="RetainedDataPayload"/>
<xsd:element name="retainedDataDigest" minOccurs="0" type="xsd:hexBinary"/>
<xsd:element name="retainedDataDigest" type="xsd:hexBinary" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -244,6 +244,7 @@
<xsd:element name="tM65" type="NULL"/>
<xsd:element name="iTM" type="NULL"/>
<xsd:element name="cH1903" type="NULL"/>
<xsd:element name="cH1903Plus" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
......@@ -387,6 +388,11 @@
<xsd:length value="8"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="IMEISV">
<xsd:restriction base="xsd:token">
<xsd:pattern value="[0-9]{16}"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="IMSI">
<xsd:restriction base="xsd:hexBinary">
<xsd:minLength value="3"/>
......@@ -400,8 +406,8 @@
<xsd:sequence>
<xsd:element name="countryCode" type="CountryCode"/>
<xsd:element name="authorisedOrganisationID" type="AuthorisedOrganisationID"/>
<xsd:element name="requestNumber" minOccurs="0" type="RequestNumber"/>
<xsd:element name="externalIdentifier" minOccurs="0" type="ExternalIdentifier"/>
<xsd:element name="requestNumber" type="RequestNumber" minOccurs="0"/>
<xsd:element name="externalIdentifier" type="ExternalIdentifier" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -410,52 +416,62 @@
<xsd:element name="requestID" type="RequestID"/>
<xsd:element name="cSPID" type="CSPID"/>
<xsd:element name="timeStamp" type="GeneralizedTime"/>
<xsd:element name="thirdPartyCSPID" minOccurs="0" type="CSPID"/>
<xsd:element name="requestType" minOccurs="0" type="RequestType"/>
<xsd:element name="thirdPartyCSPID" type="CSPID" minOccurs="0"/>
<xsd:element name="requestType" type="RequestType" minOccurs="0"/>
<xsd:element name="requestFlag" type="RequestFlag" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="TimeSpan">
<xsd:sequence>
<xsd:element name="startTime" minOccurs="0" type="GeneralizedTime"/>
<xsd:element name="endTime" minOccurs="0" type="GeneralizedTime"/>
<xsd:element name="durationTime" minOccurs="0" type="xsd:integer"/>
<xsd:element name="startTime" type="GeneralizedTime" minOccurs="0"/>
<xsd:element name="endTime" type="GeneralizedTime" minOccurs="0"/>
<xsd:element name="durationTime" type="xsd:integer" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="File">
<xsd:sequence>
<xsd:element name="mediaType" type="xsd:string" minOccurs="0"/>
<xsd:element name="content" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:hexBinary"/>
</xsd:simpleType>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AddressInformation">
<xsd:sequence>
<xsd:element name="flatNumber" minOccurs="0" type="xsd:string"/>
<xsd:element name="buildingName" minOccurs="0" type="xsd:string"/>
<xsd:element name="buildingNumber" minOccurs="0" type="xsd:string"/>
<xsd:element name="streetName" minOccurs="0" type="xsd:string"/>
<xsd:element name="poBox" minOccurs="0" type="xsd:string"/>
<xsd:element name="postalCode" minOccurs="0" type="xsd:string"/>
<xsd:element name="region" minOccurs="0" type="xsd:string"/>
<xsd:element name="province" minOccurs="0" type="xsd:string"/>
<xsd:element name="language" minOccurs="0" type="xsd:string"/>
<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:element name="flatNumber" type="xsd:string" minOccurs="0"/>
<xsd:element name="buildingName" type="xsd:string" minOccurs="0"/>
<xsd:element name="buildingNumber" type="xsd:string" minOccurs="0"/>
<xsd:element name="streetName" type="xsd:string" minOccurs="0"/>
<xsd:element name="poBox" type="xsd:string" minOccurs="0"/>
<xsd:element name="postalCode" type="xsd:string" minOccurs="0"/>
<xsd:element name="region" type="xsd:string" minOccurs="0"/>
<xsd:element name="province" type="xsd:string" minOccurs="0"/>
<xsd:element name="language" type="xsd:string" minOccurs="0"/>
<xsd:element name="city" type="xsd:string" minOccurs="0"/>
<xsd:element name="country" type="CountryCode" minOccurs="0"/>
<xsd:element name="validity" type="TimeSpan" minOccurs="0"/>
<xsd:element name="relatedOrganizationInfo" type="OrganizationInfo" minOccurs="0"/>
<xsd:element name="relatedPersonName" type="PersonName" minOccurs="0"/>
<xsd:element name="otherInformation" type="xsd:string" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="OtherAddress">
<xsd:sequence>
<xsd:element name="address" minOccurs="0" type="AddressInformation"/>
<xsd:element name="addressType" minOccurs="0" type="xsd:string"/>
<xsd:element name="addressComments" minOccurs="0" type="xsd:string"/>
<xsd:element name="address" type="AddressInformation" minOccurs="0"/>
<xsd:element name="addressType" type="xsd:string" minOccurs="0"/>
<xsd:element name="addressComments" type="xsd:string" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="ContactDetails">
<xsd:sequence>
<xsd:element name="address" minOccurs="0" type="AddressInformation"/>
<xsd:element name="emailAddress" minOccurs="0" type="xsd:string"/>
<xsd:element name="address" type="AddressInformation" minOccurs="0"/>
<xsd:element name="emailAddress" type="xsd:string" minOccurs="0"/>
<xsd:element name="contactNumber" minOccurs="0">
<xsd:complexType>
<xsd:sequence minOccurs="0" maxOccurs="unbounded">
......@@ -475,11 +491,11 @@
</xsd:complexType>
<xsd:complexType name="OrganizationInfo">
<xsd:sequence>
<xsd:element name="name" minOccurs="0" type="xsd:string"/>
<xsd:element name="contactDetails" minOccurs="0" type="ContactDetails"/>
<xsd:element name="nationalRegistrationID" minOccurs="0" type="xsd:string"/>
<xsd:element name="registeredAddress" minOccurs="0" type="AddressInformation"/>
<xsd:element name="tradingAddress" minOccurs="0" type="AddressInformation"/>
<xsd:element name="name" type="xsd:string" minOccurs="0"/>
<xsd:element name="contactDetails" type="ContactDetails" minOccurs="0"/>
<xsd:element name="nationalRegistrationID" type="xsd:string" minOccurs="0"/>
<xsd:element name="registeredAddress" type="AddressInformation" minOccurs="0"/>
<xsd:element name="tradingAddress" type="AddressInformation" minOccurs="0"/>
<xsd:element name="otherAddresses" minOccurs="0">
<xsd:complexType>
<xsd:sequence minOccurs="0" maxOccurs="unbounded">
......@@ -487,35 +503,35 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="groupID" minOccurs="0" type="xsd:string"/>
<xsd:element name="groupAdministrator" minOccurs="0" type="xsd:string"/>
<xsd:element name="companyType" minOccurs="0" type="xsd:string"/>
<xsd:element name="vatEnabled" minOccurs="0" type="xsd:boolean"/>
<xsd:element name="vatNumber" minOccurs="0" type="xsd:string"/>
<xsd:element name="createIP" minOccurs="0" type="IPAddress"/>
<xsd:element name="createTime" minOccurs="0" type="GeneralizedTime"/>
<xsd:element name="modifiedDate" minOccurs="0" type="GeneralizedTime"/>
<xsd:element name="groupID" type="xsd:string" minOccurs="0"/>
<xsd:element name="groupAdministrator" type="xsd:string" minOccurs="0"/>
<xsd:element name="companyType" type="xsd:string" minOccurs="0"/>
<xsd:element name="vatEnabled" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="vatNumber" type="xsd:string" minOccurs="0"/>
<xsd:element name="createIP" type="IPAddress" minOccurs="0"/>
<xsd:element name="createTime" type="GeneralizedTime" minOccurs="0"/>
<xsd:element name="modifiedDate" type="GeneralizedTime" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="PersonName">
<xsd:sequence>
<xsd:element name="salutation" minOccurs="0" type="xsd:string"/>
<xsd:element name="surname" minOccurs="0" type="xsd:string"/>
<xsd:element name="surnamePrefix" minOccurs="0" type="xsd:string"/>
<xsd:element name="surnameSuffix" minOccurs="0" type="xsd:string"/>
<xsd:element name="middleNames" minOccurs="0" type="xsd:string"/>
<xsd:element name="firstname" minOccurs="0" type="xsd:string"/>
<xsd:element name="secondsurname" minOccurs="0" type="xsd:string"/>
<xsd:element name="secondsurnamePrefix" minOccurs="0" type="xsd:string"/>
<xsd:element name="secondsurnameSuffix" minOccurs="0" type="xsd:string"/>
<xsd:element name="salutation" type="xsd:string" minOccurs="0"/>
<xsd:element name="surname" type="xsd:string" minOccurs="0"/>
<xsd:element name="surnamePrefix" type="xsd:string" minOccurs="0"/>
<xsd:element name="surnameSuffix" type="xsd:string" minOccurs="0"/>
<xsd:element name="middleNames" type="xsd:string" minOccurs="0"/>
<xsd:element name="firstname" type="xsd:string" minOccurs="0"/>
<xsd:element name="secondsurname" type="xsd:string" minOccurs="0"/>
<xsd:element name="secondsurnamePrefix" type="xsd:string" minOccurs="0"/>
<xsd:element name="secondsurnameSuffix" type="xsd:string" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AuthenticationInfo">
<xsd:sequence>
<xsd:element name="authenticationType" minOccurs="0" type="xsd:string"/>
<xsd:element name="authenticationNumber" minOccurs="0" type="xsd:string"/>
<xsd:element name="authenticationType" type="xsd:string" minOccurs="0"/>
<xsd:element name="authenticationNumber" type="xsd:string" minOccurs="0"/>
<xsd:element name="issuingCountry" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
......@@ -523,29 +539,36 @@
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="issuingOrganization" minOccurs="0" type="xsd:string"/>
<xsd:element name="nationality" minOccurs="0" type="xsd:string"/>
<xsd:element name="issuingOrganization" type="xsd:string" minOccurs="0"/>
<xsd:element name="nationality" type="xsd:string" minOccurs="0"/>
<xsd:element name="authenticationDocument" minOccurs="0">
<xsd:complexType>
<xsd:sequence minOccurs="0" maxOccurs="unbounded">
<xsd:element name="File" type="File"/>