Commit 631eddd4 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA103' into 'main' 

Output from SA#103

See merge request !237
parents 7c349ccd 5b257135

.ecrc

0 → 100644
+10 −0
Original line number Diff line number Diff line 
{

    "Exclude" : [

        ".git",

        "\\.py",

        "33108",

        "33128/r17",

        "33128/r16",

        "33128/r15"

    ]

}

.editorconfig

+7 −2
Original line number Diff line number Diff line 
[**]

insert_final_newline = true



[**.{asn1,asn,xsd,xml}]

[**.{asn1,asn,json}]

indent_style = space

indent_size = 4

trim_trailing_whitespace = true



[**.{xsd, xml}]

indent_style = space

indent_size = 2

trim_trailing_whitespace = true

.gitlab-ci.yml

+10 −1
Original line number Diff line number Diff line
@@ -27,11 +27,20 @@ process_asn: 
    - python3 testing/asn_process.py



process_xsd:

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

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

  stage: check

  interruptible: true

  script:

    - python3 testing/xsd_process.py

    - python3 testing/lint_xml.py



editorconfig_check:

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

  stage: check

  interruptible: true

  script:

    - ec





generate_artefacts:

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

33128/r18/TS33128Dictionaries.xml

+81 −82
Original line number Diff line number Diff line
@@ -92,5 +92,4 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

<Dictionaries>

</Dictionaries>

33128/r18/TS33128IdentityAssociation.asn

+17 −5
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)}

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





DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=



BEGIN



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

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



iEFRecordOID RELATIVE-OID ::= {tS33128IdentityAssociationOID iEF(1)}
@@ -35,7 +35,8 @@ IEFAssociationRecord ::= SEQUENCE 
    sUCI            [7] SUCI OPTIONAL,

    pEI             [8] PEI OPTIONAL,

    fiveGSTAIList   [9] FiveGSTAIList OPTIONAL,

    gPSI            [10] GPSI OPTIONAL

    gPSI            [10] GPSI OPTIONAL,

    additionalCGIs  [11] AdditionalCGIs OPTIONAL

}



IEFDeassociationRecord ::= SEQUENCE
@@ -44,7 +45,8 @@ IEFDeassociationRecord ::= SEQUENCE 
    fiveGGUTI       [2] FiveGGUTI,

    timestamp       [3] GeneralizedTime,

    nCGI            [4] NCGI,

    nCGITime        [5] GeneralizedTime

    nCGITime        [5] GeneralizedTime,

    additionalCGIs  [6] AdditionalCGIs OPTIONAL

}



IEFKeepaliveMessage ::= SEQUENCE
@@ -54,6 +56,16 @@ IEFKeepaliveMessage ::= SEQUENCE 


FiveGGUTI ::= OCTET STRING (SIZE(10))



AdditionalCGIs ::= SEQUENCE

{

    additionalNCGIList [1] SEQUENCE (SIZE (1..MAX)) OF AdditionalNCGI OPTIONAL

}



AdditionalNCGI ::= SEQUENCE

{

    nCGI      [1] NCGI

}



NCGI ::= SEQUENCE

{

    pLMNID [1] PLMNID,