Commit 5b7194e8 authored by grahamj's avatar grahamj
Browse files

Update 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd,... 

Update 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd, 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd, 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd files
parent 53ab718f

33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+11 −123
Original line number Diff line number Diff line
@@ -3,57 +3,15 @@ 
           xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3"

           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"

           xmlns:common="http://uri.etsi.org/03280/common/2017/07"

           xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3"

           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3"/>



  <xs:complexType name="IdentityAssociationRequest">

    <xs:complexContent>

      <xs:extension base="x1:X1RequestMessage">

        <xs:sequence>

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

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="RequestDetails">

    <xs:sequence>

      <xs:element name="Type" type="DictionaryEntry"/>

      <xs:element name="ObservedTime" type="common:QualifiedDateTime"/>

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="RequestValues">

    <xs:sequence>

      <xs:element name="RequestValue" type="RequestValue" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="RequestValue">

    <xs:sequence>

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

      <xs:element name="Value" type="common:LongString"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="FormatType">

    <xs:sequence>

      <xs:element name="FormatOwner" type="common:ShortString"/>

      <xs:element name="FormatName" type="common:ShortString"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="DictionaryEntry">

    <xs:sequence>

      <xs:element name="Owner" type="common:ShortString"/>

      <xs:element name="Name" type="common:ShortString"/>

      <xs:element name="Value" type="common:ShortString"/>

    </xs:sequence>

  </xs:complexType>

  <xs:element name="IdentityAssociationRequest" type="liqr:LIQueryRequest"/>



  <xs:complexType name="IdentityAssociationResponse">

    <xs:complexContent>
@@ -81,92 +39,23 @@ 


  <xs:complexType name="IdentityAssociationRecord">

    <xs:sequence>

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

      <xs:element name="SUCI" type="SUCI" minOccurs="0"/>

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

      <xs:element name="PEI" type="PEI" minOccurs="0"/>

      <xs:element name="SUPI" type="liqr:SUPI"/>

      <xs:element name="SUCI" type="liqr:SUCI" minOccurs="0"/>

      <xs:element name="FiveGGUTI" type="liqr:FiveGGUTI"/>

      <xs:element name="PEI" type="liqr:PEI" minOccurs="0"/>

      <xs:element name="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"/>

      <xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>

      <xs:element name="FiveGSTAIList" type="FiveGSTAIList" minOccurs="0"/>

      <xs:element name="GPSI" type="GPSI" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="SUPI">

    <xs:choice>

      <xs:element name="SUPIIMSI" type="common:SUPIIMSI"/>

      <xs:element name="SUPINAI" type="common:SUPINAI"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="SUCI">

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

  </xs:simpleType>



  <xs:simpleType name="FiveGGUTI">

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

  </xs:simpleType>



  <xs:complexType name="PEI">

    <xs:choice>

      <xs:element name="PEIIMEI" type="common:PEIIMEI"/>

      <xs:element name="PEIIMEISV" type="common:PEIIMEISV"/>

      <xs:element name="PEIMAC" type="common:MACAddress"/>

    </xs:choice>

  </xs:complexType>

  

  <xs:complexType name="FiveGSTAIList">

    <xs:sequence>

      <xs:element name="FiveGSTAI" type="FiveGSTAI" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="FiveGSTAI">

    <xs:sequence>

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

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

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

      <xs:element name="NID" type="NID" minOccurs="0"/>

      <xs:element name="FiveGSTAIList" type="liqr:FiveGSTAIList" minOccurs="0"/>

      <xs:element name="GPSI" type="liqr:GPSI" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="GPSI">

    <xs:choice>

      <xs:element name="GPSIMSISDN" type="common:GPSIMSISDN"/>

      <xs:element name="GPSINAI" type="common:GPSINAI"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="MCC">

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

      <xs:pattern value="[0-9]{3}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="MNC">

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

      <xs:pattern value="[0-9]{2,3}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="TAC">

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

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

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="NID">

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

      <xs:pattern value="[A-Fa-f0-9]{11}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="ActivateAssociationUpdates">

    <xs:complexContent>

      <xs:extension base="x1:X1RequestMessage">

        <xs:sequence>

          <xs:element name="OngoingAssociationTaskID" type="common:UUID"></xs:element>

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

          <xs:element name="SUPI" type="liqr:SUPI"></xs:element>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>
@@ -214,7 +103,6 @@ 
    </xs:complexContent>

  </xs:complexType>





  <xs:complexType name="IdentityAssociationUpdateAcknowledgement">

    <xs:complexContent>

      <xs:extension base="x1:X1ResponseMessage">

33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd

0 → 100644
+163 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"

           xmlns="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3"

           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"

           xmlns:common="http://uri.etsi.org/03280/common/2017/07"

           xmlns:etsi103120common="http://uri.etsi.org/03120/common/2016/02/Common"

           targetNamespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>



  <xs:complexType name="LIQueryRequest">

    <xs:complexContent>

      <xs:extension base="x1:X1RequestMessage">

        <xs:sequence>

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

          <xs:element name="Flags" type="TaskFlags"/>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="RequestDetails">

    <xs:sequence>

      <xs:element name="Type" type="DictionaryEntry"/>

      <xs:element name="ObservedTime" type="common:QualifiedDateTime"/>

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="TaskFlags">

    <xs:sequence>

	  <xs:element name="TaskFlag" type="etsi103120common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded" />

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="RequestValues">

    <xs:sequence>

      <xs:element name="RequestValue" type="RequestValue" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="RequestValue">

    <xs:sequence>

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

      <xs:element name="Value" type="common:LongString"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="FormatType">

    <xs:sequence>

      <xs:element name="FormatOwner" type="common:ShortString"/>

      <xs:element name="FormatName" type="common:ShortString"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ErrorResponse">

    <xs:complexContent>

      <xs:extension base="x1:X1ResponseMessage">

        <xs:sequence>

          <xs:element name="errorInformation" type="ErrorInformation"/>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="ErrorInformation">

    <xs:sequence>

      <xs:element name="errorCode" type="xs:integer"/>

      <xs:element name="errorDescription" type="xs:string"/>

      <xs:element name="errorDetails" type="TS29571ProblemDetails"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="DictionaryEntry">

    <xs:sequence>

      <xs:element name="Owner" type="common:ShortString"/>

      <xs:element name="Name" type="common:ShortString"/>

      <xs:element name="Value" type="common:ShortString"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="SUPI">

    <xs:choice>

      <xs:element name="SUPIIMSI" type="common:SUPIIMSI"/>

      <xs:element name="SUPINAI" type="common:SUPINAI"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="SUCI">

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

  </xs:simpleType>



  <xs:simpleType name="FiveGGUTI">

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

  </xs:simpleType>



  <xs:complexType name="PEI">

    <xs:choice>

      <xs:element name="PEIIMEI" type="common:PEIIMEI"/>

      <xs:element name="PEIIMEISV" type="common:PEIIMEISV"/>

      <xs:element name="PEIMAC" type="common:MACAddress"/>

    </xs:choice>

  </xs:complexType>



  <xs:complexType name="FiveGSTAIList">

    <xs:sequence>

      <xs:element name="FiveGSTAI" type="FiveGSTAI" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="FiveGSTAI">

    <xs:sequence>

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

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

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

      <xs:element name="NID" type="NID" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="GPSI">

    <xs:choice>

      <xs:element name="GPSIMSISDN" type="common:GPSIMSISDN"/>

      <xs:element name="GPSINAI" type="common:GPSINAI"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="MCC">

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

      <xs:pattern value="[0-9]{3}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="MNC">

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

      <xs:pattern value="[0-9]{2,3}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="TAC">

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

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

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="NID">

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

      <xs:pattern value="[A-Fa-f0-9]{11}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="TS29571ProblemDetails">

    <xs:restriction base="xs:base64Binary"></xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="TS29518Location">

    <xs:restriction base="xs:base64Binary"></xs:restriction>

  </xs:simpleType>



</xs:schema>

33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"

           xmlns="urn:3GPP:ns:li:3GPPXLAExtensions:r17:v1"

           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"

           xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3"

           targetNamespace="urn:3GPP:ns:li:3GPPXLAExtensions:r17:v1"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r17:v3"/>



  <xs:element name="LocationAcquisitionRequest" type="liqr:LIQueryRequest"/>



  <xs:complexType name="LocationAcquisitionResponse">

    <xs:complexContent>

      <xs:extension base="x1:X1ResponseMessage">

        <xs:sequence>

          <xs:element name="ResponseDetails" type="LocationResponseDetails" minOccurs="0"/>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



<xs:element name="LIXQRResponse" type="LocationResponseDetails"/>



<xs:complexType name="LocationResponseDetails">

    <xs:sequence>

      <xs:element name="Locations" type="LocationRecords"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="LocationRecords">

    <xs:sequence>

      <xs:element name="LocationRecord" type="LocationRecord" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="LocationRecord">

    <xs:sequence>

      <xs:element name="Identifier" type="LocationAcquisitionIdentifier"/>

      <xs:element name="Location" type="liqr:TS29518Location"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="LocationAcquisitionIdentifier">

    <xs:choice maxOccurs="unbounded">

      <xs:element name="SUPI" type="liqr:SUPI"/>

    </xs:choice>

  </xs:complexType>



</xs:schema>