From 8184bf7273c1b8e81baaa63d6f3a69d99dfc0f15 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 13:47:47 +0000
Subject: [PATCH 1/8] Replace ts_103120_ETSIDictionaryDefinitions.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 33fd4f3..a5c5fb2 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -354,6 +354,10 @@
                 <Value>Delivered</Value>
                 <Meaning>Traffic that matches the policy is delivered</Meaning>
             </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Truncate</Value>
+                <Meaning>Deliver only the specified number of the first octets of each datagram</Meaning>
+            </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
     <Dictionary>
-- 
GitLab


From df5e9632ead9d3f541bf8d3e6c254a93215328ce Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 13:55:04 +0000
Subject: [PATCH 2/8] Update ts_103120_TrafficPolicy.xsd

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

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index 0ef2631..4ca56c3 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -42,6 +42,7 @@
         <xs:sequence>
             <xs:element name="Criteria" type="ListOfTrafficCriteria" 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="ListOfTrafficCriteria">
@@ -96,4 +97,15 @@
             <xs:element name="CommunicationServiceID" type="etsi:ShortString" minOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
+	<xs:complexType name="ActionParameters">
+		<xs:choice>
+			<xs:element name="TruncateActionParameters" type="TruncateActionParameters"/>
+		</xs:choice>
+	</xs:complexType>
+	<xs:complexType name="TruncateActionParameters">
+		<xs:sequence>
+            <xs:element name="NumberOfOctets" type="xs:nonNegativeInteger"/>
+            <xs:element name="ProvideOriginalLength" type="xs:boolean" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
 </xs:schema>
-- 
GitLab


From fb0bbc1f704d2bf0f0bbd21ee73c14a302c0fb96 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 13:56:16 +0000
Subject: [PATCH 3/8] Update ts_103120_TrafficPolicy.schema.json

---
 .../json/ts_103120_TrafficPolicy.schema.json  | 82 ++++---------------
 1 file changed, 18 insertions(+), 64 deletions(-)

diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
index 013e0a7..ab5fac1 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -111,6 +111,9 @@
         },
         "tp:Action": {
           "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
+        },
+        "tp:Parameters": {
+          "$ref": "#/$defs/ActionParameters"
         }
       },
       "required": [
@@ -154,28 +157,6 @@
           "required": [
             "tp:MobileAccessPolicyCriteria"
           ]
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tp:EthernetPolicyCriteria": {
-              "$ref": "#/$defs/EthernetPolicyCriteria"
-            }
-          },
-          "required": [
-            "tp:EthernetPolicyCriteria"
-          ]
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tp:RCSPolicyCriteria": {
-              "$ref": "#/$defs/RCSPolicyCriteria"
-            }
-          },
-          "required": [
-            "tp:RCSPolicyCriteria"
-          ]
         }
       ]
     },
@@ -216,62 +197,35 @@
       },
       "required": []
     },
-    "EthernetPolicyCriteria": {
-      "type": "object",
-      "properties": {
-        "tp:SourceMACAddress": {
-          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
-        },
-        "tp:DestinationMACAddress": {
-          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
-        },
-        "tp:BothDirections": {
-          "type": "boolean"
-        },
-        "tp:VLANCriteria": {
-          "$ref": "#/$defs/VLANCriteria"
-        }
-      },
-      "required": []
-    },
-    "VLANCriteria": {
+    "ActionParameters": {
       "oneOf": [
         {
           "type": "object",
           "properties": {
-            "tp:OuterVLANs": {
-              "$ref": "#/$defs/VLANIDList"
+            "tp:TruncateActionParameters": {
+              "$ref": "#/$defs/TruncateActionParameters"
             }
           },
           "required": [
-            "tp:OuterVLANs"
+            "tp:TruncateActionParameters"
           ]
         }
       ]
-    },
-    "VLANIDList": {
-      "type": "object",
-      "properties": {
-        "tp:VLANID": {
-          "type": "array",
-          "items": {
-            "$ref": "ts_103280_2017_07#/$defs/VLANID"
-          },
-          "minItems": 1
-        }
-      },
-      "required": []
-    },
-    "RCSPolicyCriteria": {
+    }
+  },
+    "TruncateActionParameters": {
       "type": "object",
       "properties": {
-        "tp:CommunicationServiceID": {
-          "$ref": "ts_103280_2017_07#/$defs/ShortString"
+        "tp:NumberOfOctets": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "tp:ProvideOriginalLength": {
+          "type": "boolean"
         }
       },
       "required": [
-        "tp:CommunicationServiceID"
-      ]
+		"tp:NumberOfOctets"
+	  ]
     }
-  }
 }
-- 
GitLab


From 1e394895f9690bb23d61a1b4b46f24dc4de23abc Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 14:21:06 +0000
Subject: [PATCH 4/8] Revert "Update ts_103120_TrafficPolicy.schema.json"

This reverts commit 1d2483352690e4b41ede2688090c3998cdc99b15
---
 .../json/ts_103120_TrafficPolicy.schema.json  | 82 +++++++++++++++----
 1 file changed, 64 insertions(+), 18 deletions(-)

diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
index ab5fac1..013e0a7 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -111,9 +111,6 @@
         },
         "tp:Action": {
           "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
-        },
-        "tp:Parameters": {
-          "$ref": "#/$defs/ActionParameters"
         }
       },
       "required": [
@@ -157,6 +154,28 @@
           "required": [
             "tp:MobileAccessPolicyCriteria"
           ]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "tp:EthernetPolicyCriteria": {
+              "$ref": "#/$defs/EthernetPolicyCriteria"
+            }
+          },
+          "required": [
+            "tp:EthernetPolicyCriteria"
+          ]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "tp:RCSPolicyCriteria": {
+              "$ref": "#/$defs/RCSPolicyCriteria"
+            }
+          },
+          "required": [
+            "tp:RCSPolicyCriteria"
+          ]
         }
       ]
     },
@@ -197,35 +216,62 @@
       },
       "required": []
     },
-    "ActionParameters": {
+    "EthernetPolicyCriteria": {
+      "type": "object",
+      "properties": {
+        "tp:SourceMACAddress": {
+          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
+        },
+        "tp:DestinationMACAddress": {
+          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
+        },
+        "tp:BothDirections": {
+          "type": "boolean"
+        },
+        "tp:VLANCriteria": {
+          "$ref": "#/$defs/VLANCriteria"
+        }
+      },
+      "required": []
+    },
+    "VLANCriteria": {
       "oneOf": [
         {
           "type": "object",
           "properties": {
-            "tp:TruncateActionParameters": {
-              "$ref": "#/$defs/TruncateActionParameters"
+            "tp:OuterVLANs": {
+              "$ref": "#/$defs/VLANIDList"
             }
           },
           "required": [
-            "tp:TruncateActionParameters"
+            "tp:OuterVLANs"
           ]
         }
       ]
-    }
-  },
-    "TruncateActionParameters": {
+    },
+    "VLANIDList": {
       "type": "object",
       "properties": {
-        "tp:NumberOfOctets": {
-          "type": "integer",
-          "minimum": 0
-        },
-        "tp:ProvideOriginalLength": {
-          "type": "boolean"
+        "tp:VLANID": {
+          "type": "array",
+          "items": {
+            "$ref": "ts_103280_2017_07#/$defs/VLANID"
+          },
+          "minItems": 1
+        }
+      },
+      "required": []
+    },
+    "RCSPolicyCriteria": {
+      "type": "object",
+      "properties": {
+        "tp:CommunicationServiceID": {
+          "$ref": "ts_103280_2017_07#/$defs/ShortString"
         }
       },
       "required": [
-		"tp:NumberOfOctets"
-	  ]
+        "tp:CommunicationServiceID"
+      ]
     }
+  }
 }
-- 
GitLab


From 2bd5eede5c78082b3cefac10a09ec30332b05b3f Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 15:08:36 +0000
Subject: [PATCH 5/8] Update ts_103120_TrafficPolicy.schema.json

---
 .../json/ts_103120_TrafficPolicy.schema.json   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
index 013e0a7..bffb22a 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -111,6 +111,9 @@
         },
         "tp:Action": {
           "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
+        },
+        "tp:Parameters": {
+          "$ref": "#/$defs/ActionParameters"
         }
       },
       "required": [
@@ -272,6 +275,21 @@
       "required": [
         "tp:CommunicationServiceID"
       ]
+    },
+    "TruncateActionParameters": {
+      "type": "object",
+      "properties": {
+        "tp:NumberOfOctets": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "tp:ProvideOriginalLength": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+		    "tp:NumberOfOctets"
+	    ]
     }
   }
 }
-- 
GitLab


From 05ee03c420cb8016e5a0f2a1d4768019b2389dbf Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 15:17:21 +0000
Subject: [PATCH 6/8] Update ts_103120_TrafficPolicy.schema.json (Add missing
 ActionParameters definition)

---
 .../json/ts_103120_TrafficPolicy.schema.json      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
index bffb22a..9c5791e 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -276,6 +276,21 @@
         "tp:CommunicationServiceID"
       ]
     },
+    "ActionParameters": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "tp:TruncateActionParameters": {
+              "$ref": "#/$defs/TruncateActionParameters"
+            }
+          },
+          "required": [
+            "tp:TruncateActionParameters"
+          ]
+        }
+      ]
+    },
     "TruncateActionParameters": {
       "type": "object",
       "properties": {
-- 
GitLab


From 10adb582d0b5aff8e311d9d3509a12ce2c5c3b50 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 13:48:31 +0000
Subject: [PATCH 7/8] Update 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 4ca56c3..33fdcd7 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -105,7 +105,7 @@
 	<xs:complexType name="TruncateActionParameters">
 		<xs:sequence>
             <xs:element name="NumberOfOctets" type="xs:nonNegativeInteger"/>
-            <xs:element name="ProvideOriginalLength" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="ProvideOriginalLength" type="xs:boolean" default="false" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 </xs:schema>
-- 
GitLab


From 9cc68f141600444ad5eed987176e26770353d99b Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 14:25:40 +0000
Subject: [PATCH 8/8] Revert "Update ts_103120_TrafficPolicy.xsd"

This reverts commit 4d7a6ccc506b9b6b95d67b724e029b95180b670b
---
 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 33fdcd7..4ca56c3 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -105,7 +105,7 @@
 	<xs:complexType name="TruncateActionParameters">
 		<xs:sequence>
             <xs:element name="NumberOfOctets" type="xs:nonNegativeInteger"/>
-            <xs:element name="ProvideOriginalLength" type="xs:boolean" default="false" minOccurs="0"/>
+            <xs:element name="ProvideOriginalLength" type="xs:boolean" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 </xs:schema>
-- 
GitLab