Commit c12bf5c7 authored by Thomas Dodds's avatar Thomas Dodds Committed by canterburym
Browse files

Adjusted the GNbID, NGENbID, and ENbID types to match the 29.571 definition of... 

Adjusted the GNbID, NGENbID, and ENbID types to match the 29.571 definition of the IDs vs the previous attempt to convert ASN.1 BIT STRING.
parent 38eb29d1

33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd

+12 −52
Original line number Diff line number Diff line
@@ -316,70 +316,30 @@ 
    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="GNbID">

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

      <xs:pattern value="([A-Fa-f0-9]{6,32})"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="NGENbID">

    <xs:choice>

      <xs:element name="MacroNGENbID" type="MacroNGENbID"/>

      <xs:element name="ShortMacroNGENbID" type="ShortMacroNGENbID"/>

      <xs:element name="LongMacroNGENbID" type="LongMacroNGENbID"/>

    </xs:choice>

  <xs:complexType name="GNbID">

    <xs:sequence>

      <xs:element name="BitLength" type="xs:integer" minInclusive="22" maxInclusive="32"/>

      <xs:element name="GNbValue" type="GNbValue"/>

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="MacroNGENbID">

  <xs:simpleType name="GNbValue">

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

      <xs:pattern value="([A-Fa-f0-9]{5,20})"/>

      <xs:pattern value="([A-Fa-f0-9]{6,8})"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="ShortMacroNGENbID">

  <xs:simpleType name="NGENbID">

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

      <xs:pattern value="([A-Fa-f0-9]{5,18})"/>

      <xs:pattern value="(MacroNGeNB-[A-Fa-f0-9]{5}|ShortMacroNGeNB-[A-Fa-f0-9]{5}|LongMacroNGeNB-[A-Fa-f0-9]{6})"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="LongMacroNGENbID">

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

      <xs:pattern value="([A-Fa-f0-9]{6,21})"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="ENbID">

    <xs:choice>

      <xs:element name="MacroENbID" type="MacroENbID"/>

      <xs:element name="HomeENbID" type="HomeENbID"/>

      <xs:element name="ShortMacroENbID" type="ShortMacroENbID"/>

      <xs:element name="LongMacroENbID" type="LongMacroENbID"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="MacroENbID">

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

      <xs:pattern value="([A-Fa-f0-9]{5,20})"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="HomeENbID">

  <xs:simpleType name="ENbID">

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

      <xs:pattern value="([A-Fa-f0-9]{7,28})"/>

      <xs:pattern value="(MacroENB-[A-Fa-f0-9]{5}|HomeENB-[A-Fa-f0-9]{7}|ShortMacroENB-[A-Fa-f0-9]{5}|LongMacroENB-[A-Fa-f0-9]{6})"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="ShortMacroENbID">

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

      <xs:pattern value="([A-Fa-f0-9]{5,18})"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="LongMacroENbID">

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

      <xs:pattern value="([A-Fa-f0-9]{6,21})"/>

    </xs:restriction>

  </xs:simpleType>

  </xs:complexType>



  <xs:simpleType name="WAGFID">

    <xs:restriction base="common:LongString"/>