Commit 55d92fc0 authored by Ben Beeston's avatar Ben Beeston Committed by Mark Canterbury
Browse files

Update to put the new complex types outside of the choice

parent 3a0bb2c1

103221-1/TS_103_221_01.xsd

+12 −10
Original line number Diff line number Diff line
@@ -176,18 +176,10 @@ 
            <xs:element name="ipv6Cidr" type="etsi103280:IPv6CIDR"/>

            <xs:element name="tcpPort" type="etsi103280:TCPPort"/>

            <xs:element name="tcpPortRange" type="etsi103280:TCPPortRange"/>

            <xs:complexType name="TCPPortList">

                <xs:sequence>

                    <xs:element name="tcpPort" type="etsi103280:TCPPort" minOccurs="1" maxOccurs="unbounded"/>

                </xs:sequence>

            </xs:complexType>

            <xs:element name="tcpPortList" type="TCPPortList"/>

            <xs:element name="udpPort" type="etsi103280:UDPPort"/>

            <xs:element name="udpPortRange" type="etsi103280:UDPPortRange"/>

            <xs:complexType name="UDPPortList">

                <xs:sequence>

                    <xs:element name="udpPort" type="etsi103280:udpPort" minOccurs="1" maxOccurs="unbounded"/>

                </xs:sequence>

            </xs:complexType>

            <xs:element name="udpPortList" type="UDPPortList"/>

            <xs:element name="emailAddress" type="etsi103280:EmailAddress"/>

            <xs:element name="internationalizedEmailAddress" type="etsi103280:InternationalizedEmailAddress"/>

            <xs:element name="sipUri" type="etsi103280:SIPURI"/>
@@ -215,6 +207,16 @@ 
            <xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="TCPPortList">

        <xs:sequence>

            <xs:element name="tcpPort" type="etsi103280:TCPPort" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="UDPPortList">

        <xs:sequence>

            <xs:element name="udpPort" type="etsi103280:UDPPort" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="GtpTunnelId">

        <xs:restriction base="xs:integer">

            <xs:minInclusive value="0"/>