Commit 57d3b337 authored by canterburym's avatar canterburym
Browse files

Reverting R17 changes

parent 8cc05974

33128/r17/TS33128Payloads.asn

+3 −27
Original line number Diff line number Diff line
@@ -190,10 +190,7 @@ XIRIEvent ::= CHOICE 
    positioningInfoTransfer                             [111] AMFPositioningInfoTransfer,



    -- MME Events, see clause 6.3.2.2.8

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,



    -- Location Acquisition response, see clause 5.X.2.3

    locationResponseDetails                             [9999] LocationResponseDetails

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer

}



-- ==============
@@ -376,10 +373,7 @@ IRIEvent ::= CHOICE 
    positioningInfoTransfer                             [111] AMFPositioningInfoTransfer,



    -- MME Events, see clause 6.3.2.2.8

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,



    -- Location Acquisition response, see clause 5.X.2.3

    locationResponseDetails                             [9999] LocationResponseDetails

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer

}



IRITargetIdentifier ::= SEQUENCE
@@ -3718,21 +3712,6 @@ SeparatedLocationReporting ::= SEQUENCE 
    rATType                     [8] RATType OPTIONAL

}



-- =========================================

-- Location Acquisition Response definitons

-- =========================================



LocationResponseDetails ::= SEQUENCE

{

    sUPI                        [1] SUPI,

    locations                   [1] SEQUENCE OF LocationRecord

}



LocationRecord ::= SEQUENCE

{

    location                    [1] Location

}



-- =================

-- Common Parameters

-- =================
@@ -4118,8 +4097,7 @@ Location ::= SEQUENCE 
    locationInfo                [1] LocationInfo OPTIONAL,

    positioningInfo             [2] PositioningInfo OPTIONAL,

    locationPresenceReport      [3] LocationPresenceReport OPTIONAL,

    ePSLocationInfo             [4] EPSLocationInfo OPTIONAL,

    tS29518ProvideLocInfo       [5] SBIType OPTIONAL

    ePSLocationInfo             [4] EPSLocationInfo OPTIONAL

}



CellSiteInformation ::= SEQUENCE
@@ -4788,6 +4766,4 @@ OGCURN ::= UTF8String 
-- TS 29.572 [24], clause 6.1.6.2.15

MethodCode ::= INTEGER (16..31)



SBIType ::= UTF8String



END

33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+123 −11
Original line number Diff line number Diff line
@@ -3,15 +3,57 @@ 
           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:element name="IdentityAssociationRequest" type="liqr:LIQueryRequest"/>

  <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:complexType name="IdentityAssociationResponse">

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


  <xs:complexType name="IdentityAssociationRecord">

    <xs:sequence>

      <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="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="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"/>

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

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

      <xs:element name="GPSI" type="liqr:GPSI" 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: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="liqr:SUPI"></xs:element>

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

        </xs:sequence>

      </xs:extension>

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

  </xs:complexType>





  <xs:complexType name="IdentityAssociationUpdateAcknowledgement">

    <xs:complexContent>

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