Commit bc095e55 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA105' into 'main' 

Output from SA#105

See merge request !271
parents da1dd5eb 3f7b0c5d

33128/r18/TS33128Dictionaries.xml

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ 
                <Value>IncludeNCGIInResponse</Value>

                <Meaning>A request for returning the NCGI and additional CGIs in the response.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>IncludeCSIInResponse</Value>

                <Meaning>A request for returning CellSupplementalInformation in the response.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                               <!--LIHILAFlags: see Clause 5.11.2.2 Table 5.11.2.2-1 -->

33128/r18/TS33128Payloads.asn

+19 −4
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version8(8)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version9(9)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=



BEGIN



IMPORTS



-- from ETSI TS 102 232-3 [6]

    IPIRIPacketReport

        FROM IPAccessPDU

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)};



-- end of IMPORTS



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

-- Relative OIDs

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



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version8(8)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version9(9)}



xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -266,7 +275,10 @@ XIRIEvent ::= CHOICE 


    -- UDM events, see clause 7.2.2.3, continued from tag 124

    uDMProSeTargetIdentifierDeconcealment               [159] UDMProSeTargetIdentifierDeconcealment,

    uDMProSeTargetAuthentication                        [160] UDMProSeTargetAuthentication

    uDMProSeTargetAuthentication                        [160] UDMProSeTargetAuthentication,



    -- IP Packet Report, see clause 6.2.3.9.5

    iPIRIPacketReport                                   [161] IPAccessPDU.IPIRIPacketReport

}



-- ==============
@@ -527,6 +539,8 @@ IRIEvent ::= CHOICE 
    -- UDM events, see clause 7.2.2.3, continued from tag 124

    uDMProSeTargetIdentifierDeconcealment               [159] UDMProSeTargetIdentifierDeconcealment,

    uDMProSeTargetAuthentication                        [160] UDMProSeTargetAuthentication



    -- Tag 161 is reserved because there is no equivalent IP Packet Report in IRIEvent.

}



IRITargetIdentifier ::= SEQUENCE
@@ -2996,7 +3010,8 @@ UDMSubscriberRecordChangeMethod ::= ENUMERATED 
    gPSIChange(3),

    uEDeprovisioning(4),

    unknown(5),

    serviceIDChange(6)

    serviceIDChange(6),

    multipleIDChanges(7)

}



UDMCancelLocationMethod ::= ENUMERATED

33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+2 −2
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:3GPPIdentityExtensions:r18: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:r18:v4" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v3" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v4" 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:r18:v5" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v4" 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:r18:v4"/>

  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v5"/>



  <xs:complexType name="IdentityAssociationRequest">

    <xs:complexContent>

33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd

+281 −1
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:r18:v4" 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:r18:v4" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v5" 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:r18:v5" elementFormDefault="qualified">



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

  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
@@ -163,6 +163,7 @@ 
      <xs:element name="NRCellID" type="NRCellID"/>

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

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

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

    </xs:sequence>

  </xs:complexType>
@@ -199,4 +200,283 @@ 
    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="CellSupplementalInformation">

    <xs:sequence>

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

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="RANCGI">

    <xs:choice>

      <xs:element name="RANNCGI" type="NCGIWithoutAssociationTime"/>

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

    </xs:choice>

  </xs:complexType>



  <xs:complexType name="CGI">

    <xs:sequence>

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="LAI">

    <xs:sequence>

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="LAC">

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

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

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="CellID">

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

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

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="CellSiteInformation">

    <xs:sequence>

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="Azimuth">

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

      <xs:minInclusive value="0"/>

      <xs:maxInclusive value="359"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="OperatorSpecificInformation">

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

  </xs:simpleType>



  <xs:complexType name="GeographicalCoordinates">

    <xs:sequence>

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="OGCURN">

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

  </xs:simpleType>



  <xs:complexType name="CellRadioRelatedInformation">

    <xs:choice>

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

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

    </xs:choice>

  </xs:complexType>



  <xs:complexType name="NGInformation">

    <xs:sequence>

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

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

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

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="GlobalRANNodeID">

    <xs:sequence>

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ANNodeID">

    <xs:choice>

      <xs:element name="N3IWFID" type="N3IWFIDSBI"/>

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

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

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

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

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

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="N3IWFIDSBI">

    <xs:restriction base="common:ShortString">

      <xs:pattern value="([A-Fa-f0-9])"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="GNbID">

    <xs:sequence>

      <xs:element name="BitLength" type="GNbIDLength"/>

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="GNbIDLength">

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

      <xs:minInclusive value="22"/>

      <xs:maxInclusive value="32"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="GNbValue">

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

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

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="NGENbID">

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

      <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="ENbID">

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

      <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="WAGFID">

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

  </xs:simpleType>



  <xs:simpleType name="TNGFID">

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

  </xs:simpleType>



  <xs:complexType name="RANNodeName">

    <xs:choice>

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

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

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="RANNodeNameVisible">

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

      <xs:pattern value="([A-Fa-f0-9])"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="SupportedTAList">

    <xs:sequence>

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="TAItem">

    <xs:sequence>

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="BroadcastPLMNItem">

    <xs:sequence>

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="RATInformation">

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

      <xs:enumeration value="Unlicensed"/>

      <xs:enumeration value="NBIoT"/>

      <xs:enumeration value="NRLEO"/>

      <xs:enumeration value="NRMEO"/>

      <xs:enumeration value="NRGEO"/>

      <xs:enumeration value="NROTHERSAT"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="TAISliceSupportList">

    <xs:sequence>

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="SNSSAI">

    <xs:sequence>

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

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="SliceServiceType">

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

      <xs:minInclusive value="0"/>

      <xs:maxInclusive value="255"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="SliceDifferentiator">

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

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

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="MappedHPLMNSliceServiceType">

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

      <xs:minInclusive value="0"/>

      <xs:maxInclusive value="255"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="MappedHPLMNSliceDifferentiator">

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

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

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="PLMNSupportList">

    <xs:sequence>

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="PLMNSupportItem">

    <xs:sequence>

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="F1Information">

    <xs:sequence>

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

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

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

      <xs:element name="GNBDUServedCells" type="RANCGI" minOccurs="1" maxOccurs="unbounded"/>

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="GNBDUID">

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

      <xs:minInclusive value="0"/>

      <xs:maxInclusive value="68719476735"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="RFBand">

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

  </xs:simpleType>



</xs:schema>

33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd

+2 −2
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:r18:v4" 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:r18:v4" targetNamespace="urn:3GPP:ns:li:3GPPXLAExtensions:r18:v4" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPXLAExtensions:r18:v5" 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:r18:v5" targetNamespace="urn:3GPP:ns:li:3GPPXLAExtensions:r18:v5" 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:r18:v4"/>

  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v5"/>



  <xs:complexType name="LocationAcquisitionRequest">

    <xs:complexContent>