Commit 05b8f51c authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA111' into 'main' 

Output of SA#111

See merge request !351
parents cdbb0130 4713f71c

33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+3 −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:r16:v4"

           xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v5"

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

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

           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v4"

           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v5"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
@@ -111,6 +111,7 @@ 
      <xs:element name="PEIIMEI" type="common:PEIIMEI"/>

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

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

      <xs:element name="PEIEUI64" type="common:EUI64"/>

    </xs:choice>

  </xs:complexType>

33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+3 −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:r17:v4"

           xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v5"

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

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

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

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

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
@@ -113,6 +113,7 @@ 
      <xs:element name="PEIIMEI" type="common:PEIIMEI"/>

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

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

      <xs:element name="PEIEUI64" type="common:EUI64"/>

    </xs:choice>

  </xs:complexType>

33128/r18/TS33128Payloads.asn

+14 −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) version13(13)}

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



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -18,7 +18,7 @@ IMPORTS 
-- Relative OIDs

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -6612,9 +6612,19 @@ IMSI ::= NumericString (SIZE(6..15)) 
IMSIUnauthenticatedIndication ::= BOOLEAN



IMSSubscriberIDs ::= CHOICE

{

    -- deprecatedIMPI and deprecatedIMPU were deprecated in r(18) version15(15)

    deprecatedIMPI        [1] IMPI,

    deprecatedIMPU        [2] IMPU,

    iMSSubscriberIDs      [3] SEQUENCE (SIZE (1..MAX)) OF IMSSubscriberIdentity

}



IMSSubscriberIdentity ::= CHOICE

{

    iMPI [1] IMPI,

    iMPU        [2] IMPU

    iMPU [2] IMPU,

    pEI  [3] PEI,

    iMEI [4] IMEI

}



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

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



  <xs:complexType name="IdentityAssociationRequest">

    <xs:complexContent>

33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd

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



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

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

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

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

      <xs:element name="PEIEUI64" type="common:EUI64"/>

    </xs:choice>

  </xs:complexType>