Commit 24f5f3fa authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents 583ad8a5 8f06aa3b

33128/r19/TS33128Payloads.asn

+66 −2
Original line number Diff line number Diff line
@@ -326,8 +326,11 @@ XIRIEvent ::= CHOICE 


    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation,



    -- 5G Personal IoT events, see clause 7.X.2

    fiveGPINAPPMessage                                  [188] FiveGPINAPPMessage,

    fiveGStartOfInterceptionWithPINClientInPIN          [189] FiveGStartOfInterceptionWithPINClientInPIN

}



-- ==============
@@ -637,7 +640,10 @@ IRIEvent ::= CHOICE 


    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation,

    -- 5G Personal IoT events, see clause 7.X.3

    fiveGPINAPPMessage                                  [188] FiveGPINAPPMessage,

    fiveGStartOfInterceptionWithPINClientInPIN          [189] FiveGStartOfInterceptionWithPINClientInPIN

}



IRITargetIdentifier ::= SEQUENCE
@@ -6002,6 +6008,64 @@ FiveGProSeMessage ::= CHOICE 
    fiveGProSeUsageInformationReportMessage [2] XMLType

}



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

-- 5G PIN Server definitions

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



-- See clause 7.X.2.2 for details of this structure

FiveGPINAPPMessage ::= SEQUENCE

{

    pINEIdentities            [1] PINEIdentities,

    mACAddress                [2] MACAddress OPTIONAL,

    pINID                     [3] PINID OPTIONAL,

    pINServerID               [4] PINServerID,

    pINAPPMessage             [5] XMLType

}



-- See clause 7.X.2.3 for details of this structure

FiveGStartOfInterceptionWithPINClientInPIN ::= CHOICE

{

    pINClientInPINS         [1] PINClientInPINS,

    pINClientsInPIN         [2] PINClientsInPIN

}



PINClientInPINS ::= SEQUENCE

{

    pINEIdentities          [1] PINEIdentities,

    mACAddress              [2] MACAddress OPTIONAL,

    pINServerID             [3] PINServerID,

    pINClientProfile        [4] XMLType,

    pINProfiles             [5] SEQUENCE OF PINProfile

}



PINClientsInPIN ::= SEQUENCE

{

    pINID                   [1] PINID,

    pINServerID             [2] PINServerID,

    pINClientProfiles       [3] SEQUENCE OF PINClientProfile,

    pINProfile              [4] XMLType

}



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

-- 5G PIN Server parameters

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



PINEIdentities ::= SEQUENCE (SIZE(1..MAX)) OF PINEIdentity



PINEIdentity ::= CHOICE

{

    pINClientID   [1] PINClientID,

    gPSI          [2] GPSI,

    identityToken [3] IdentityToken

}



PINClientID ::= UTF8String

IdentityToken ::= UTF8String

PINID ::= UTF8String

PINServerID ::= UTF8String

PINClientProfile ::=XMLType

PINProfile ::= XMLType



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

-- 5G LALS definitions

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

33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+21 −0
Original line number Diff line number Diff line
@@ -85,6 +85,27 @@ 
    </xs:restriction>

  </xs:simpleType>



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

<xs:complexType name="PINLIX1TargetIdentifier">

    <xs:choice>

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

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

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

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="PINClientID">

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

  </xs:simpleType>



  <xs:simpleType name="IdentityToken">

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

  </xs:simpleType>



  <xs:simpleType name="PINID">

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

  </xs:simpleType>



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



  <xs:complexType name="X1Extension">