Commit b2d1946e authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/103120/135' into 'meeting/LI73' 

TS 103 120 CR135 - Delivery Destinations

See merge request !334
parents f9fd9690 f4c6b8b9

103120/examples/xml/request10_LDDestinationObject.xml

0 → 100644
+96 −0
Original line number Diff line number Diff line 
<?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" xmlns:dest="http://uri.etsi.org/03120/common/2026/07/Destination">

    <Header>

        <SenderIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR01</UniqueIdentifier>

        </SenderIdentifier>

        <ReceiverIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR02</UniqueIdentifier>

        </ReceiverIdentifier>

        <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>

        <Timestamp>2019-09-30T13:37:00.000000Z</Timestamp>

        <Version>

            <ETSIVersion>V1.13.1</ETSIVersion>

            <NationalProfileOwner>XX</NationalProfileOwner>

            <NationalProfileVersion>v1.0</NationalProfileVersion>

        </Version>

    </Header>

    <Payload>

        <RequestPayload>

            <ActionRequests>

                <ActionRequest>

                    <ActionIdentifier>0</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="dest:LDDestinationObject">

                            <ObjectIdentifier>2d1ac880-8750-4d3c-abe7-ea4a17646043</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <dest:DeliveryAddress>

                                <task:IPv4Address>192.0.2.0</task:IPv4Address>

                            </dest:DeliveryAddress>

                            <dest:FriendlyName>TestLDDestination</dest:FriendlyName>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>1</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="auth:AuthorisationObject">

                            <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <auth:AuthorisationReference>W000001</auth:AuthorisationReference>

                            <auth:AuthorisationTimespan>

                                <auth:StartTime>2019-09-30T12:00:00Z</auth:StartTime>

                                <auth:EndTime>2019-12-01T12:00:00Z</auth:EndTime>

                            </auth:AuthorisationTimespan>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="task:LDTaskObject">

                            <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <AssociatedObjects>

                                <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>

                            </AssociatedObjects>

                            <task:Reference>XX-ACTOR01-1234</task:Reference>

                            <task:RequestDetails>

                                <task:Type>

                                    <common:Owner>ETSI</common:Owner>

                                    <common:Name>RequestType</common:Name>

                                    <common:Value>SubscriberData</common:Value>

                                </task:Type>

                                <task:StartTime>2019-09-30T12:00:00Z</task:StartTime>

                                <task:EndTime>2019-12-30T12:00:00Z</task:EndTime>

                                <task:RequestValues>

                                    <task:RequestValue>

                                        <task:FormatType>

                                            <task:FormatOwner>ETSI</task:FormatOwner>

                                            <task:FormatName>InternationalE164</task:FormatName>

                                        </task:FormatType>

                                        <task:Value>442079460223</task:Value>

                                    </task:RequestValue>

                                </task:RequestValues>

                            </task:RequestDetails>

                            <task:DeliveryDetails>

                                <task:LDDeliveryDestination>

                                    <task:DestinationReference>2d1ac880-8750-4d3c-abe7-ea4a17646043</task:DestinationReference>

                                </task:LDDeliveryDestination>

                            </task:DeliveryDetails>

                            <task:CSPID>

                                <CountryCode>XX</CountryCode>

                                <UniqueIdentifier>ACTOR02</UniqueIdentifier>

                            </task:CSPID>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

            </ActionRequests>

        </RequestPayload>

    </Payload>

</HI1Message>

103120/examples/xml/request11_LIDestinationObject.xml

0 → 100644
+104 −0
Original line number Diff line number Diff line 
<?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" xmlns:dest="http://uri.etsi.org/03120/common/2026/07/Destination">

    <Header>

        <SenderIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR01</UniqueIdentifier>

        </SenderIdentifier>

        <ReceiverIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR02</UniqueIdentifier>

        </ReceiverIdentifier>

        <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>

        <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>

        <Version>

            <ETSIVersion>V1.13.1</ETSIVersion>

            <NationalProfileOwner>XX</NationalProfileOwner>

            <NationalProfileVersion>v1.0</NationalProfileVersion>

        </Version>

    </Header>

    <Payload>

        <RequestPayload>

            <ActionRequests>

                <ActionRequest>

                    <ActionIdentifier>0</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="dest:LIDestinationObject">

                            <ObjectIdentifier>2daac880-8750-4d3c-abe7-ea4a17646043</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <dest:DeliveryAddress>

                                <task:IPv4Address>192.0.2.0</task:IPv4Address>

                            </dest:DeliveryAddress>

                            <dest:FriendlyName>TestLIDestination</dest:FriendlyName>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>1</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="auth:AuthorisationObject">

                            <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <auth:AuthorisationReference>W000001</auth:AuthorisationReference>

                            <auth:AuthorisationTimespan>

                                <auth:StartTime>2015-09-01T12:00:00Z</auth:StartTime>

                                <auth:EndTime>2015-12-01T12:00:00Z</auth:EndTime>

                            </auth:AuthorisationTimespan>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="task:LITaskObject">

                            <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <AssociatedObjects>

                                <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>

                            </AssociatedObjects>

                            <task:Reference>LIID1</task:Reference>

                            <task:TargetIdentifier>

                                <task:TargetIdentifierValues>

                                    <task:TargetIdentifierValue>

                                        <task:FormatType>

                                            <task:FormatOwner>ETSI</task:FormatOwner>

                                            <task:FormatName>InternationalE164</task:FormatName>

                                        </task:FormatType>

                                        <task:Value>442079460223</task:Value>

                                    </task:TargetIdentifierValue>

                                </task:TargetIdentifierValues>

                                <task:ServiceType>

                                    <common:Owner>ETSI</common:Owner>

                                    <common:Name>TaskServiceType</common:Name>

                                    <common:Value>DataType1</common:Value>

                                </task:ServiceType>

                                <task:TargetIdentifierSubtype>

                                    <common:Owner>CSP01</common:Owner>

                                    <common:Name>TargetIdentifierSubtype</common:Name>

                                    <common:Value>AccountType1</common:Value>

                                </task:TargetIdentifierSubtype>

                            </task:TargetIdentifier>

                            <task:DeliveryType>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>TaskDeliveryType</common:Name>

                                <common:Value>IRIandCC</common:Value>

                            </task:DeliveryType>

                            <task:DeliveryDetails>

                                <task:DeliveryDestination>

                                    <task:DestinationReference>2daac880-8750-4d3c-abe7-ea4a17646043</task:DestinationReference>

                                </task:DeliveryDestination>

                            </task:DeliveryDetails>

                            <task:CSPID>

                                <CountryCode>XX</CountryCode>

                                <UniqueIdentifier>RECVER01</UniqueIdentifier>

                            </task:CSPID>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

            </ActionRequests>

        </RequestPayload>

    </Payload>

</HI1Message>
 
 No newline at end of file

103120/schema/xsd/ts_103120_Destination.xsd

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<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:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns="http://uri.etsi.org/03120/common/2026/07/Destination" targetNamespace="http://uri.etsi.org/03120/common/2026/07/Destination" elementFormDefault="qualified" attributeFormDefault="unqualified">

    <xs:import namespace="http://uri.etsi.org/03120/common/2020/09/Task"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>

    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

    <xs:complexType name="LIDestinationObject">

        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

                    <xs:element name="DeliveryAddress" type="task:DeliveryAddress" minOccurs="0"/>

                    <xs:element name="FriendlyName" type="etsi:LongString" minOccurs="0"/>

                    <xs:element name="NationalDestinationParameters" type="NationalDestinationParameters" minOccurs="0"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="LDDestinationObject">

        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

                    <xs:element name="DeliveryAddress" type="task:DeliveryAddress" minOccurs="0"/>

                    <xs:element name="FriendlyName" type="etsi:LongString" minOccurs="0"/>

                    <xs:element name="NationalDestinationParameters" type="NationalDestinationParameters" minOccurs="0"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="NationalDestinationParameters" abstract="true">

        <xs:sequence>

            <xs:element name="CountryCode" type="etsi:ISOCountryCode"/>

        </xs:sequence>

    </xs:complexType>

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

103120/schema/xsd/ts_103120_Task.xsd

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
    <xs:complexType name="DeliveryDestination">

        <xs:sequence>

            <xs:element name="DeliveryAddress" type="DeliveryAddress" minOccurs="0"/>

            <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="IRIorCC" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="HandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>
@@ -167,6 +169,7 @@ 
    <xs:complexType name="LDDeliveryDestination">

        <xs:sequence>

            <xs:element name="DeliveryAddress" type="DeliveryAddress" minOccurs="0"/>

            <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="LDHandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

testing/xml/ts_103120_xsd.json

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
    "103120/schema/xsd/ts_103120_Common.xsd",

    "103120/schema/xsd/ts_103120_Config.xsd",

    "103120/schema/xsd/ts_103120_Delivery.xsd",

    "103120/schema/xsd/ts_103120_Destination.xsd",

    "103120/dictionaries/ts_103120_Dictionaries.xsd",

    "103120/schema/xsd/ts_103120_Document.xsd",

    "103120/schema/xsd/ts_103120_Notification.xsd",