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

TS 103 280 CR0025 - simplify VLANID 

Rename VLANId to VLANID, and change range to 0..4095
Remove VLANIdRange, VLANIdRangeNested, VLANTags.
Add VLANIDNested to XML.
parent e519d4de

103280/TS_103_280.asn1

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

103280/TS_103_280.xsd

+5 −17
Original line number Diff line number Diff line
@@ -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>