From 5ded2172b28bc1a5a89d7882995d0404dfb38ecc Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Mon, 16 Oct 2023 19:06:19 +0000
Subject: [PATCH 01/11] Update file ts_103120_TrafficPolicy.xsd

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

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index e201f02..09e6c7f 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -71,4 +71,11 @@
             <xs:element name="DNN" type="etsi:ShortString" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
+     <xs:complexType name="EthernetPolicyCriteria">
+        <xs:sequence>
+            <xs:element name="SourceMACAddress" type="etsi:MACAddress" minOccurs="0"/>
+            <xs:element name="DestinationMACAddress" type="etsi:MACAddress" minOccurs="0"/>
+            <xs:element name="VLANIdRange" type="etsi:VLANIdRange" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
 </xs:schema>
-- 
GitLab


From d0befbc757c5a32889c7a6a094f8838028254efa Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Mon, 16 Oct 2023 19:15:41 +0000
Subject: [PATCH 02/11] Update file ts_103120_TrafficPolicy.schema.json

---
 .../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 1d9619e..fccca7c 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -194,5 +194,20 @@
       },
       "required": []
     }
+    "EthernetPolicyCriteria": {
+      "type": "object",
+      "properties": {
+        "tp:SourceMACAddress": {
+          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
+        },
+        "tp:DestinationMACAddress": {
+          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
+        },
+        "tp:VLANIdRange": {
+          "$ref": "ts_103280_2017_07#/$defs/VLANIdRange"
+        }
+      },
+      "required": []
+    }
   }
 }
\ No newline at end of file
-- 
GitLab


From b3fbd51e3736949175089d3516e668578ec91a30 Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Mon, 16 Oct 2023 19:16:54 +0000
Subject: [PATCH 03/11] Update file ts_103120_TrafficPolicy.schema.json

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

diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
index fccca7c..0943ba9 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -193,7 +193,7 @@
         }
       },
       "required": []
-    }
+    },
     "EthernetPolicyCriteria": {
       "type": "object",
       "properties": {
-- 
GitLab


From ea6e571169ae04567f537662fbf4500e15580d58 Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Tue, 31 Oct 2023 07:49:21 +0000
Subject: [PATCH 04/11] Update 103120/schema/xsd/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 09e6c7f..36c7987 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -75,7 +75,7 @@
         <xs:sequence>
             <xs:element name="SourceMACAddress" type="etsi:MACAddress" minOccurs="0"/>
             <xs:element name="DestinationMACAddress" type="etsi:MACAddress" minOccurs="0"/>
-            <xs:element name="VLANIdRange" type="etsi:VLANIdRange" minOccurs="0"/>
+            <xs:element name="VLANId" type="etsi:VLANIdRange" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
 </xs:schema>
-- 
GitLab


From 771ca088a5b594f507dfbac56c64cbb02b6be4c1 Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Tue, 31 Oct 2023 10:59:34 +0000
Subject: [PATCH 05/11] Update
 103120/schema/json/ts_103120_TrafficPolicy.schema.json

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

diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
index 0943ba9..d579bb0 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -203,7 +203,7 @@
         "tp:DestinationMACAddress": {
           "$ref": "ts_103280_2017_07#/$defs/MACAddress"
         },
-        "tp:VLANIdRange": {
+        "tp:VLANIDRange": {
           "$ref": "ts_103280_2017_07#/$defs/VLANIdRange"
         }
       },
-- 
GitLab


From f5a78c4a6aead16f6da8bbd4ab77739f7dfdd46d Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Tue, 31 Oct 2023 20:33:12 +0000
Subject: [PATCH 06/11] Update 103120/schema/xsd/ts_103120_TrafficPolicy.xsd

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

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index 36c7987..52ef49f 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -71,11 +71,19 @@
             <xs:element name="DNN" type="etsi:ShortString" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
-     <xs:complexType name="EthernetPolicyCriteria">
+    <xs:complexType name="EthernetPolicyCriteria">
         <xs:sequence>
             <xs:element name="SourceMACAddress" type="etsi:MACAddress" minOccurs="0"/>
             <xs:element name="DestinationMACAddress" type="etsi:MACAddress" minOccurs="0"/>
-            <xs:element name="VLANId" type="etsi:VLANIdRange" minOccurs="0"/>
+            <xs:element name="VLANIDs" type="VLANIDs" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="VLANIDs">
+        <xs:choice>
+            <xs:element name="VLANID" type="etsi:VLANID"/>
+            <xs:element name="VLANIDRange" type="etsi:VLANIDRange"/>
+            <xs:element name="VLANIDRangeNested" type="etsi:VLANIDRangeNested"/>
+            <xs:element name="VLANTags" type="etsi:VLANTags"/>
+        </xs:choice>
+    </xs:complexType>
 </xs:schema>
-- 
GitLab


From 47798aaa92b740a66a6303a8cebcc5a55e69f94f Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Tue, 31 Oct 2023 21:51:59 +0000
Subject: [PATCH 07/11] Update 103120/schema/xsd/ts_103120_TrafficPolicy.xsd

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

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index 52ef49f..36ab45f 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -53,6 +53,7 @@
         <xs:choice>
             <xs:element name="IPPolicyCriteria" type="IPPolicyCriteria"/>
             <xs:element name="MobileAccessPolicyCriteria" type="MobileAccessPolicyCriteria"/>
+            <xs:element name="EthernetPolicyCriteria" type="EthernetPolicyCriteria"/>
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="IPPolicyCriteria">
-- 
GitLab


From a363b6cc04ea51ee01037a3cccf753f09540df6e Mon Sep 17 00:00:00 2001
From: znaty <sznaty@efort.com>
Date: Tue, 31 Oct 2023 21:58:04 +0000
Subject: [PATCH 08/11] Update 103120/schema/xsd/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 36ab45f..a2072dd 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -85,6 +85,6 @@
             <xs:element name="VLANIDRange" type="etsi:VLANIDRange"/>
             <xs:element name="VLANIDRangeNested" type="etsi:VLANIDRangeNested"/>
             <xs:element name="VLANTags" type="etsi:VLANTags"/>
-        </xs:choice>
+        </xs:choice> 
     </xs:complexType>
 </xs:schema>
-- 
GitLab


From 3c8450f51644b987c132274472f4847e2aa00bcd Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Tue, 31 Oct 2023 22:12:13 +0000
Subject: [PATCH 09/11] Update file ts_103120_TrafficPolicy.xsd

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

diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index a2072dd..44a2a3d 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -76,15 +76,13 @@
         <xs:sequence>
             <xs:element name="SourceMACAddress" type="etsi:MACAddress" minOccurs="0"/>
             <xs:element name="DestinationMACAddress" type="etsi:MACAddress" minOccurs="0"/>
-            <xs:element name="VLANIDs" type="VLANIDs" minOccurs="0"/>
+            <xs:element name="BothDirections" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="VLANCriteria" type="VLANCriteria" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="VLANIDs">
+    <xs:complexType name="VLANCriteria">
         <xs:choice>
-            <xs:element name="VLANID" type="etsi:VLANID"/>
-            <xs:element name="VLANIDRange" type="etsi:VLANIDRange"/>
-            <xs:element name="VLANIDRangeNested" type="etsi:VLANIDRangeNested"/>
-            <xs:element name="VLANTags" type="etsi:VLANTags"/>
+            <xs:element name="OuterVLANs" type="etsi:VLANIDNested"/>
         </xs:choice> 
     </xs:complexType>
 </xs:schema>
-- 
GitLab


From eb202849ec4f87621b2552c35a9b37be0e83b18b Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Wed, 1 Nov 2023 00:50:06 +0000
Subject: [PATCH 10/11] Update 2 files

- /103120/schema/json/ts_103120_TrafficPolicy.schema.json
- /103120/schema/xsd/ts_103120_TrafficPolicy.xsd
---
 .../json/ts_103120_TrafficPolicy.schema.json      | 15 ---------------
 103120/schema/xsd/ts_103120_TrafficPolicy.xsd     |  7 ++++++-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
index d579bb0..1d9619e 100644
--- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json
+++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json
@@ -193,21 +193,6 @@
         }
       },
       "required": []
-    },
-    "EthernetPolicyCriteria": {
-      "type": "object",
-      "properties": {
-        "tp:SourceMACAddress": {
-          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
-        },
-        "tp:DestinationMACAddress": {
-          "$ref": "ts_103280_2017_07#/$defs/MACAddress"
-        },
-        "tp:VLANIDRange": {
-          "$ref": "ts_103280_2017_07#/$defs/VLANIdRange"
-        }
-      },
-      "required": []
     }
   }
 }
\ No newline at end of file
diff --git a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
index 44a2a3d..26135ac 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -82,7 +82,12 @@
     </xs:complexType>
     <xs:complexType name="VLANCriteria">
         <xs:choice>
-            <xs:element name="OuterVLANs" type="etsi:VLANIDNested"/>
+            <xs:element name="OuterVLANs" type="VLANIDList"/>
         </xs:choice> 
     </xs:complexType>
+    <xs:complexType name="VLANIDList">
+        <xs:sequence>
+            <xs:element name="VLANID" type="VLANID" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 </xs:schema>
-- 
GitLab


From 14258d3c82a8cb1a0b595970d398889ea73d2947 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Wed, 1 Nov 2023 07:38:42 +0000
Subject: [PATCH 11/11] Correcting type for VLANID element to use namespace
 prefix

---
 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 26135ac..ff26654 100644
--- a/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
+++ b/103120/schema/xsd/ts_103120_TrafficPolicy.xsd
@@ -87,7 +87,7 @@
     </xs:complexType>
     <xs:complexType name="VLANIDList">
         <xs:sequence>
-            <xs:element name="VLANID" type="VLANID" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element name="VLANID" type="etsi:VLANID" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 </xs:schema>
-- 
GitLab