Commit 09b269b3 authored by Jason Graham's avatar Jason Graham
Browse files

Revert "Update file LI-PS-PDU.asn"

This reverts commit 2d81b3db
parent 2d81b3db
Loading
Loading
Loading
Loading
Loading
+54 −3
Original line number Diff line number Diff line
@@ -386,10 +386,12 @@ IRIPayload ::= SEQUENCE
        -- If the sessionDirection field is to be used for a given service then
        -- the exact meaning and use of the field will be described in the
        -- relevant service-specific details
    payloadDirection        [6] PayloadDirection OPTIONAL
    payloadDirection        [6] PayloadDirection OPTIONAL,
        -- If the payloadDirection field is to be used for a given service then
        -- the exact meaning and use of the field will be described in the
        -- relevant service-specific details
    locations               [7] Locations OPTIONAL
        -- This field is only required to be used when there are multiple locations to be reported out of an NF.
}

IRIType ::= ENUMERATED
@@ -479,6 +481,45 @@ GcseIRI ::= CHOICE
    ...
}

Locations ::= SEQUENCE
{
    networkProvidedLocations [1] LocationList OPTIONAL,
    cPEProvidedLocations     [2] LocationList OPTIONAL,
    otherLocations           [3] LocationList OPTIONAL --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI
}

LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below
{
    usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation
}


--These would only be needed if we chose [1] in LocationList

NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat

NewLocationFormat ::= SEQUENCE
{
    location [1] NewLocations--,
    -- locationProvenance [2] LocationProvenance
}

NewLocations ::= CHOICE
{
    umtsHI2Location               [0] UmtsHI2Operations.Location,
    epsLocation                   [1] EpsHI2Operations.EPSLocation,
    wlanLocationAttributes        [2] WlanLocationAttributes,
    eTSI671HI2Location            [3] HI2Operations.Location,
    threeGPP33128UserLocation     [4] TS33128Payloads.UserLocation,
    wGS84CoordinateDecimal        [5] Common-Parameters.WGS84CoordinateDecimal,
    pIDF-LO                       [6] XMLType 
    --I just realized that we probably don't need the Namespace element of this. The description of this would read something like what they say in 29.171:
    --"This IE contains a UTF-8 encoded PIDF-LO XML document as defined in IETF RFC 4119 [13]. 
    --The document shall only contain a civic address using the namespaces 
    --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr" per IETF RFC 5139 [14] and 
    --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr:ext" per IETF RFC 6848 [15].
}


-- ===========================
-- Definitions for TRI Payload
@@ -685,7 +726,9 @@ Location ::= SEQUENCE
    wlanLocationAttributes        [2] WlanLocationAttributes OPTIONAL,
    eTSI671HI2Location            [3] HI2Operations.Location OPTIONAL,
    threeGPP33128UserLocation     [4] TS33128Payloads.UserLocation OPTIONAL,
    cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL
    cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL,
    wGS84CoordinateDecimal        [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,
    pIDF-LO                       [7] XMLType OPTIONAL
}

WlanLocationAttributes ::= SEQUENCE
@@ -759,6 +802,14 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID
    -- module to preserve the original type name during the
    -- removal of imports from ETSI TS 101 671 [4].

-- just checking that this will compile
XMLType ::= SEQUENCE
{
    xMLNamespace [1] XMLNamespace,
    xMLValue     [2] XMLValue
}

XMLNamespace ::= UTF8String

XMLValue ::= UTF8String

END -- end of LI-PS-PDU