Commit 184c4185 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/LI58e' into 'revert-76ba5525'

# Conflicts:
#   103221-1/TS_103_221_01.xsd
parents 79b2f1ec c93b5cd4
Pipeline #9422 passed with stage
in 29 seconds
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version26(26)}
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) version25(25)}
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version26(26)}
-- ======================================
-- Top level definitions for RDHI wrapper
......@@ -837,9 +837,11 @@ TelephonyServiceUsage ::= SEQUENCE
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
operatorSpecificCallDetails [11] UTF8String OPTIONAL,
-- CSP specific value which indicates the nature of a call
-- (e.g. "CallIndicator: GPR, CallActionCode: 2")
trunkGroupIDs [12] TrunkGroupIDs OPTIONAL,
interOperatorIDs [13] InterOperatorIDs OPTIONAL
}
NationalTelephonyServiceUsage ::= SEQUENCE
......@@ -1157,6 +1159,26 @@ TelephonyPartyRole ::= ENUMERATED
mmsRecipientTrn(17)
}
TrunkGroupIDs ::= SEQUENCE
{
incomingTrunkGroupID [1] UTF8String OPTIONAL,
-- identifies the incoming PSTN leg. Format as defined by the CSP.
outgoingTrunkGroupID [2] UTF8String OPTIONAL,
-- identifies the outgoing PSTN leg. Format as defined by the CSP.
...
}
InterOperatorIDs ::= SEQUENCE
{
originatingInterOperatorID [1] UTF8String OPTIONAL,
-- orig-ioi formated as defined in IETF RFC 7315 [55].
terminatingInterOperatorID [2] UTF8String OPTIONAL,
-- term-ioi, formated as defined in IETF RFC 7315 [55].
transitInterOperatorIDList [3] UTF8String OPTIONAL,
-- transit-ioi-list, formated as defined in IETF RFC 7315 [55].
...
}
-- =======================
-- Device Data definitions
-- =======================
......@@ -1678,7 +1700,9 @@ MsgTransmission ::= SEQUENCE
...,
messageID [10] MessageID OPTIONAL,
sourceServerName [11] UTF8String OPTIONAL,
destinationServerName [12] UTF8String OPTIONAL
destinationServerName [12] UTF8String OPTIONAL,
clientPort [13] PortNumber OPTIONAL,
serverPort [14] PortNumber OPTIONAL
}
MsgStoreOperation ::= SEQUENCE
......@@ -1700,7 +1724,11 @@ MsgStoreOperation ::= SEQUENCE
addMsg(5),
-- E.g. the APPEND command in IMAP
...,
editMsg(6)
editMsg(6),
sendMsg(7),
-- Only applicable to webmail solutions
forwardMsg(8)
-- Only applicable to webmail solutions
} OPTIONAL,
senderAddress [5] MsgAddress OPTIONAL,
-- For Internet email, use the From address in the mail headers
......@@ -1716,7 +1744,9 @@ MsgStoreOperation ::= SEQUENCE
clientID [8] IPAddress OPTIONAL,
serverID [9] IPAddress OPTIONAL,
...,
messageID [10] MessageID OPTIONAL
messageID [10] MessageID OPTIONAL,
clientPort [11] PortNumber OPTIONAL,
serverPort [12] PortNumber OPTIONAL
}
MessageID ::= UTF8String
......@@ -1928,8 +1958,10 @@ MultimediaServiceUsage ::= SEQUENCE
relayIP [20] IPAddress OPTIONAL,
vmLength [21] INTEGER OPTIONAL, -- number of seconds
reason [22] UTF8String OPTIONAL,
smsInformation [23] SmsInformation OPTIONAL,
mmsInformation [24] MmsInformation OPTIONAL
smsInformation [23] SmsInformation OPTIONAL,
mmsInformation [24] MmsInformation OPTIONAL,
trunkGroupIDs [25] TrunkGroupIDs OPTIONAL,
interOperatorIDs [26] InterOperatorIDs OPTIONAL
}
MultimediaPartyInformation ::= SEQUENCE
......@@ -2403,9 +2435,13 @@ WifiInformation ::= SEQUENCE
accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL,
-- Informal description of location, category or type of access point,
-- or a name of the network to which the access point belongs.
accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL
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
cSPDefinedName [10] UTF8String OPTIONAL
-- CSP-defined label or name assigned to the access point.
-- The access points of a CSP within a venue or geographical location
-- typically share this name.
}
AuthenticationType ::= ENUMERATED
......@@ -2787,6 +2823,17 @@ IPAddress ::= CHOICE
...
}
PortNumber ::= CHOICE
{
tCPPort [0] TCPPort,
uDPPort [1] UDPPort,
...
}
TCPPort ::= INTEGER (1..65535)
UDPPort ::= INTEGER (0..65535)
NAAssignedAddress ::= SEQUENCE
{
addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL,
......
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.27.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.27.1#/RetainedData" elementFormDefault="qualified">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.28.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.28.1#/RetainedData" elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.28.1
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType name="GeneralizedTime">
......@@ -223,6 +223,21 @@
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
<xsd:complexType name="TrunkGroupIDs">
<xsd:sequence>
<xsd:element name="incomingTrunkGroupID" type="xsd:string" minOccurs="0"/>
<xsd:element name="outgoingTrunkGroupID" type="xsd:string" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="InterOperatorIDs">
<xsd:sequence>
<xsd:element name="originatingInterOperatorID" type="xsd:string" minOccurs="0"/>
<xsd:element name="terminatingInterOperatorID" type="xsd:string" minOccurs="0"/>
<xsd:element name="transitInterOperatorIDList" type="xsd:string" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:simpleType name="TelephonyDeviceID">
<xsd:restriction base="xsd:hexBinary"/>
</xsd:simpleType>
......@@ -349,6 +364,24 @@
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
<xsd:complexType name="PortNumber">
<xsd:choice>
<xsd:element name="TCPPort" type="TCPPort"/>
<xsd:element name="UDPPort" type="UDPPort"/>
</xsd:choice>
</xsd:complexType>
<xsd:simpleType name="TCPPort">
<xsd:restriction base="xsd:integer">
<xsd:minExclusive value="1"/>
<xsd:maxInclusive value="65535"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="UDPPort">
<xsd:restriction base="xsd:integer">
<xsd:minInclusive value="0"/>
<xsd:maxInclusive value="65535"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="IPRange">
<xsd:sequence>
<xsd:element name="prefix" type="IPAddress"/>
......@@ -1089,6 +1122,8 @@
<xsd:element name="mmsInformation" type="MmsInformation" minOccurs="0"/>
<xsd:element name="nationalTelephonyServiceUsage" type="NationalTelephonyServiceUsage" minOccurs="0"/>
<xsd:element name="operatorSpecificCallDetails" type="xsd:string" minOccurs="0"/>
<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -1755,6 +1790,8 @@
<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
<xsd:element name="sourceServerName" type="xsd:string" minOccurs="0"/>
<xsd:element name="destinationServerName" type="xsd:string" minOccurs="0"/>
<xsd:element name="clientPort" type="PortNumber" minOccurs="0"/>
<xsd:element name="serverPort" type="PortNumber" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -1773,6 +1810,8 @@
<xsd:element name="deleteMsg" type="NULL"/>
<xsd:element name="addMsg" type="NULL"/>
<xsd:element name="editMsg" type="NULL"/>
<xsd:element name="sendMsg" type="NULL"/>
<xsd:element name="forwardMsg" type="NULL"/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
......@@ -1796,6 +1835,8 @@
<xsd:element name="clientID" type="IPAddress" minOccurs="0"/>
<xsd:element name="serverID" type="IPAddress" minOccurs="0"/>
<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
<xsd:element name="clientPort" type="PortNumber" minOccurs="0"/>
<xsd:element name="serverPort" type="PortNumber" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -2157,6 +2198,7 @@
<xsd:element name="accessPointIPAddress" type="IPAddress" minOccurs="0"/>
<xsd:element name="accessPointAdditionalDescriptions" type="xsd:string" minOccurs="0"/>
<xsd:element name="accessPointAdditionalProviders" type="xsd:string" minOccurs="0"/>
<xsd:element name="cSPDefinedName" type="xsd:string" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -2868,6 +2910,8 @@
<xsd:element name="reason" type="xsd:string" minOccurs="0"/>
<xsd:element name="smsInformation" type="SmsInformation" minOccurs="0"/>
<xsd:element name="mmsInformation" type="MmsInformation" minOccurs="0"/>
<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......
......@@ -53,7 +53,7 @@
<task:FormatOwner>ETSI</task:FormatOwner>
<task:FormatName>InternationalE164</task:FormatName>
</task:FormatType>
<task:Value>+447700900000</task:Value>
<task:Value>442079460223</task:Value>
</task:TargetIdentifierValue>
</task:TargetIdentifierValues>
</task:TargetIdentifier>
......
......@@ -39,7 +39,16 @@
</doc:DocumentType>
<doc:DocumentSignature>
<common:ApproverDetails>
<common:ApproverName>Approver</common:ApproverName>
<common:ApproverName>John Doe</common:ApproverName>
<common:ApproverContactDetails>
<common:ApproverEmailAddress>john.doe@example.com</common:ApproverEmailAddress>
<common:ApproverPhoneNumber>442079460223</common:ApproverPhoneNumber>
</common:ApproverContactDetails>
<common:ApproverContactDetails>
<common:ApproverAlternateName>Jane Doe</common:ApproverAlternateName>
<common:ApproverEmailAddress>jane.doe@example.com</common:ApproverEmailAddress>
<common:ApproverPhoneNumber>442079461110</common:ApproverPhoneNumber>
</common:ApproverContactDetails>
</common:ApproverDetails>
<common:ApprovalTimestamp>2015-09-01T12:00:00Z</common:ApprovalTimestamp>
</doc:DocumentSignature>
......
......@@ -55,7 +55,7 @@
<task:FormatOwner>ETSI</task:FormatOwner>
<task:FormatName>InternationalE164</task:FormatName>
</task:FormatType>
<task:Value>+31701234567</task:Value>
<task:Value>442079460223</task:Value>
</task:RequestValue>
</task:RequestValues>
</task:RequestDetails>
......
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
<Header>
<SenderIdentifier>
<CountryCode>XX</CountryCode>
<UniqueIdentifier>ACTOR01</UniqueIdentifier>
</SenderIdentifier>
<ReceiverIdentifier>
<CountryCode>XX</CountryCode>
<UniqueIdentifier>ACTOR02</UniqueIdentifier>
</ReceiverIdentifier>
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2f</TransactionIdentifier>
<Timestamp>2021-10-11T13:37:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
</Header>
<Payload>
<RequestPayload>
<ActionRequests>
<ActionRequest>
<ActionIdentifier>0</ActionIdentifier>
<CREATE>
<HI1Object xsi:type="auth:AuthorisationObject">
<ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a1764604f</ObjectIdentifier>
<CountryCode>XX</CountryCode>
<OwnerIdentifier>ACTOR01</OwnerIdentifier>
<auth:AuthorisationReference>W000001</auth:AuthorisationReference>
<auth:AuthorisationTimespan>
<auth:StartTime>2021-10-11T12:00:00Z</auth:StartTime>
<auth:EndTime>2021-12-01T12:00:00Z</auth:EndTime>
</auth:AuthorisationTimespan>
</HI1Object>
</CREATE>
</ActionRequest>
<ActionRequest>
<ActionIdentifier>1</ActionIdentifier>
<CREATE>
<HI1Object xsi:type="task:LDTaskObject">
<ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd3f</ObjectIdentifier>
<CountryCode>XX</CountryCode>
<OwnerIdentifier>ACTOR01</OwnerIdentifier>
<AssociatedObjects>
<AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a1764604f</AssociatedObject>
</AssociatedObjects>
<task:Reference>XX-ACTOR01-1234</task:Reference>
<task:RequestDetails>
<task:ObservedTimes>2021-10-03T12:32:12Z</task:ObservedTimes>
<task:ObservedTimes>2021-10-03T12:35:34Z</task:ObservedTimes>
<task:ObservedTimes>2021-10-03T13:37:00Z</task:ObservedTimes>
<task:RequestValues>
<task:RequestValue>
<task:FormatType>
<task:FormatOwner>ETSI</task:FormatOwner>
<task:FormatName>IPv4Address</task:FormatName>
</task:FormatType>
<task:Value>192.0.2.23</task:Value>
</task:RequestValue>
</task:RequestValues>
</task:RequestDetails>
<task:DeliveryDetails>
<task:LDDeliveryDestination>
<task:DeliveryAddress>
<task:IPv4Address>192.0.2.0</task:IPv4Address>
</task:DeliveryAddress>
</task:LDDeliveryDestination>
</task:DeliveryDetails>
<task:CSPID>
<CountryCode>XX</CountryCode>
<UniqueIdentifier>ACTOR02</UniqueIdentifier>
</task:CSPID>
</HI1Object>
</CREATE>
</ActionRequest>
</ActionRequests>
</RequestPayload>
</Payload>
</HI1Message>
......@@ -71,7 +71,7 @@
<task:FormatOwner>ETSI</task:FormatOwner>
<task:FormatName>InternationalE164</task:FormatName>
</task:FormatType>
<task:Value>+447700900000</task:Value>
<task:Value>442079460223</task:Value>
</task:TargetIdentifierValue>
</task:TargetIdentifierValues>
</task:TargetIdentifier>
......@@ -94,11 +94,11 @@
<task:InvalidReason>
<ErrorCode>3000</ErrorCode>
<ErrorDescription>The associated Authorisation is in an Invalid state</ErrorDescription>
</task:InvalidReason>
</task:InvalidReason>
</HI1Object>
</GETResponse>
</ActionResponse>
</ActionResponses>
</ResponsePayload>
</ResponsePayload>
</Payload>
</HI1Message>
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core"
xmlns:xs="xmlns:xs=http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task"
xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery"
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core"
xmlns:xs="xmlns:xs=http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task"
xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery"
xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">
<Header>
<SenderIdentifier>
......
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
<Header>
<SenderIdentifier>
<CountryCode>XX</CountryCode>
<UniqueIdentifier>ACTOR01</UniqueIdentifier>
</SenderIdentifier>
<ReceiverIdentifier>
<CountryCode>XX</CountryCode>
<UniqueIdentifier>ACTOR02</UniqueIdentifier>
</ReceiverIdentifier>
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2f</TransactionIdentifier>
<Timestamp>2021-10-11T13:37:01.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
</Header>
<Payload>
<ResponsePayload>
<ActionResponses>
<ActionResponse>
<ActionIdentifier>0</ActionIdentifier>
<CREATEResponse>
<Identifier>7dbbc880-8750-4d3c-abe7-ea4a1764604f</Identifier>
</CREATEResponse>
</ActionResponse>
<ActionResponse>
<ActionIdentifier>1</ActionIdentifier>
<CREATEResponse>
<Identifier>2b36a78b-b628-416d-bd22-404e68a0cd3f</Identifier>
</CREATEResponse>
</ActionResponse>
</ActionResponses>
</ResponsePayload>
</Payload>
</HI1Message>
......@@ -37,6 +37,7 @@
<xs:element name="ApproverName" type="etsi:LongString" minOccurs="0"></xs:element>
<xs:element name="ApproverRole" type="etsi:LongString" minOccurs="0"></xs:element>
<xs:element name="ApproverIdentity" type="ApproverIdentity" minOccurs="0"></xs:element>
<xs:element name="ApproverContactDetails" type="ApproverContactDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ApproverIdentity">
......@@ -44,6 +45,14 @@
<xs:element name="NationalApproverIdentity" type="NationalApproverIdentity"></xs:element>
</xs:choice>
</xs:complexType>
<xs:complexType name="ApproverContactDetails">
<xs:sequence>
<xs:element name="ApproverAlternateName" type="etsi:LongString" minOccurs="0"></xs:element>
<xs:element name="ApproverEmailAddress" type="etsi:InternationalizedEmailAddress" minOccurs="0"></xs:element>
<xs:element name="ApproverPhoneNumber" type="etsi:InternationalE164" minOccurs="0"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="NationalApproverIdentity" abstract="true">
<xs:sequence>
<xs:element name="CountryCode" type="etsi:ISOCountryCode"></xs:element>
......
......@@ -2,7 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
xmlns:digsig="http://www.w3.org/2000/09/xmldsig#"
xmlns:digsig="http://www.w3.org/2000/09/xmldsig#"
xmlns="http://uri.etsi.org/03120/common/2019/10/Core"
targetNamespace="http://uri.etsi.org/03120/common/2019/10/Core"
elementFormDefault="qualified"
......
......@@ -138,6 +138,7 @@
<xs:element name="StartTime" type="etsi:QualifiedDateTime" minOccurs="0"/>
<xs:element name="EndTime" type="etsi:QualifiedDateTime" minOccurs="0"/>
<xs:element name="ObservedTime" type="etsi:QualifiedDateTime" minOccurs="0"/>
<xs:element name="ObservedTimes" type="etsi:QualifiedDateTime" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="RequestValues" type="RequestValues" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.8.1">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://uri.etsi.org/03221/X1/2017/10"
xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"
xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID"
targetNamespace="http://uri.etsi.org/03221/X1/2017/10"
elementFormDefault="qualified"
version="1.8.1">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
<!-- Message containers -->
<xs:element name="X1Request" type="RequestContainer"/>
<xs:element name="X1Response" type="ResponseContainer"/>
......@@ -101,6 +109,11 @@
<xs:enumeration value="ReportNEIssue"/>
<xs:enumeration value="Ping"/>
<xs:enumeration value="Keepalive"/>
<xs:enumeration value="CreateObject"/>
<xs:enumeration value="ModifyObject"/>
<xs:enumeration value="GetObject"/>
<xs:enumeration value="DeleteObject"/>
<xs:enumeration value="ListObjectsOfType"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="ErrorInformation">
......@@ -175,6 +188,7 @@
<xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"/>
<xs:element name="gpsiNai" type="etsi103280:GPSINAI"/>
<xs:element name="eui64" type="etsi103280:EUI64"/>
<xs:element name="hashedIdentifier" type="hashedID:HashedIdentifier"/>
<xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>
</xs:choice>
</xs:complexType>
......@@ -629,6 +643,7 @@
<xs:element name="neStatusDetails" type="NeStatusDetails"/>
<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"/>
<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"/>
<xs:element name="listOfGenericObjectResponseDetails" type="ListOfGenericObjectResponseDetails" minOccurs="0"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......@@ -658,6 +673,7 @@
<xs:sequence>
<xs:element name="ListOfXIDs" type="ListOfXids"/>
<xs:element name="ListOfDIDs" type="ListOfDids"/>
<xs:element name="ListOfGenericObjectIDs" type="ListOfGenericObjectIDs" minOccurs="0"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......@@ -790,4 +806,144 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:schema>
\ No newline at end of file
<xs:simpleType name="GenericObjectID">
<xs:restriction base="etsi103280:UUID"></xs:restriction>
</xs:simpleType>
<xs:simpleType name="GenericObjectType">
<xs:restriction base="xs:string">
<xs:pattern value="Q{[^{}]*}.+"></xs:pattern>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="GenericObject" abstract="true">
<xs:sequence>
<xs:element name="objectId" type="GenericObjectID"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="CreateObjectRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="createObject" type="GenericObject"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="CreateObjectResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
<xs:sequence>
<xs:element name="oK" type="OK"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ModifyObjectRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="modifyObject" type="GenericObject"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ModifyObjectResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
<xs:sequence>
<xs:element name="oK" type="OK"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="GetObjectRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="objectId" type="GenericObjectID"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="GetObjectResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
<xs:sequence>
<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="GenericObjectResponseDetails">
<xs:sequence>
<xs:element name="object" type="GenericObject"/>
<xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ListOfGenericObjectResponseDetails">
<xs:sequence>