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

Merge branch 'cr/103120/067' into 'meeting/LI66' 

TS 103 120 CR067 - CONFIG verb

See merge request !152
parents 9df72603 846195b6

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+50 −0
Original line number Original line Diff line number Diff line
@@ -723,6 +723,56 @@ 
            </DictionaryEntry>

            </DictionaryEntry>

        </DictionaryEntries>

        </DictionaryEntries>

    </Dictionary>

    </Dictionary>

    <Dictionary>

        <!--LIWorkflowEndpoint: see Clause 6.4.11.2 Table 6.X6 -->

        <Owner>ETSI</Owner>

        <Name>LIWorkflowEndpoint</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>NewAuthorisation</Value>

                <Meaning>Implementer supports the "New Authorisation" Endpoint.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>AuthorisationExtension</Value>

                <Meaning>Implementer supports the "Authorisation Extension" Endpoint.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>AuthorisationCancellation</Value>

                <Meaning>Implementer supports the "Authorisation Cancellation" Endpoint.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>TaskAddition</Value>

                <Meaning>Implementer supports the "Task Addition" Endpoint.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>TaskCancellation</Value>

                <Meaning>Implementer supports the "Task Cancellation" Endpoint.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>ChangeOfDelivery</Value>

                <Meaning>Implementer supports the "Change of Delivery" Endpoint.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>    

    <Dictionary>

        <!--LPWorkflowEndpoint: see Clause 6.4.11.3 Table 6.X8 -->

        <Owner>ETSI</Owner>

        <Name>LPWorkflowEndpoint</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>NewPreservation</Value>

                <Meaning>Implementer supports the "New Preservation" Endpoint.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>PreservationExtension</Value>

                <Meaning>Implementer supports the "Preservation Extension" Endpoint.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>PreservationCancellation</Value>

                <Meaning>Implementer supports the "Preservation Cancellation" Endpoint.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

    <Dictionary>

        <!--ManifestSpecification: see Clause 10.2.2 Table 10.3 -->

        <!--ManifestSpecification: see Clause 10.2.2 Table 10.3 -->

        <Owner>ETSI</Owner>

        <Owner>ETSI</Owner>

103120/examples/xml/request_config.xml

0 → 100644
+30 −0
Original line number Original line 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">

    <Header>

        <SenderIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR01</UniqueIdentifier>

        </SenderIdentifier>

        <ReceiverIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR02</UniqueIdentifier>

        </ReceiverIdentifier>

        <TransactionIdentifier>eb6b002d-15c3-4c3b-af6c-27ede73641e5</TransactionIdentifier>

        <Timestamp>2024-06-10T08:50:31.000000Z</Timestamp>

        <Version>

            <ETSIVersion>V1.16.1</ETSIVersion>

            <NationalProfileOwner>XX</NationalProfileOwner>

            <NationalProfileVersion>v1.0</NationalProfileVersion>

        </Version>

    </Header>

    <Payload>

        <RequestPayload>

            <ActionRequests>

                <ActionRequest>

                    <ActionIdentifier>0</ActionIdentifier>

                    <GETCSPCONFIG/>

                </ActionRequest>

            </ActionRequests>

        </RequestPayload>

    </Payload>

</HI1Message>
 
 No newline at end of file

103120/examples/xml/response_config.xml

0 → 100644
+106 −0
Original line number Original line 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:config="http://uri.etsi.org/03120/common/2024/06/Config" xmlns:dictionaries="http://uri.etsi.org/03280/common/2019/10/Dictionaries">

    <Header>

        <SenderIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR01</UniqueIdentifier>

        </SenderIdentifier>

        <ReceiverIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR02</UniqueIdentifier>

        </ReceiverIdentifier>

        <TransactionIdentifier>eb6b002d-15c3-4c3b-af6c-27ede73641e5</TransactionIdentifier>

        <Timestamp>2024-06-10T08:50:31.000000Z</Timestamp>

        <Version>

            <ETSIVersion>V1.16.1</ETSIVersion>

            <NationalProfileOwner>XX</NationalProfileOwner>

            <NationalProfileVersion>v1.0</NationalProfileVersion>

        </Version>

    </Header>

    <Payload>

        <ResponsePayload>

            <ActionResponses>

                <ActionResponse>

                    <ActionIdentifier>0</ActionIdentifier>

                    <GETCSPCONFIGResponse>

                        <LastChanged>2024-05-10T08:52:32Z</LastChanged>

                        <Dictionaries>

                            <dictionaries:Dictionary>

                                <dictionaries:Owner>ACTOR2</dictionaries:Owner>

                                <dictionaries:Name>LIServiceTypes</dictionaries:Name>

                                <dictionaries:DictionaryEntries>

                                    <dictionaries:DictionaryEntry>

                                        <dictionaries:Value>ServiceA</dictionaries:Value>

                                        <dictionaries:Meaning>This is a dictionary entry</dictionaries:Meaning>

                                    </dictionaries:DictionaryEntry>

                                    <dictionaries:DictionaryEntry>

                                        <dictionaries:Value>ServiceB</dictionaries:Value>

                                        <dictionaries:Meaning>This is a dictionary entry</dictionaries:Meaning>

                                    </dictionaries:DictionaryEntry>

                                </dictionaries:DictionaryEntries>

                            </dictionaries:Dictionary>

                        </Dictionaries>

                        <TargetFormatTypeDefinitions>

                            <config:FormatOwner>ACTOR02</config:FormatOwner>

                            <config:TargetFormatTypeDefinitionEntries>

                                <config:TargetFormatTypeDefinitionEntry>

                                    <config:FormatName>ProprietaryIdentifier</config:FormatName>

                                    <config:Description>This is an illustration of a proprietary identifier type specific to this CSP, which consists of the string "CSP" followed by 10 digits</config:Description>

                                    <config:FormatRegex>^CSP[0-9]{10}$</config:FormatRegex>

                                </config:TargetFormatTypeDefinitionEntry>

                            </config:TargetFormatTypeDefinitionEntries>

                        </TargetFormatTypeDefinitions>

                        <TargetingConfigurations>

                            <config:TargetingConfiguration>

                                <config:FormatName>InternationalE164</config:FormatName>

                                <config:FormatOwner>ETSI</config:FormatOwner>

                                <config:Guidance>This configuration entry tells the LEA that they can use the ETSI standard format E164 number for LI of service A</config:Guidance>

                                <config:AssociatedLIServiceTypes>

                                    <common:DictionaryEntry>

                                        <common:Owner>ACTOR02</common:Owner>

                                        <common:Name>LIServiceTypes</common:Name>

                                        <common:Value>ServiceA</common:Value>

                                    </common:DictionaryEntry>

                                </config:AssociatedLIServiceTypes>

                                <config:AssociatedLDRequestSubtypes/> <!-- In this example, no LD types are supported -->

                                <config:AssociatedLPRequestSubtypes/> <!-- In this example, no LP types are supported -->

                            </config:TargetingConfiguration>

                            <config:TargetingConfiguration>

                                <config:FormatName>PropietaryIdentifier</config:FormatName>

                                <config:FormatOwner>ACTOR02</config:FormatOwner>

                                <config:Guidance>This configuration entry tells the LEA that they can use the propietary identifier format type described in the TargetFormatTypeDefinitions for LI of both Service A and Service B</config:Guidance>

                                <config:AssociatedLIServiceTypes>

                                    <common:DictionaryEntry>

                                        <common:Owner>ACTOR02</common:Owner>

                                        <common:Name>LIServiceTypes</common:Name>

                                        <common:Value>ServiceA</common:Value>

                                    </common:DictionaryEntry>

                                    <common:DictionaryEntry>

                                        <common:Owner>ACTOR02</common:Owner>

                                        <common:Name>LIServiceTypes</common:Name>

                                        <common:Value>ServiceB</common:Value>

                                    </common:DictionaryEntry>

                                </config:AssociatedLIServiceTypes>

                                <config:AssociatedLDRequestSubtypes/> <!-- In this example, no LD types are supported -->

                                <config:AssociatedLPRequestSubtypes/> <!-- In this example, no LP types are supported -->

                            </config:TargetingConfiguration>

                        </TargetingConfigurations>

                        <SupportedLIWorkflowEndpoints>

                            <config:SupportedLIWorkflowEndpoint>

                                <config:LIWorkflowEndpoint>

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

                                    <common:Name>LIWorkflowEndpoint</common:Name>

                                    <common:Value>NewAuthorisation</common:Value>

                                </config:LIWorkflowEndpoint>

                                <config:Guidance>This tells the LEA what endpoint to use for new warrants. For brevity, in this example, this is the only endpoint specified.</config:Guidance>

                                <config:URL>https://ts103120.example.com/li/authorisation/new</config:URL>

                            </config:SupportedLIWorkflowEndpoint>

                        </SupportedLIWorkflowEndpoints>

                        <SupportedLPWorkflowEndpoints>

                        </SupportedLPWorkflowEndpoints>

                    </GETCSPCONFIGResponse>

                </ActionResponse>

            </ActionResponses>

        </ResponsePayload>

    </Payload>

</HI1Message>
 
 No newline at end of file

103120/schema/xsd/ts_103120_Common.xsd

+5 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,11 @@ 
            <xs:pattern value="V\d+\.\d+\.\d+"/>

            <xs:pattern value="V\d+\.\d+\.\d+"/>

        </xs:restriction>

        </xs:restriction>

    </xs:simpleType>

    </xs:simpleType>

    <xs:complexType name="DictionaryEntries">

        <xs:sequence>

            <xs:element name="DictionaryEntry" type="DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="DictionaryEntry">

    <xs:complexType name="DictionaryEntry">

        <xs:sequence>

        <xs:sequence>

            <xs:element name="Owner" type="etsi:ShortString"/>

            <xs:element name="Owner" type="etsi:ShortString"/>

103120/schema/xsd/ts_103120_Config.xsd

0 → 100644
+62 −0
Original line number Original line 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="http://uri.etsi.org/03120/common/2024/06/Config" targetNamespace="http://uri.etsi.org/03120/common/2024/06/Config" elementFormDefault="qualified" attributeFormDefault="unqualified">

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

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

    <xs:complexType name="TargetFormatTypeDefinitions">

        <xs:sequence>

            <xs:element name="FormatOwner" type="etsi:ShortString"/>

            <xs:element name="TargetFormatTypeDefinitionEntries" type="TargetFormatTypeDefinitionEntries"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="TargetFormatTypeDefinitionEntries">

        <xs:sequence>

            <xs:element name="TargetFormatTypeDefinitionEntry" type="TargetFormatTypeDefinitionEntry" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="TargetFormatTypeDefinitionEntry">

        <xs:sequence>

            <xs:element name="FormatName" type="etsi:ShortString"/>

            <xs:element name="Description" type="etsi:LongString"/>

            <xs:element name="FormatRegex" type="etsi:LongString"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="TargetingConfigurations">

        <xs:sequence>

            <xs:element name="TargetingConfiguration" type="TargetingConfiguration" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="TargetingConfiguration">

        <xs:sequence>

            <xs:element name="FormatName" type="etsi:ShortString"/>

            <xs:element name="FormatOwner" type="etsi:ShortString"/>

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

            <xs:element name="AssociatedLIServiceTypes" type="common:DictionaryEntries" minOccurs="0"/>

            <xs:element name="AssociatedLDRequestSubtypes" type="common:DictionaryEntries" minOccurs="0"/>

            <xs:element name="AssociatedLPRequestSubtypes" type="common:DictionaryEntries" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="SupportedLIWorkflowEndpoints">

        <xs:sequence>

            <xs:element name="SupportedLIWorkflowEndpoint" type="SupportedLIWorkflowEndpoint" minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence> 

    </xs:complexType>

    <xs:complexType name="SupportedLIWorkflowEndpoint">

        <xs:sequence>

            <xs:element name="LIWorkflowEndpoint" type="common:DictionaryEntry"/>

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

            <xs:element name="URL" type="etsi:LongString"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="SupportedLPWorkflowEndpoints">

        <xs:sequence>

            <xs:element name="SupportedLPWorkflowEndpoint" type="SupportedLPWorkflowEndpoint" minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="SupportedLPWorkflowEndpoint">

        <xs:sequence>

            <xs:element name="LIWorkflowEndpoint" type="common:DictionaryEntry"/>

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

            <xs:element name="URL" type="etsi:LongString"/>

        </xs:sequence>

    </xs:complexType>

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