From 4b941b95db833da5b1d90034ef4f5747fbe66bbc Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Mon, 17 Feb 2025 16:02:28 +0000
Subject: [PATCH 1/5] Update file ts_103120_TrafficPolicy.xsd

---
 103120/schema/xsd/ts_103120_TrafficPolicy.xsd | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index 75e6145e..7ebce460 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -16,6 +16,7 @@
         <xs:sequence>
             <xs:element name="TrafficPolicyName" type="etsi:ShortString" minOccurs="0"/>
             <xs:element name="TrafficRules" type="ListOfTrafficRuleReferences" minOccurs="0"/>
+            <xs:element name="IRIRules" type="ListOfIRIRuleReferences" minOccurs="0"/>
         </xs:sequence>
     </xs:group>
     <xs:complexType name="ListOfTrafficRuleReferences">
@@ -108,4 +109,39 @@
             <xs:element name="ProvideOriginalLength" type="xs:boolean" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
+    <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: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="ActionParameters" 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="NFType" type="common:DictionaryEntry"/>
+            <xs:element name="IRIEventCriteria" type="IRIEventsCriterai"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="IRIEventsCriteria">
+        <xs:sequence>
+            <xs:element name="HandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>
+            <xs:element name="IRIEvents" type="common:DictionaryEntry" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
 </xs:schema>
-- 
GitLab


From 4ee8de6ca9464d5f6f6244aa054bc2ad2393401e Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Mon, 17 Feb 2025 16:04:25 +0000
Subject: [PATCH 2/5] Update file ts_103120_TrafficPolicy.xsd

---
 103120/schema/xsd/ts_103120_TrafficPolicy.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index 7ebce460..a9e9975b 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -135,7 +135,7 @@
     <xs:complexType name="IRICriteria">
         <xs:choice>
             <xs:element name="NFType" type="common:DictionaryEntry"/>
-            <xs:element name="IRIEventCriteria" type="IRIEventsCriterai"/>
+            <xs:element name="IRIEventCriteria" type="IRIEventsCriteria"/>
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="IRIEventsCriteria">
-- 
GitLab


From 30092d135d8a2165baf552b74398c70ef1777099 Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Mon, 17 Feb 2025 16:09:21 +0000
Subject: [PATCH 3/5] Update file ts_103120_ETSIDictionaryDefinitions.xml

---
 .../ts_103120_ETSIDictionaryDefinitions.xml        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index 9c8bf6ce..aca3fe54 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -804,4 +804,18 @@
             </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
+    <Dictionary>
+        <!--NFType: see Clause 7.7.2.2.1 Table 7.X3 -->
+        <Owner>ETSI</Owner>
+        <Name>NFType</Name>
+        <DictionaryEntries/>
+        <!--No definition so far -->
+    </Dictionary>
+    <Dictionary>
+        <!--IRIEvents: see Clause 7.7.2.3.3 Table 7.X5 -->
+        <Owner>ETSI</Owner>
+        <Name>IRIEvents</Name>
+        <DictionaryEntries/>
+        <!--No definition so far -->
+    </Dictionary>
 </Dictionaries>
-- 
GitLab


From 207719ca23e262cdf0700ce5cae27c1a5f4ed00a Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Tue, 25 Feb 2025 09:35:26 +0000
Subject: [PATCH 4/5] Update file ts_103120_TrafficPolicy.xsd

---
 103120/schema/xsd/ts_103120_TrafficPolicy.xsd | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index a9e9975b..ecd1e8eb 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -120,7 +120,16 @@
             <xs:element name="ObjectIdentifier" type="core:ObjectIdentifier"/>
         </xs:sequence>
     </xs:complexType>
-        <xs:group name="IRIRuleObjectGroup">
+    <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"/>
-- 
GitLab


From aa529ed2715b3726d7d245847ba63ea4e5b3c7ae Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Tue, 25 Feb 2025 16:45:16 +0000
Subject: [PATCH 5/5] Update 2 files

- /103120/schema/xsd/ts_103120_TrafficPolicy.xsd
- /103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
---
 .../ts_103120_ETSIDictionaryDefinitions.xml   | 27 ++++++++++++++++---
 103120/schema/xsd/ts_103120_TrafficPolicy.xsd | 17 ++++++++++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index aca3fe54..2e87f689 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -805,17 +805,36 @@
         </DictionaryEntries>
     </Dictionary>
     <Dictionary>
-        <!--NFType: see Clause 7.7.2.2.1 Table 7.X3 -->
+        <!--NFType: see Clause 7.8.2.2.2 Table 7.X5 -->
         <Owner>ETSI</Owner>
         <Name>NFType</Name>
         <DictionaryEntries/>
         <!--No definition so far -->
     </Dictionary>
     <Dictionary>
-        <!--IRIEvents: see Clause 7.7.2.3.3 Table 7.X5 -->
+        <!--IRIEvents: see Clause 7.8.2.3.3 Table 7.X6 -->
         <Owner>ETSI</Owner>
         <Name>IRIEvents</Name>
-        <DictionaryEntries/>
-        <!--No definition so far -->
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>All</Value>
+                <Meaning>All IRI Events</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>
+    <Dictionary>
+        <!--IRIAction: see Clause 7.6.3 Table 7.25-->
+        <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>
diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index ecd1e8eb..f0639cdb 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -16,7 +16,6 @@
         <xs:sequence>
             <xs:element name="TrafficPolicyName" type="etsi:ShortString" minOccurs="0"/>
             <xs:element name="TrafficRules" type="ListOfTrafficRuleReferences" minOccurs="0"/>
-            <xs:element name="IRIRules" type="ListOfIRIRuleReferences" minOccurs="0"/>
         </xs:sequence>
     </xs:group>
     <xs:complexType name="ListOfTrafficRuleReferences">
@@ -109,7 +108,21 @@
             <xs:element name="ProvideOriginalLength" type="xs:boolean" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="ListOfIRIRuleReferences">
+    <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="ListOfTrafficRuleReferences" minOccurs="0"/>
+        </xs:sequence>
+    </xs:group><xs:complexType name="ListOfIRIRuleReferences">
         <xs:sequence>
             <xs:element name="IRIRuleReference" type="IRIRuleReference" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
-- 
GitLab