Commit b0fdde42 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA98e' into 'main' 

Output of SA98e

See merge request !115
parents fc8c4571 7994b612

.gitlab-ci.yml

+11 −1
Original line number Diff line number Diff line
@@ -6,9 +6,19 @@ workflow: 
    - if: $CI_COMMIT_BRANCH



stages:

  - preflight

  - check

  - build



preflight:

  image: "forge.3gpp.org:5050/sa3/li/forgelib"

  stage: preflight

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  interruptible: true

  script:

    - forgelib-preflight https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_MERGE_REQUEST_IID



process_asn:

  image: "forge.3gpp.org:5050/sa3/li/asn1test:latest"

  stage: check
@@ -24,7 +34,7 @@ process_xsd: 
    - python3 testing/xsd_process.py



generate_artefacts:

  image: "forge.3gpp.org:5050/sa3/li/artefacts:latest"

  image: "forge.3gpp.org:5050/sa3/li/forgelib"

  stage: build

  interruptible: true

  rules:

33128/r16/TS33128Payloads.asn

+10 −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) r16(16) version11(11)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version12(12)}



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

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



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version11(11)}

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -254,7 +254,15 @@ CCPDU ::= CHOICE 
    uPFCCPDU            [1] UPFCCPDU,

    extendedUPFCCPDU    [2] ExtendedUPFCCPDU,

    mMSCCPDU            [3] MMSCCPDU,



    -- In Rel-17 and newer (threeGPP(4) ts33128(19) r17(17) version1(1)),

    -- tag 4 is nIDDCCPDU and tag 5 is pTCCCPDU.

    -- Rel-16 decoders should not decode tag 4 contents as PTCCCPDU if

    -- r17 or newer is used in cCPayloadOID.

    pTCCCPDU            [4] PTCCCPDU



    -- Tag 5 is reserved for pTCCCPDU in Rel-17 and newer.



}



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

33128/r17/TS33128Payloads.asn

+150 −94
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) version5(5)}

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



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

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -190,7 +190,12 @@ XIRIEvent ::= CHOICE 
    positioningInfoTransfer                             [111] AMFPositioningInfoTransfer,



    -- MME Events, see clause 6.3.2.2.8

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,



    -- Tags 113 to 131 are not used in this version of the specification



    -- AMF events, see 6.2.2.2.9, continued from tag 111

    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate

}



-- ==============
@@ -373,7 +378,12 @@ IRIEvent ::= CHOICE 
    positioningInfoTransfer                             [111] AMFPositioningInfoTransfer,



    -- MME Events, see clause 6.3.2.2.8

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer

    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,



    -- Tags 113 to 131 are not used in this version of the specification



    -- AMF events, see 6.2.2.3, continued from tag 111

    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate

}



IRITargetIdentifier ::= SEQUENCE
@@ -397,8 +407,14 @@ CCPDU ::= CHOICE 
    uPFCCPDU            [1] UPFCCPDU,

    extendedUPFCCPDU    [2] ExtendedUPFCCPDU,

    mMSCCPDU            [3] MMSCCPDU,



    -- In Rel-16 (threeGPP(4) ts33128(19) r16(16) version9(9)),

    -- tag 4 is pTCCCPDU and tag 5 is not used.

    -- Rel-17 or newer decoders should decode tag 4 contents as PTCCCPDU if

    -- r16 is used in cCPayloadOID.

    nIDDCCPDU           [4] NIDDCCPDU,

    pTCCCPDU            [5] PTCCCPDU,



    iMSCCPDU            [6] IMSCCPDU

}
@@ -1232,6 +1248,19 @@ AMFPositioningInfoTransfer ::= SEQUENCE 
    lcsCorrelationId            [8] UTF8String (SIZE(1..255))

}



--See clause 6.2.2.2.9 on for details of this structure

AMFUEConfigurationUpdate ::= SEQUENCE

{

    userIdentifiers     [1] UserIdentifiers,

    gUTI                [2] GUTI,

    oldGUTI             [3] EPS5GGUTI OPTIONAL,

    fiveGSTAIList       [4] TAIList OPTIONAL,

    slice               [5] Slice OPTIONAL,

    serviceAreaList     [6] ServiceAreaList OPTIONAL,

    registrationResult  [7] AMFRegistrationResult OPTIONAL,

    sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL

}



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

-- 5G AMF parameters

-- =================
@@ -1286,6 +1315,9 @@ AMFRegistrationType ::= ENUMERATED 


AMFSetID ::= INTEGER (0..1023)



-- TS 24.501 [13], clause 9.11.3.49

ServiceAreaList ::= OCTET STRING (SIZE(4..112))



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

-- 5G SMF definitions

-- ==================
@@ -1441,7 +1473,8 @@ SMFPDUtoMAPDUSessionModification ::= SEQUENCE 
    uEEndpoint                   [14] UEEndpointAddress OPTIONAL,

    servingNetwork               [15] SMFServingNetwork OPTIONAL,

    handoverState                [16] HandoverState OPTIONAL,

    gTPTunnelInfo               [17] GTPTunnelInfo OPTIONAL

    gTPTunnelInfo                [17] GTPTunnelInfo OPTIONAL,

    ePSPDNConnectionModification [18] EPSPDNConnectionModification OPTIONAL

}



-- See clause 6.2.3.2.7.1 for details of this structure
@@ -1472,7 +1505,8 @@ SMFMAPDUSessionEstablishment ::= SEQUENCE 
    ePS5GSComboInfo               [23] EPS5GSComboInfo OPTIONAL,

    selectedDNN                   [24] DNN OPTIONAL,

    handoverState                 [25] HandoverState OPTIONAL,

    pCCRules                    [26] PCCRuleSet OPTIONAL

    pCCRules                      [26] PCCRuleSet OPTIONAL,

    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL

}



-- See clause 6.2.3.2.7.2 for details of this structure
@@ -1498,7 +1532,8 @@ SMFMAPDUSessionModification ::= SEQUENCE 
    handoverState                [18] HandoverState OPTIONAL,

    pCCRules                     [19] PCCRuleSet OPTIONAL,

    uPPathChange                 [20] UPPathChange OPTIONAL,

    pFDDataForApp               [21] PFDDataForApp OPTIONAL

    pFDDataForApp                [21] PFDDataForApp OPTIONAL,

    ePSPDNConnectionModification [22] EPSPDNConnectionModification OPTIONAL

}



-- See clause 6.2.3.2.7.3 for details of this structure
@@ -1516,7 +1551,8 @@ SMFMAPDUSessionRelease ::= SEQUENCE 
    cause                       [10] SMFErrorCodes OPTIONAL,

    nGAPCause                   [11] NGAPCauseInt OPTIONAL,

    fiveGMMCause                [12] FiveGMMCause OPTIONAL,

    pCCRuleIDs                  [13] PCCRuleIDSet OPTIONAL

    pCCRuleIDs                  [13] PCCRuleIDSet OPTIONAL,

    ePSPDNConnectionRelease     [14] EPSPDNConnectionRelease OPTIONAL

}



-- See clause 6.2.3.2.7.4 for details of this structure
@@ -1546,7 +1582,8 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE 
    ePS5GSComboInfo                                    [22] EPS5GSComboInfo OPTIONAL,

    uEEPSPDNConnection                                 [23] UEEPSPDNConnection OPTIONAL,

    pCCRules                                           [24] PCCRuleSet OPTIONAL,

    pFDDataForApps              [25] PFDDataForApps OPTIONAL

    pFDDataForApps                                     [25] PFDDataForApps OPTIONAL,

    ePSStartOfInterceptionWithEstablishedPDNConnection [26] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL

}



-- See clause 6.2.3.2.7.5 for details of this structure
@@ -4065,6 +4102,19 @@ FiveGGUTI ::= SEQUENCE 
    fiveGTMSI   [6] FiveGTMSI

}



FiveGSSubscriberID ::= CHOICE

{

    sUPI [1] SUPI,

    sUCI [2] SUCI,

    pEI  [3] PEI,

    gPSI [4] GPSI

}



FiveGSSubscriberIDs ::= SEQUENCE

{

   fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID

}



FiveGMMCause ::= INTEGER (0..255)



FiveGSMRequestType ::= ENUMERATED
@@ -4427,6 +4477,12 @@ UEEndpointAddress ::= CHOICE 
    ethernetAddress     [3] MACAddress

}



UserIdentifiers ::= SEQUENCE

{

    fiveGSSubscriberIDs [1] FiveGSSubscriberIDs OPTIONAL,

    ePSSubscriberIDs    [2] EPSSubscriberIDs OPTIONAL

}



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

-- Location parameters

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

33128/r18/TS33128Dictionaries.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<Dictionaries xmlns="http://uri.etsi.org/03280/common/2019/10/Dictionaries">

	<Dictionary>   											<!--ObjectType: see Clause 6.4.8 Table 6.14 -->

		<Owner>3GPP</Owner>

		<Name>ServiceType</Name>

		<DictionaryEntries>

			<DictionaryEntry>

				<Value>Voice</Value>

				<Meaning>Service scoping shall include the Voice service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>Data</Value>

				<Meaning>Service scoping shall include the Data service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>Messaging</Value>

				<Meaning>Service scoping shall include the Messaging service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>PTC</Value>

				<Meaning>Service scoping shall include the Push-to-Talk service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>LALS</Value>

				<Meaning>Service scoping shall include the LALS service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>RCS</Value>

				<Meaning>Service scoping shall include the RCS service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

<Dictionaries>

33128/r18/TS33128Payloads.asn

+422 −158

File changed.

Preview size limit exceeded, changes collapsed.