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

Merge branch 'cr/103120/119' into 'meeting/LI71'

TS 103 120 CR 119 - Selective IRI Delivery Policies

See merge request !288
parents d61d3068 1bf25610
Loading
Loading
Loading
Loading
Loading
+33 −0
Original line number Diff line number Diff line
@@ -870,4 +870,37 @@
            </DictionaryEntry>
        </DictionaryEntries>
    </Dictionary>
    <Dictionary>
        <!--NFType: see Clause 7.8.2.2.2 Table 7.30 -->
        <Owner>ETSI</Owner>
        <Name>NFType</Name>
        <DictionaryEntries/>
        <!--No definition so far -->
    </Dictionary>
    <Dictionary>
        <!--IRIEvents: see Clause 7.8.2.3.3 Table 7.32 -->
        <Owner>ETSI</Owner>
        <Name>IRIEvents</Name>
        <DictionaryEntries>
            <DictionaryEntry>
                <Value>All</Value>
                <Meaning>All IRI Events</Meaning>
            </DictionaryEntry>
        </DictionaryEntries>
    </Dictionary>
    <Dictionary>
        <!--IRIAction: see Clause 7.8.3 Table 7.34-->
        <Owner>ETSI</Owner>
        <Name>IRIAction</Name>
        <DictionaryEntries>
            <DictionaryEntry>
                <Value>NotDelivered</Value>
                <Meaning>IRI that matches this policy is not delivered</Meaning>
            </DictionaryEntry>
            <DictionaryEntry>
                <Value>Delivered</Value>
                <Meaning>IRI that matches the policy is delivered</Meaning>
            </DictionaryEntry>
        </DictionaryEntries>
    </Dictionary>
</Dictionaries>
+79 −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="http://uri.etsi.org/03120/common/2022/07/IRIPolicy" targetNamespace="http://uri.etsi.org/03120/common/2022/07/IRIPolicy" elementFormDefault="qualified" attributeFormDefault="unqualified">
    <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="IRIPolicyObject">
        <xs:complexContent>
            <xs:extension base="core:HI1Object">
                <xs:sequence>
                    <xs:group ref="IRIPolicyObjectGroup"/>
                </xs:sequence>
            </xs:extension>
        </xs:complexContent>
    </xs:complexType>
    <xs:group name="IRIPolicyObjectGroup">
        <xs:sequence>
            <xs:element name="IRIPolicyName" type="etsi:ShortString" minOccurs="0"/>
            <xs:element name="IRIRules" type="ListOfIRIRuleReferences" minOccurs="0"/>
        </xs:sequence>
    </xs:group>
    <xs:complexType name="ListOfIRIRuleReferences">
        <xs:sequence>
            <xs:element name="IRIRuleReference" type="IRIRuleReference" minOccurs="1" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="IRIRuleReference">
        <xs:sequence>
            <xs:element name="Order" type="xs:positiveInteger"/>
            <xs:element name="ObjectIdentifier" type="core:ObjectIdentifier"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="IRIRuleObject">
        <xs:complexContent>
            <xs:extension base="core:HI1Object">
                <xs:sequence>
                    <xs:group ref="IRIRuleObjectGroup"/>
                </xs:sequence>
            </xs:extension>
        </xs:complexContent>
    </xs:complexType>
    <xs:group name="IRIRuleObjectGroup">
        <xs:sequence>
            <xs:element name="Criteria" type="ListOfIRICriteria" minOccurs="0"/>
            <xs:element name="Action" type="common:DictionaryEntry" minOccurs="0"/>
            <xs:element name="Parameters" type="IRIActionParameters" minOccurs="0"/>
        </xs:sequence>
    </xs:group>
    <xs:complexType name="ListOfIRICriteria">
        <xs:sequence>
            <xs:element name="Criteria" type="IRICriteria" minOccurs="1" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="IRICriteria">
        <xs:choice>
            <xs:element name="NFTypeCriteria" type="NFTypeCriteria"/>
            <xs:element name="IRIEventCriteria" type="IRIEventCriteria"/>
            <xs:element name="HandoverFormatCriteria" type="HandoverFormatCriteria"/>
        </xs:choice>
    </xs:complexType>
    <xs:complexType name="NFTypeCriteria">
        <xs:sequence>
            <xs:element name="NFType" type="common:DictionaryEntry" minOccurs="1" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="IRIEventCriteria">
        <xs:sequence>
            <xs:element name="IRIEvents" type="common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="HandoverFormatCriteria">
        <xs:sequence>
            <xs:element name="HandoverFormats" type="common:DictionaryEntry" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="IRIActionParameters">
        <xs:choice>
        </xs:choice>
    </xs:complexType>
</xs:schema>
+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@
                    <xs:element name="Flags" type="TaskFlags" minOccurs="0"/>
                    <xs:element name="NationalLITaskingParameters" type="NationalLITaskingParameters" minOccurs="0"/>
                    <xs:element name="ListOfTrafficPolicyReferences" type="ListOfTrafficPolicyReferences" minOccurs="0"/>
                    <xs:element name="ListOfIRIPolicyReferences" type="ListOfIRIPolicyReferences" minOccurs="0"/>
                </xs:sequence>
            </xs:extension>
        </xs:complexContent>
@@ -236,6 +237,17 @@
            <xs:element name="ObjectIdentifier" type="core:ObjectIdentifier" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="ListOfIRIPolicyReferences">
        <xs:sequence>
            <xs:element name="IRIPolicyReference" type="IRIPolicyReference" maxOccurs="unbounded" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="IRIPolicyReference">
        <xs:sequence>
            <xs:element name="Order" type="xs:positiveInteger" minOccurs="0"/>
            <xs:element name="ObjectIdentifier" type="core:ObjectIdentifier" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="ListOfLDDeadlines">
        <xs:sequence>
            <xs:element name="LDDeadline" type="LDDeadline" minOccurs="0" maxOccurs="unbounded"/>