From 8465fb4fe535b9b637888f60e37fd5c62866f798 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] 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