From 8f98faf0e8520a67a2cff87055198da65c197eea Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 11 Oct 2023 15:31:53 +1100
Subject: [PATCH 1/2] TS 103 280 CR xxx - 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..f28294e 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"
+      ]
+    },
+    "VLANIdNested": {
+      "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/VLANIdNested"
+        }
+      },
+      "required": [
+        "etsi280:untagged",
+        "etsi280:nestedTags"
+      ]
     }
   }
 }
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index 66a4d64..6869df9 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="VLANIdNested">
+        <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="VLANIdNested"/>
+        </xs:choice>
+    </xs:complexType>
 </xs:schema>
-- 
GitLab


From 7fa11ec28bfb5339efcb51412fa37fc330b60b07 Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 11 Oct 2023 15:40:52 +1100
Subject: [PATCH 2/2] rename VLANIdNested to VLANIdRangeNested

---
 103280/TS_103_280.schema.json | 4 ++--
 103280/TS_103_280.xsd         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/103280/TS_103_280.schema.json b/103280/TS_103_280.schema.json
index f28294e..a2b9549 100644
--- a/103280/TS_103_280.schema.json
+++ b/103280/TS_103_280.schema.json
@@ -405,7 +405,7 @@
         "etsi280:end"
       ]
     },
-    "VLANIdNested": {
+    "VLANIdRangeNested": {
       "type": "object",
       "properties": {
         "VLANIdRange": {
@@ -425,7 +425,7 @@
           "type": "boolean"
         },
         "etsi280:nestedTags": {
-          "$ref": "#/$defs/VLANIdNested"
+          "$ref": "#/$defs/VLANIdRangeNested"
         }
       },
       "required": [
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index 6869df9..e903d20 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -284,7 +284,7 @@
             <xs:element name="end" type="VLANId"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="VLANIdNested">
+    <xs:complexType name="VLANIdRangeNested">
         <xs:sequence>
             <xs:element name="VLANIdRange" type="VLANIdRange" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
@@ -292,7 +292,7 @@
     <xs:complexType name="VLANTags">
         <xs:choice>
             <xs:element name="untagged" type="xs:boolean"/>
-            <xs:element name="nestedTags" type="VLANIdNested"/>
+            <xs:element name="nestedTags" type="VLANIdRangeNested"/>
         </xs:choice>
     </xs:complexType>
 </xs:schema>
-- 
GitLab