Commit f0d1bfdc authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA109' into 'main' 

Output from SA#109

See merge request !330
parents fc93beca 88d859fb

33128/r17/TS33128IdentityAssociation.asn

+2 −0
Original line number Diff line number Diff line 
TS33128IdentityAssociation

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r17(17) version0(0)}



-- OID using r17(17)version1(1) shall not be used in the present ASN.1 module as already used in a later release of the TS. 

-- Any future update shall start from r17(17)version2(2)



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

33128/r17/TS33128Payloads.asn

+2 −2
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) r17(17) version14(14)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version15(15)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,7 +9,7 @@ BEGIN 
-- Relative OIDs

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



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

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version15(15)}



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}

33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.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:3GPPX1Extensions:r17:v5"

           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v6"

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

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

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v6"

           elementFormDefault="qualified">



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

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

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

      <xs:element name="PDR" type="xs:hexBinary"/>

    </xs:choice>

  </xs:complexType>

33128/r18/TS33128IdentityAssociation.asn

+2 −2
Original line number Diff line number Diff line 
TS33128IdentityAssociation

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r17(17) version1(1)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r18(18) version0(0)}





DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=



BEGIN



tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r17(17) version1(1)}

tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r18(18) version0(0)}



iEFRecordOID RELATIVE-OID ::= {tS33128IdentityAssociationOID iEF(1)}

33128/r18/TS33128Payloads.asn

+40 −15
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) version12(12)}

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



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

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -1770,7 +1770,8 @@ AMFRegistration ::= SEQUENCE 
    fiveGSUpdateType                [28] FiveGSUpdateType OPTIONAL,

    uEAreaIndication                [29] UEAreaIndication OPTIONAL,

    establishmentCauseNon3GPPAccess [30] EstablishmentCauseNon3GPPAccess OPTIONAL,

    additionalUserIdentifiers       [31] UserIdentifiers OPTIONAL

    additionalUserIdentifiers       [31] UserIdentifiers OPTIONAL,

    alternativeNSSAI                [32] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.2.2.3 for details of this structure
@@ -1844,7 +1845,8 @@ AMFUnsuccessfulProcedure ::= SEQUENCE 
    gPSI                        [7] GPSI OPTIONAL,

    gUTI                        [8] FiveGGUTI OPTIONAL,

    location                    [9] Location OPTIONAL,

    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL

    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL,

    alternativeNSSAI            [11] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.2.2.8 on for details of this structure
@@ -1897,7 +1899,8 @@ AMFUEConfigurationUpdate ::= SEQUENCE 
    slice               [5] Slice OPTIONAL,

    serviceAreaList     [6] ServiceAreaList OPTIONAL,

    registrationResult  [7] AMFRegistrationResult OPTIONAL,

    sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL

    sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL,

    alternativeNSSAI    [9] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.2.2.10.2 for details of this structure
@@ -2309,7 +2312,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE 
    pCCRules                      [26] PCCRuleSet OPTIONAL,

    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL,

    satelliteBackhaulCategory     [28] SBIType OPTIONAL,

    gEOSatelliteID                [29] GEOSatelliteID OPTIONAL

    gEOSatelliteID                [29] GEOSatelliteID OPTIONAL,

    alternativeNSSAI              [30] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.3 for details of this structure
@@ -2336,7 +2340,9 @@ SMFPDUSessionModification ::= SEQUENCE 
    uPPathChange                [19] UPPathChange OPTIONAL,

    pFDDataForApp               [20] PFDDataForApp OPTIONAL,

    satelliteBackhaulCategory   [21] SBIType OPTIONAL,

    gEOSatelliteID              [22] GEOSatelliteID OPTIONAL

    gEOSatelliteID              [22] GEOSatelliteID OPTIONAL,

    -- Tag [23] is not used in this version of the specification

    alternativeNSSAI            [24] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.4 for details of this structure
@@ -2356,7 +2362,8 @@ SMFPDUSessionRelease ::= SEQUENCE 
    nGAPCause                   [12] NGAPCauseInt OPTIONAL,

    fiveGMMCause                [13] FiveGMMCause OPTIONAL,

    pCCRuleIDs                  [14] PCCRuleIDSet OPTIONAL,

    ePSPDNConnectionRelease     [15] EPSPDNConnectionRelease OPTIONAL

    ePSPDNConnectionRelease     [15] EPSPDNConnectionRelease OPTIONAL,

    alternativeNSSAI            [16] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.5 for details of this structure
@@ -2414,7 +2421,8 @@ SMFUnsuccessfulProcedure ::= SEQUENCE 
    rATType                     [17] RATType OPTIONAL,

    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,

    location                    [19] Location OPTIONAL,

    ePSPDNUnsuccessfulProcedure [20] EPSPDNUnsuccessfulProcedure OPTIONAL

    ePSPDNUnsuccessfulProcedure [20] EPSPDNUnsuccessfulProcedure OPTIONAL,

    alternativeNSSAI            [21] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.8 for details of this structure
@@ -2437,7 +2445,8 @@ SMFPDUtoMAPDUSessionModification ::= SEQUENCE 
    servingNetwork               [15] SMFServingNetwork OPTIONAL,

    handoverState                [16] HandoverState OPTIONAL,

    gTPTunnelInfo                [17] GTPTunnelInfo OPTIONAL,

    ePSPDNConnectionModification [18] EPSPDNConnectionModification OPTIONAL

    ePSPDNConnectionModification [18] EPSPDNConnectionModification OPTIONAL,

    alternativeNSSAI             [19] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.7.1 for details of this structure
@@ -2469,7 +2478,8 @@ SMFMAPDUSessionEstablishment ::= SEQUENCE 
    selectedDNN                   [24] DNN OPTIONAL,

    handoverState                 [25] HandoverState OPTIONAL,

    pCCRules                      [26] PCCRuleSet OPTIONAL,

    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL

    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL,

    alternativeNSSAI              [28] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.7.2 for details of this structure
@@ -2496,7 +2506,8 @@ SMFMAPDUSessionModification ::= SEQUENCE 
    pCCRules                     [19] PCCRuleSet OPTIONAL,

    uPPathChange                 [20] UPPathChange OPTIONAL,

    pFDDataForApp                [21] PFDDataForApp OPTIONAL,

    ePSPDNConnectionModification [22] EPSPDNConnectionModification OPTIONAL

    ePSPDNConnectionModification [22] EPSPDNConnectionModification OPTIONAL,

    alternativeNSSAI             [23] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.7.3 for details of this structure
@@ -2515,7 +2526,8 @@ SMFMAPDUSessionRelease ::= SEQUENCE 
    nGAPCause                   [11] NGAPCauseInt OPTIONAL,

    fiveGMMCause                [12] FiveGMMCause OPTIONAL,

    pCCRuleIDs                  [13] PCCRuleIDSet OPTIONAL,

    ePSPDNConnectionRelease     [14] EPSPDNConnectionRelease OPTIONAL

    ePSPDNConnectionRelease     [14] EPSPDNConnectionRelease OPTIONAL,

    alternativeNSSAI            [15] AlternativeNSSAIList OPTIONAL

}



-- See clause 6.2.3.2.7.4 for details of this structure
@@ -2568,7 +2580,8 @@ SMFMAUnsuccessfulProcedure ::= SEQUENCE 
    aMFID                       [14] AMFID OPTIONAL,

    hSMFURI                     [15] HSMFURI OPTIONAL,

    requestType                 [16] FiveGSMRequestType OPTIONAL,

    sMPDUDNRequest              [17] SMPDUDNRequest OPTIONAL

    sMPDUDNRequest              [17] SMPDUDNRequest OPTIONAL,

    alternativeNSSAI            [18] AlternativeNSSAIList OPTIONAL

}
@@ -6308,6 +6321,14 @@ AllowedNSSAI ::= SEQUENCE OF NSSAI 


AllowedTACs ::= SEQUENCE (SIZE(1..MAX)) OF TAC



AlternativeNSSAIEntry ::= SEQUENCE

{

    sNSSAIToBeReplaced [1] SNSSAI,

    alternativeSNSSAI  [2] SNSSAI

}



AlternativeNSSAIList ::= SEQUENCE (SIZE(1..8)) OF AlternativeNSSAIEntry



AreaOfInterest ::= SEQUENCE

{

    areaOfInterestTAIList     [1] AreaOfInterestTAIList OPTIONAL,
@@ -7818,7 +7839,11 @@ PositioningMethod ::= ENUMERATED 
    nRECID(12),

    uLTDOA(13),

    uLAOA(14),

    networkSpecific(15)

    networkSpecific(15),

    sLTDOA(16),

    sLTOA(17),

    sLAOA(18),

    sLRT(19)

}



-- TS 29.572 [24], clause 6.1.6.3.7