From ac2df055a4d421c16ee74cb0f9dc768507d053a9 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 25 May 2023 11:16:50 +0100
Subject: [PATCH 1/2] Refactoring TS 103 120

---
 103120/schema/ts_103120_TrafficPolicy.xsd | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd
index 2494a5e..e201f02 100644
--- a/103120/schema/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/ts_103120_TrafficPolicy.xsd
@@ -7,12 +7,17 @@
         <xs:complexContent>
             <xs:extension base="core:HI1Object">
                 <xs:sequence>
-                    <xs:element name="TrafficPolicyName" type="etsi:ShortString" minOccurs="0"/>
-                    <xs:element name="TrafficRules" type="ListOfTrafficRuleReferences" minOccurs="0"/>
+                    <xs:group ref="TrafficPolicyObjectGroup"/>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
     </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:sequence>
             <xs:element name="TrafficRuleReference" type="TrafficRuleReference" minOccurs="1" maxOccurs="unbounded"/>
@@ -28,12 +33,17 @@
         <xs:complexContent>
             <xs:extension base="core:HI1Object">
                 <xs:sequence>
-                    <xs:element name="Criteria" type="ListOfTrafficCriteria" minOccurs="0"/>
-                    <xs:element name="Action" type="common:DictionaryEntry" minOccurs="0"/>
+                    <xs:group ref="TrafficRuleObjectGroup"/>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
     </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:sequence>
             <xs:element name="Criteria" type="TrafficCriteria" minOccurs="1" maxOccurs="unbounded"/>
-- 
GitLab


From 63e79a5f32b6d03b46cd2e19be0e3ac8f28862b0 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Tue, 13 Jun 2023 09:52:01 +0000
Subject: [PATCH 2/2] Updating dictionary XML

---
 103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index 8577872..b0a742d 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -346,6 +346,10 @@
                 <Value>NotDelivered</Value>
                 <Meaning>Traffic that matches this policy is not delivered</Meaning>
             </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Delivered</Value>
+                <Meaning>Traffic that matches the policy is delivered</Meaning>
+            </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
     <Dictionary>
-- 
GitLab