Commit 56060cc9 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'draft/eevidence_crx16' into 'draft/eevidence'

CRxx16 - GNE and per-Task ConditionsApplied

See merge request !362
parents 0c466691 a7ebdbf4
Loading
Loading
Loading
Loading
Loading
+80 −0
Changes for 104144/examples/ea_conditionsApplied_request.xml: 80 added lines, 0 removed lines.
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:gfr="http://uri.etsi.org/03120/common/2026/01/GroundsForRefusal">
    <Header>
        <SenderIdentifier>
            <CountryCode>IE</CountryCode>
            <UniqueIdentifier>enforcing-authority-1</UniqueIdentifier>
        </SenderIdentifier>
        <ReceiverIdentifier>
            <CountryCode>IE</CountryCode>
            <UniqueIdentifier>service-provider-1</UniqueIdentifier>
        </ReceiverIdentifier>
        <TransactionIdentifier>92e111ab-02e4-4dce-8c86-d4ea2e5e926e</TransactionIdentifier>
        <Timestamp>2025-06-06T11:21:32.000000+01:00</Timestamp>
        <Version>
            <ETSIVersion>V1.22.1</ETSIVersion>
            <NationalProfileOwner>EU</NationalProfileOwner>
            <NationalProfileVersion>v1.6.1</NationalProfileVersion>
        </Version>
    </Header>
    <Payload>
        <RequestPayload>
            <ActionRequests>
                <ActionRequest>
                    <ActionIdentifier>0</ActionIdentifier>
                    <CREATE>
                        <HI1Object xsi:type="gfr:EPOCConditionsApplied">
                            <ObjectIdentifier>dfe13b52-c574-40d9-8d24-c4b86ecc7f90</ObjectIdentifier>
                            <CountryCode>IE</CountryCode>
                            <OwnerIdentifier>enforcing-authority-1</OwnerIdentifier>
                            <AssociatedObjects>
                                <AssociatedObject>7e84603b-be7b-4cba-af26-8468d177f36a</AssociatedObject>
                                <AssociatedObject>f966e795-bc92-4bc4-9c6b-96c1b1b8cb1d</AssociatedObject>
                            </AssociatedObjects>
                            <gfr:Decision>
                                <gfr:ConditionsAppliedToCategory>
                                    <gfr:TrafficData>
                                        <gfr:Conditions>
                                            <gfr:ConditionsInformation>Information on the conditions applied</gfr:ConditionsInformation>
                                            <gfr:OtherInformation>Other information</gfr:OtherInformation>
                                        </gfr:Conditions>
                                        <gfr:ConditionsApplyToAll>false</gfr:ConditionsApplyToAll>
                                        <gfr:ConditionsApplyTo>
                                            <gfr:CategoryWithConditions>
                                                <common:Owner>ETSI</common:Owner>
                                                <common:Name>EPOCRequestSubtype</common:Name>
                                                <common:Value>RegistrationInformation</common:Value>
                                            </gfr:CategoryWithConditions>
                                        </gfr:ConditionsApplyTo>
                                    </gfr:TrafficData>
                                </gfr:ConditionsAppliedToCategory>
                            </gfr:Decision>
                            <gfr:OtherInformation>Other information (optional)</gfr:OtherInformation>
                        </HI1Object>
                    </CREATE>
                </ActionRequest>
                <ActionRequest>
                    <ActionIdentifier>1</ActionIdentifier>
                    <CREATE>
                        <HI1Object xsi:type="gfr:EPOCConditionsApplied">
                            <ObjectIdentifier>28fdf5da-5d81-4b15-9467-b1db4f4964f5</ObjectIdentifier>
                            <CountryCode>IE</CountryCode>
                            <OwnerIdentifier>enforcing-authority-1</OwnerIdentifier>
                            <AssociatedObjects>
                                <AssociatedObject>7e84603b-be7b-4cba-af26-8468d177f36a</AssociatedObject>
                                <AssociatedObject>0fc25b0b-8969-48ea-9a2d-dad176287001</AssociatedObject>
                            </AssociatedObjects>
                            <gfr:Decision>
                                <gfr:ConditionsAppliedToAll>
                                    <gfr:ConditionsInformation>Information on the conditions applied</gfr:ConditionsInformation>
                                    <gfr:OtherInformation>Other information</gfr:OtherInformation>
                                </gfr:ConditionsAppliedToAll>
                            </gfr:Decision>
                            <gfr:OtherInformation>Other information (optional)</gfr:OtherInformation>
                        </HI1Object>
                    </CREATE>
                </ActionRequest>
            </ActionRequests>
        </RequestPayload>
    </Payload>
</HI1Message>
 No newline at end of file
+45 −4
Changes for 104144/schema/xsd/ts_104144_GroundsForRefusal.xsd: 45 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
        <xs:complexContent>
            <xs:extension base="core:HI1Object">
                <xs:sequence>
                    <xs:element name="FullRefusalInformation" type="RefusalInformation" minOccurs="0"/>
                    <xs:element name="FullRefusalInformation" type="RefusalInformation"/>
                </xs:sequence>
            </xs:extension>
        </xs:complexContent>
@@ -16,7 +16,6 @@
        <xs:complexContent>
            <xs:extension base="core:HI1Object">
                <xs:sequence>
                    <xs:element name="SpecialConditionsApplied" type="xs:boolean" minOccurs="0"/>
                    <xs:element name="OtherInformation" type="etsi:LongString" minOccurs="0"/>
                </xs:sequence>
            </xs:extension>
@@ -26,7 +25,17 @@
        <xs:complexContent>
            <xs:extension base="core:HI1Object">
                <xs:sequence>
                    <xs:element name="Decision" type="IdentifierRefusalDecision" minOccurs="0"/>
                    <xs:element name="Decision" type="IdentifierRefusalDecision"/>
                    <xs:element name="OtherInformation" type="etsi:LongString" minOccurs="0"/>
                </xs:sequence>
            </xs:extension>
        </xs:complexContent>
    </xs:complexType>
    <xs:complexType name="EPOCConditionsApplied">
        <xs:complexContent>
            <xs:extension base="core:HI1Object">
                <xs:sequence>
                    <xs:element name="Decision" type="IdentifierConditionsDecision"/>
                    <xs:element name="OtherInformation" type="etsi:LongString" minOccurs="0"/>
                </xs:sequence>
            </xs:extension>
@@ -47,7 +56,7 @@
    </xs:complexType>
    <xs:complexType name="SpecificDataRefusal">
        <xs:sequence>
            <xs:element name="CoreRefusal" type="RefusalInformation" minOccurs="0"/>
            <xs:element name="CoreRefusal" type="RefusalInformation"/>
            <xs:element name="Data" type="etsi:LongString" minOccurs="0"/>
            <xs:element name="RefusedTime" type="common:Timespan" minOccurs="0"/>
        </xs:sequence>
@@ -72,4 +81,36 @@
            <xs:element name="RefusedCategory" type="common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="IdentifierConditionsDecision">
        <xs:choice>
            <xs:element name="ConditionsAppliedToAll" type="ConditionsApplied" minOccurs="0"/>
            <xs:element name="ConditionsAppliedToCategory" type="ConditionsAppliedToCategory" minOccurs="0"/>
        </xs:choice>
    </xs:complexType>
    <xs:complexType name="ConditionsAppliedToCategory">
        <xs:sequence>
            <xs:element name="SubscriberData" type="CategoryConditions" minOccurs="0"/>
            <xs:element name="UserIdentificationData" type="CategoryConditions" minOccurs="0"/>
            <xs:element name="TrafficData" type="CategoryConditions" minOccurs="0"/>
            <xs:element name="ContentData" type="CategoryConditions" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="CategoryConditions">
        <xs:sequence>
            <xs:element name="Conditions" type="ConditionsApplied" minOccurs="0"/>
            <xs:element name="ConditionsApplyToAll" type="xs:boolean" minOccurs="0"/>
            <xs:element name="ConditionsApplyTo" type="ListOfCategoriesWithConditions" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="ListOfCategoriesWithConditions">
        <xs:sequence>
            <xs:element name="CategoryWithConditions" type="common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="ConditionsApplied">
        <xs:sequence>
            <xs:element name="ConditionsInformation" type="etsi:LongString" minOccurs="0"/>
            <xs:element name="OtherInformation" type="etsi:LongString" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
</xs:schema>
 No newline at end of file