Merge branch 'cr/33128/0288' into 'meeting/SA94e'

TS 33128 CR0288 - GPSI for IAC

See merge request li-trial!117

33128/r17/TS33128IdentityAssociation.asn

 TS33128IdentityAssociation
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r16(16) version2(2)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r17(17) version0(0)}
 
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
 
 BEGIN
 
-tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r16(16) version2(2)}
+tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r17(17) version0(0)}
 
 iEFRecordOID RELATIVE-OID ::= {tS33128IdentityAssociationOID iEF(1)}
 
@@ -34,7 +34,8 @@ IEFAssociationRecord ::= SEQUENCE
     nCGITime        [6] GeneralizedTime,
     sUCI            [7] SUCI OPTIONAL,
     pEI             [8] PEI OPTIONAL,
-    fiveGSTAIList   [9] FiveGSTAIList OPTIONAL
+    fiveGSTAIList   [9] FiveGSTAIList OPTIONAL,
+    gPSI            [10] GPSI OPTIONAL
 }
 
 IEFDeassociationRecord ::= SEQUENCE
@@ -95,5 +96,12 @@ EUI64 ::= OCTET STRING (SIZE(8))
 
 SUCI ::= OCTET STRING (SIZE(8..3008))
 
+GPSI ::= CHOICE
+{
+    gPSIMSISDN  [1] MSISDN,
+    gPSINAI     [2] NAI
+}
+
+MSISDN ::= NumericString (SIZE(1..15))
 
 END
\ No newline at end of file

33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v2"
+           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"
-           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v2"
+           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3"
            elementFormDefault="qualified">
 
   <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
@@ -88,6 +88,7 @@
       <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>
 
@@ -129,6 +130,13 @@
     </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>