From a62688193210d55e01b96607b077ada3bfd0ca83 Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Thu, 12 Oct 2023 10:19:06 +1100
Subject: [PATCH 1/4] TS 103 280 CR0025 - Add VLAN types

---
 103280/TS_103_280.asn1        |  8 ++++++
 103280/TS_103_280.schema.json | 48 +++++++++++++++++++++++++++++++++++
 103280/TS_103_280.xsd         | 23 +++++++++++++++++
 3 files changed, 79 insertions(+)

diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1
index 0bf5202..f6a0ca8 100644
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
@@ -93,4 +93,12 @@ NAI ::= UTF8String
 
 IPProtocol ::= INTEGER (0..255)
 
+VLANId ::= INTEGER (1..4094)
+
+VLANIdRange ::= SEQUENCE
+{
+    start [0] VLANId,
+    end   [1] VLANId
+}
+
 END
diff --git a/103280/TS_103_280.schema.json b/103280/TS_103_280.schema.json
index 17d0136..a2b9549 100644
--- a/103280/TS_103_280.schema.json
+++ b/103280/TS_103_280.schema.json
@@ -384,6 +384,54 @@
         "etsi280:latitude",
         "etsi280:longitude"
       ]
+    },
+    "VLANId": {
+      "type": "integer",
+      "exclusiveMinimum": 1,
+      "maximum": 4094
+    },
+    "VLANIdRange": {
+      "type": "object",
+      "properties": {
+        "etsi280:start": {
+          "$ref": "#/$defs/VLANId"
+        },
+        "etsi280:end": {
+          "$ref": "#/$defs/VLANId"
+        }
+      },
+      "required": [
+        "etsi280:start",
+        "etsi280:end"
+      ]
+    },
+    "VLANIdRangeNested": {
+      "type": "object",
+      "properties": {
+        "VLANIdRange": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/VLANIdRange"
+          },
+          "minItems": 1
+        }
+      },
+      "required": []
+    },
+    "VLANTags": {
+      "type": "object",
+      "properties": {
+        "etsi280:untagged": {
+          "type": "boolean"
+        },
+        "etsi280:nestedTags": {
+          "$ref": "#/$defs/VLANIdRangeNested"
+        }
+      },
+      "required": [
+        "etsi280:untagged",
+        "etsi280:nestedTags"
+      ]
     }
   }
 }
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index 66a4d64..e903d20 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -272,4 +272,27 @@
             <xs:maxInclusive value="255"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="VLANId">
+        <xs:restriction base="xs:integer">
+            <xs:minExclusive value="1"/>
+            <xs:maxInclusive value="4094"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="VLANIdRange">
+        <xs:sequence>
+            <xs:element name="start" type="VLANId"/>
+            <xs:element name="end" type="VLANId"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="VLANIdRangeNested">
+        <xs:sequence>
+            <xs:element name="VLANIdRange" type="VLANIdRange" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="VLANTags">
+        <xs:choice>
+            <xs:element name="untagged" type="xs:boolean"/>
+            <xs:element name="nestedTags" type="VLANIdRangeNested"/>
+        </xs:choice>
+    </xs:complexType>
 </xs:schema>
-- 
GitLab


From e519d4dece36ea6dfb3fc9d910e6a7192585f0f7 Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 1 Nov 2023 08:28:01 +1100
Subject: [PATCH 2/4] TS 103 280 CR0025 - remove JSON changes

Don't change the JSON in the CR; let the automatic XSD->JSON Schema
tool do the job. Per feedback from @canterburym.
---
 103280/TS_103_280.schema.json | 48 -----------------------------------
 1 file changed, 48 deletions(-)

diff --git a/103280/TS_103_280.schema.json b/103280/TS_103_280.schema.json
index a2b9549..17d0136 100644
--- a/103280/TS_103_280.schema.json
+++ b/103280/TS_103_280.schema.json
@@ -384,54 +384,6 @@
         "etsi280:latitude",
         "etsi280:longitude"
       ]
-    },
-    "VLANId": {
-      "type": "integer",
-      "exclusiveMinimum": 1,
-      "maximum": 4094
-    },
-    "VLANIdRange": {
-      "type": "object",
-      "properties": {
-        "etsi280:start": {
-          "$ref": "#/$defs/VLANId"
-        },
-        "etsi280:end": {
-          "$ref": "#/$defs/VLANId"
-        }
-      },
-      "required": [
-        "etsi280:start",
-        "etsi280:end"
-      ]
-    },
-    "VLANIdRangeNested": {
-      "type": "object",
-      "properties": {
-        "VLANIdRange": {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/VLANIdRange"
-          },
-          "minItems": 1
-        }
-      },
-      "required": []
-    },
-    "VLANTags": {
-      "type": "object",
-      "properties": {
-        "etsi280:untagged": {
-          "type": "boolean"
-        },
-        "etsi280:nestedTags": {
-          "$ref": "#/$defs/VLANIdRangeNested"
-        }
-      },
-      "required": [
-        "etsi280:untagged",
-        "etsi280:nestedTags"
-      ]
     }
   }
 }
-- 
GitLab


From 65de8bf982230883c1e15ac19981cac72eb6b5f9 Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 1 Nov 2023 08:32:14 +1100
Subject: [PATCH 3/4] TS 103 280 CR0025 - simplify VLANID

Rename VLANId to VLANID, and change range to 0..4095
Remove VLANIdRange, VLANIdRangeNested, VLANTags.
Add VLANIDNested to XML.
---
 103280/TS_103_280.asn1 |  8 +-------
 103280/TS_103_280.xsd  | 22 +++++-----------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1
index f6a0ca8..1bdad3b 100644
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
@@ -93,12 +93,6 @@ NAI ::= UTF8String
 
 IPProtocol ::= INTEGER (0..255)
 
-VLANId ::= INTEGER (1..4094)
-
-VLANIdRange ::= SEQUENCE
-{
-    start [0] VLANId,
-    end   [1] VLANId
-}
+VLANID ::= INTEGER (0..4095)
 
 END
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index e903d20..1899445 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -272,27 +272,15 @@
             <xs:maxInclusive value="255"/>
         </xs:restriction>
     </xs:simpleType>
-    <xs:simpleType name="VLANId">
+    <xs:simpleType name="VLANID">
         <xs:restriction base="xs:integer">
-            <xs:minExclusive value="1"/>
-            <xs:maxInclusive value="4094"/>
+            <xs:minExclusive value="0"/>
+            <xs:maxInclusive value="4095"/>
         </xs:restriction>
     </xs:simpleType>
-    <xs:complexType name="VLANIdRange">
-        <xs:sequence>
-            <xs:element name="start" type="VLANId"/>
-            <xs:element name="end" type="VLANId"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="VLANIdRangeNested">
+    <xs:complexType name="VLANIDNested">
         <xs:sequence>
-            <xs:element name="VLANIdRange" type="VLANIdRange" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element name="VLANID" type="VLANID" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="VLANTags">
-        <xs:choice>
-            <xs:element name="untagged" type="xs:boolean"/>
-            <xs:element name="nestedTags" type="VLANIdRangeNested"/>
-        </xs:choice>
-    </xs:complexType>
 </xs:schema>
-- 
GitLab


From 8214eed7cffe21a661cb99be779f6f2a69d71af0 Mon Sep 17 00:00:00 2001
From: grahamj <jason.graham@trideaworks.com>
Date: Wed, 1 Nov 2023 00:48:08 +0000
Subject: [PATCH 4/4] Update file TS_103_280.xsd

---
 103280/TS_103_280.xsd | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index 1899445..dd4a683 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -278,9 +278,4 @@
             <xs:maxInclusive value="4095"/>
         </xs:restriction>
     </xs:simpleType>
-    <xs:complexType name="VLANIDNested">
-        <xs:sequence>
-            <xs:element name="VLANID" type="VLANID" minOccurs="1" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
 </xs:schema>
-- 
GitLab