From 0560ef58063365fa2fc1fd3b4dad69139ea8f739 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Tue, 14 Feb 2023 09:29:44 +0000
Subject: [PATCH 1/4] Refactor of TS 103 120 to accomodate LI_X1 traffic
 policies

---
 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 14e31546cdb64ecbc6e89698edd43c71f1da8652 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Tue, 14 Feb 2023 11:54:10 +0000
Subject: [PATCH 2/4] Adding TrafficPolicy generic object

---
 103221-1/TS_103_221_01_TrafficPolicy.xsd      | 25 +++++++++++
 .../examples/CreateTrafficPolicy_example.xml  | 44 +++++++++++++++++++
 testing/xsd_compile_targets.json              |  7 ++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 103221-1/TS_103_221_01_TrafficPolicy.xsd
 create mode 100644 103221-1/examples/CreateTrafficPolicy_example.xml

diff --git a/103221-1/TS_103_221_01_TrafficPolicy.xsd b/103221-1/TS_103_221_01_TrafficPolicy.xsd
new file mode 100644
index 0000000..0af4bbd
--- /dev/null
+++ b/103221-1/TS_103_221_01_TrafficPolicy.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2023/02/TrafficPolicy" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:ts103120="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" targetNamespace="http://uri.etsi.org/03221/X1/2023/02/TrafficPolicy" elementFormDefault="qualified" version="1.10.1">
+    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+    <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
+    <xs:import namespace="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy"/>
+    <!-- Message containers -->
+    <xs:complexType name="TrafficPolicyObject">
+        <xs:complexContent>
+            <xs:extension base="x1:GenericObject">
+                <xs:sequence>
+                    <xs:group ref="ts103120:TrafficPolicyObjectGroup"></xs:group>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="TrafficRuleObject">
+        <xs:complexContent>
+            <xs:extension base="x1:GenericObject">
+                <xs:sequence>
+                    <xs:group ref="ts103120:TrafficRuleObjectGroup"></xs:group>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/103221-1/examples/CreateTrafficPolicy_example.xml b/103221-1/examples/CreateTrafficPolicy_example.xml
new file mode 100644
index 0000000..6b34233
--- /dev/null
+++ b/103221-1/examples/CreateTrafficPolicy_example.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:policy="http://uri.etsi.org/03221/X1/2023/02/TrafficPolicy" xmlns:hi1_policy="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" xmlns:ts103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hi1_common="http://uri.etsi.org/03120/common/2016/02/Common">
+    <x1RequestMessage  xsi:type="CreateObjectRequest">
+        <admfIdentifier>admfID</admfIdentifier>
+        <neIdentifier>neID</neIdentifier>
+        <messageTimestamp>2023-02-14T18:46:21.247432Z</messageTimestamp>
+        <version>v1.13.1</version>
+        <x1TransactionId>2654a277-bafb-4240-9143-806ee41a3751</x1TransactionId>
+        <createObject xsi:type="policy:TrafficRuleObject">
+            <objectId>6c67de93-926a-488b-9435-b0a30c20f676</objectId>
+            <hi1_policy:Criteria>
+                <hi1_policy:Criteria>
+                    <hi1_policy:IPPolicyCriteria>
+                        <hi1_policy:SourceIPRange>
+                            <ts103280:IPv4CIDR>203.0.113.0/24</ts103280:IPv4CIDR>
+                        </hi1_policy:SourceIPRange>
+                    </hi1_policy:IPPolicyCriteria>
+                </hi1_policy:Criteria>
+            </hi1_policy:Criteria>
+            <hi1_policy:Action>
+                <hi1_common:Owner>ETSI</hi1_common:Owner>
+                <hi1_common:Name>PolicyAction</hi1_common:Name>
+                <hi1_common:Value>PDSR</hi1_common:Value>
+            </hi1_policy:Action>
+        </createObject>
+    </x1RequestMessage>
+    <x1RequestMessage xsi:type="CreateObjectRequest">
+        <admfIdentifier>admfID</admfIdentifier>
+        <neIdentifier>neID</neIdentifier>
+        <messageTimestamp>2023-02-14T18:46:21.247432Z</messageTimestamp>
+        <version>v1.13.1</version>
+        <x1TransactionId>2654a277-bafb-4240-9143-806ee41a3751</x1TransactionId>
+        <createObject xsi:type="policy:TrafficPolicyObject">
+            <objectId>b04057af-362f-4e8d-9337-416f43bfd7ec</objectId>
+            <hi1_policy:TrafficPolicyName>Template Rule 1</hi1_policy:TrafficPolicyName>
+            <hi1_policy:TrafficRules>
+                <hi1_policy:TrafficRuleReference>
+                    <hi1_policy:Order>1</hi1_policy:Order>
+                    <hi1_policy:ObjectIdentifier>6c67de93-926a-488b-9435-b0a30c20f676</hi1_policy:ObjectIdentifier>
+                </hi1_policy:TrafficRuleReference>
+            </hi1_policy:TrafficRules>
+        </createObject>
+    </x1RequestMessage>
+</X1Request>
diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index a1bde12..6110fd8 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -15,8 +15,13 @@
             "103221-1/TS_103_221_01.xsd",
             "103221-1/TS_103_221_01_HashedID.xsd",
             "103221-1/TS_103_221_01_DestinationSet.xsd",
+            "103221-1/TS_103_221_01_TrafficPolicy.xsd",
             "103280/TS_103_280.xsd",
-            "103221-1/examples/ExampleGenericObjects.xsd"
+            "103221-1/examples/ExampleGenericObjects.xsd",
+            "103120/schema/ts_103120_Common.xsd",
+            "103120/schema/ts_103120_Core.xsd",
+            "103120/schema/ts_103120_TrafficPolicy.xsd",
+            "testing/deps/xmldsig/xmldsig-core-schema.xsd"
         ],
         "exampleFiles" : [
             "103221-1/examples"
-- 
GitLab


From e7c96f6ecc6ce7c96ebdca4493dee847fee51073 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 16 Feb 2023 11:36:00 +0000
Subject: [PATCH 3/4] Changing namespace prefix

---
 103221-1/TS_103_221_01_TrafficPolicy.xsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/103221-1/TS_103_221_01_TrafficPolicy.xsd b/103221-1/TS_103_221_01_TrafficPolicy.xsd
index 0af4bbd..eda3273 100644
--- a/103221-1/TS_103_221_01_TrafficPolicy.xsd
+++ b/103221-1/TS_103_221_01_TrafficPolicy.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2023/02/TrafficPolicy" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:ts103120="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" targetNamespace="http://uri.etsi.org/03221/X1/2023/02/TrafficPolicy" elementFormDefault="qualified" version="1.10.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2023/02/TrafficPolicy" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hi1_policy="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" targetNamespace="http://uri.etsi.org/03221/X1/2023/02/TrafficPolicy" elementFormDefault="qualified" version="1.10.1">
     <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
     <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
     <xs:import namespace="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy"/>
@@ -8,7 +8,7 @@
         <xs:complexContent>
             <xs:extension base="x1:GenericObject">
                 <xs:sequence>
-                    <xs:group ref="ts103120:TrafficPolicyObjectGroup"></xs:group>
+                    <xs:group ref="hi1_policy:TrafficPolicyObjectGroup"></xs:group>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
@@ -17,7 +17,7 @@
         <xs:complexContent>
             <xs:extension base="x1:GenericObject">
                 <xs:sequence>
-                    <xs:group ref="ts103120:TrafficRuleObjectGroup"></xs:group>
+                    <xs:group ref="hi1_policy:TrafficRuleObjectGroup"></xs:group>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
-- 
GitLab


From 4e0b74fa39d7ceb92f13cd55d3660836bb1981c5 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 16 Feb 2023 11:45:02 +0000
Subject: [PATCH 4/4] Adding traffic policy references to TaskDetails and
 MediationsDetails, and updating example

---
 103221-1/TS_103_221_01.xsd                    | 10 ++++++++++
 .../examples/CreateTrafficPolicy_example.xml  | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index c3ca89a..894785a 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -156,6 +156,7 @@
             <xs:element name="productID" type="XId" minOccurs="0"/>
             <xs:element name="listOfServiceTypes" type="ListOfServiceTypes" minOccurs="0"/>
             <xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="listOfTrafficPolicyReferences" type="ListOfTrafficPolicyReferences" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="ListOfTargetIdentifiers">
@@ -251,6 +252,7 @@
             <xs:element name="listOfDIDs" type="ListOfDids" minOccurs="0"/>
             <xs:element name="mediationDetailsExtensions" type="MediationDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="serviceScopingOptions" type="ListOfServiceScopingOptions" minOccurs="0"/>
+            <xs:element name="listOfTrafficPolicyReferences" type="ListOfTrafficPolicyReferences" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="ListOfServiceScopingOptions">
@@ -319,6 +321,14 @@
             <xs:element name="dSId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="ListOfTrafficPolicyReferences">
+        <xs:sequence>
+            <xs:element name="trafficPolicyReference" type="TrafficPolicyReference" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="TrafficPolicyReference">
+        <xs:restriction base="GenericObjectID"/>
+    </xs:simpleType>    
     <xs:complexType name="ListOfMediationDetails">
         <xs:sequence>
             <xs:element name="mediationDetails" type="MediationDetails" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/103221-1/examples/CreateTrafficPolicy_example.xml b/103221-1/examples/CreateTrafficPolicy_example.xml
index 6b34233..1150aa0 100644
--- a/103221-1/examples/CreateTrafficPolicy_example.xml
+++ b/103221-1/examples/CreateTrafficPolicy_example.xml
@@ -41,4 +41,24 @@
             </hi1_policy:TrafficRules>
         </createObject>
     </x1RequestMessage>
+    <x1RequestMessage xsi:type="ActivateTaskRequest">
+        <admfIdentifier>admfID</admfIdentifier>
+        <neIdentifier>neID</neIdentifier>
+        <messageTimestamp>2023-02-14T18:46:21.247432Z</messageTimestamp>
+        <version>v1.13.1</version>
+        <x1TransactionId>211900a7-afb5-4187-b036-c85a92ab94aa</x1TransactionId>
+        <taskDetails>
+            <xId>2f5faff3-077d-4ec3-b66a-226e3a921eec</xId>
+            <targetIdentifiers>
+                <targetIdentifier>
+                    <e164Number>447700900000</e164Number>
+                </targetIdentifier>
+            </targetIdentifiers>
+            <deliveryType>X2andX3</deliveryType>
+            <listOfDIDs></listOfDIDs>
+            <listOfTrafficPolicyReferences>
+                <trafficPolicyReference>b04057af-362f-4e8d-9337-416f43bfd7ec</trafficPolicyReference>
+            </listOfTrafficPolicyReferences>
+        </taskDetails>
+    </x1RequestMessage>    
 </X1Request>
-- 
GitLab