Commit d0760570 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102232-1/111' into 'meeting/LI68' 

102232 1 CR 111 - Addition of CPEProvidedLocation to location sequence

See merge request !209
parents 68a7da4f 7945f1c2

102232-1/LI-PS-PDU.asn

+14 −6
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ IMPORTS 
    -- Any of the IMPORTs may be commented out if they are not used (see clause A.3)



    -- from ETSI TS 103 280 [44]

    LIID

    LIID,

    WGS84CoordinateDecimal

        FROM Common-Parameters

        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version251(251)}
@@ -683,7 +684,8 @@ Location ::= SEQUENCE 
    ...,

    wlanLocationAttributes          [2] WlanLocationAttributes OPTIONAL,

    eTSI671HI2Location              [3] HI2Operations.Location OPTIONAL,

    threeGPP33128UserLocation   [4] TS33128Payloads.UserLocation OPTIONAL

    threeGPP33128UserLocation       [4] TS33128Payloads.UserLocation OPTIONAL,

    cPEProvidedLocationAttributes   [5] CPEProvidedLocationAttributes OPTIONAL

}



WlanLocationAttributes ::= SEQUENCE
@@ -693,6 +695,12 @@ WlanLocationAttributes ::= SEQUENCE 
    ...

}



CPEProvidedLocationAttributes ::= SEQUENCE

{

    wGS84CoordinateDecimal [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,

    ...

}



IPAddress ::= SEQUENCE

    -- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied

    -- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in

testing/asn_process.py

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ duplicateObjects = { 
def fixDuplicateObjects(filename):

    stringContent = filename.read_text()

    for object in duplicateObjects[filename.as_posix()]:

        stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=')

        stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1)

        stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}')

        #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent)