Commit a6268819 authored by mewburn's avatar mewburn Committed by Mark Canterbury
Browse files

TS 103 280 CR0025 - Add VLAN types

parent e16c7c63

103280/TS_103_280.asn1

+8 −0
Original line number Diff line number Diff line
@@ -93,4 +93,12 @@ NAI ::= UTF8String 


IPProtocol ::= INTEGER (0..255)



VLANId ::= INTEGER (1..4094)



VLANIdRange ::= SEQUENCE

{

    start [0] VLANId,

    end   [1] VLANId

}



END

103280/TS_103_280.schema.json

+48 −0
Original line number Diff line number Diff line
@@ -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"

      ]

    }

  }

}

103280/TS_103_280.xsd

+23 −0
Original line number Diff line number Diff line
@@ -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>