Commit 170f9427 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/103120/046' into 'meeting/LI63' 

TS 103 120 CR046 - Refactoring Traffic Policies

See merge request !82
parents 247def16 e7c45f53

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -346,6 +346,10 @@ 
                <Value>NotDelivered</Value>

                <Value>NotDelivered</Value>

                <Meaning>Traffic that matches this policy is not delivered</Meaning>

                <Meaning>Traffic that matches this policy is not delivered</Meaning>

            </DictionaryEntry>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Delivered</Value>

                <Meaning>Traffic that matches the policy is delivered</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

        </DictionaryEntries>

    </Dictionary>

    </Dictionary>

    <Dictionary>

    <Dictionary>

103120/schema/ts_103120_TrafficPolicy.xsd

+14 −4
Original line number Original line Diff line number Diff line
@@ -7,12 +7,17 @@ 
        <xs:complexContent>

        <xs:complexContent>

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

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

                <xs:sequence>

                <xs:sequence>

                    <xs:element name="TrafficPolicyName" type="etsi:ShortString" minOccurs="0"/>

                    <xs:group ref="TrafficPolicyObjectGroup"/>

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

                </xs:sequence>

                </xs:sequence>

            </xs:extension>

            </xs:extension>

        </xs:complexContent>

        </xs:complexContent>

    </xs:complexType>

    </xs:complexType>

    <xs:group name="TrafficPolicyObjectGroup">

        <xs:sequence>

            <xs:element name="TrafficPolicyName" type="etsi:ShortString" minOccurs="0"/>

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

        </xs:sequence>

    </xs:group>

    <xs:complexType name="ListOfTrafficRuleReferences">

    <xs:complexType name="ListOfTrafficRuleReferences">

        <xs:sequence>

        <xs:sequence>

            <xs:element name="TrafficRuleReference" type="TrafficRuleReference" minOccurs="1" maxOccurs="unbounded"/>

            <xs:element name="TrafficRuleReference" type="TrafficRuleReference" minOccurs="1" maxOccurs="unbounded"/>
@@ -28,12 +33,17 @@ 
        <xs:complexContent>

        <xs:complexContent>

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

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

                <xs:sequence>

                <xs:sequence>

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

                    <xs:group ref="TrafficRuleObjectGroup"/>

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

                </xs:sequence>

                </xs:sequence>

            </xs:extension>

            </xs:extension>

        </xs:complexContent>

        </xs:complexContent>

    </xs:complexType>

    </xs:complexType>

    <xs:group name="TrafficRuleObjectGroup">

        <xs:sequence>

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

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

        </xs:sequence>

    </xs:group>

    <xs:complexType name="ListOfTrafficCriteria">

    <xs:complexType name="ListOfTrafficCriteria">

        <xs:sequence>

        <xs:sequence>

            <xs:element name="Criteria" type="TrafficCriteria" minOccurs="1" maxOccurs="unbounded"/>

            <xs:element name="Criteria" type="TrafficCriteria" minOccurs="1" maxOccurs="unbounded"/>