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

Merge branch 'cr/102657/0147' into 'meeting/LI66' 

Cr/102657/0147 -  Addition of Cellular-Network-Info Header to MultimediaServiceUsage

See merge request li/schemas-definitions!143
parents 8d155ebd 62dc4c20

102657/RDMessage.asn

+26 −1
Original line number Diff line number Diff line
@@ -1988,7 +1988,8 @@ MultimediaPartyInformation ::= SEQUENCE 
    octetsDownloaded                    [16] INTEGER OPTIONAL,

    accessNetworkInformation            [17] SEQUENCE OF AccessNetworkInfo OPTIONAL,

    privateUserIdentity                 [18] IMPI OPTIONAL,

    iMEI                                [19] IMEI OPTIONAL

    iMEI                                [19] IMEI OPTIONAL,

    cellularNetworkInfo                 [20] CellularNetworkInfo OPTIONAL

}



MultimediaCallID    ::= UTF8String
@@ -2110,6 +2111,30 @@ PaniHeaderInfo ::= SEQUENCE 
        -- Complete content of the P-Access-Network-Info header field

}



CellularNetworkInfo  ::= SEQUENCE

{

    accessType          [1] UTF8String OPTIONAL,

        -- ASCII string "3GPP-GERAN","3GPP-UTRAN-FDD", ... : see ETSI TS 124 229 [xx] clause 7.2.15.3

    cellularAccessInfo  [2] CellularAccessInfo OPTIONAL,

    cniHeaderContent    [3] UTF8String OPTIONAL,

        -- Complete content of the Cellular-Network-Info header field

    ...

}



CellularAccessInfo  ::= SEQUENCE

{

    cgi3gpp             [1] UTF8String OPTIONAL,

        -- cgi-3gpp parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    utranCellId3gpp     [2] UTF8String OPTIONAL,

        -- utran-cell-id-3gpp parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    ci3gpp2             [3] UTF8String OPTIONAL,

        -- ci-3gpp2 parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    ci3gpp2femto        [4] UTF8String OPTIONAL,

        -- ci-3gpp2-femto parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    cellInfoAge         [5] INTEGER OPTIONAL,

        -- cell-info-age parameter. See ETSI TS 124 229 [xx] clause 7.2.15.3

    ...

}



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

-- Definitions of Billing Data

102657/RDMessage.xsd

+18 −0
Original line number Diff line number Diff line
@@ -2961,6 +2961,7 @@ 
                    </xsd:choice>

                </xsd:complexType>

            </xsd:element>

            <xsd:element name="cellularNetworkInfo" type="CellularNetworkInfo" minOccurs="0"/>

            <xsd:element name="privateUserIdentity" type="IMPI" minOccurs="0"/>

            <xsd:element name="iMEI" type="IMEI" minOccurs="0"/>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
@@ -3270,6 +3271,23 @@ 
            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

        </xsd:choice>

    </xsd:complexType>

    <xsd:complexType name="CellularNetworkInfo">

        <xsd:sequence>

            <xsd:element name="accessType" type="xsd:string" minOccurs="0"/>

            <xsd:element name="cellularAccessInfo" type="CellularAccessInfo" minOccurs="0"/>

            <xsd:element name="cinHeaderContent" type="xsd:hexBinary" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:complexType name="CellularAccessInfo">

        <xsd:sequence>

            <xsd:element name="cgi3gpp" type="xsd:string" minOccurs="0"/>

            <xsd:element name="utranCellId3gpp" type="xsd:string" minOccurs="0"/>

            <xsd:element name="ci3gpp2" type="xsd:string" minOccurs="0"/>

            <xsd:element name="ci3gpp2femto" type="xsd:string" minOccurs="0"/>

            <xsd:element name="cellInfoAge" type="xsd:integer" minOccurs="0"/>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:simpleType name="MultimediaDeviceID">

        <xsd:restriction base="xsd:hexBinary"/>

    </xsd:simpleType>