Commit 1cc78570 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents 24f5f3fa 042c525b

33128/r19/TS33128Payloads.asn

+130 −2
Original line number Diff line number Diff line
@@ -330,7 +330,10 @@ XIRIEvent ::= CHOICE 


    -- 5G Personal IoT events, see clause 7.X.2

    fiveGPINAPPMessage                                  [188] FiveGPINAPPMessage,

    fiveGStartOfInterceptionWithPINClientInPIN          [189] FiveGStartOfInterceptionWithPINClientInPIN

    fiveGStartOfInterceptionWithPINClientInPIN          [189] FiveGStartOfInterceptionWithPINClientInPIN,



    -- Charging data event records, see clause 7.X

    chargingDataEvent                                   [190] ChargingDataEvent

}



-- ==============
@@ -641,9 +644,13 @@ IRIEvent ::= CHOICE 
    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation,



    -- 5G Personal IoT events, see clause 7.X.3

    fiveGPINAPPMessage                                  [188] FiveGPINAPPMessage,

    fiveGStartOfInterceptionWithPINClientInPIN          [189] FiveGStartOfInterceptionWithPINClientInPIN

    fiveGStartOfInterceptionWithPINClientInPIN          [189] FiveGStartOfInterceptionWithPINClientInPIN,



    -- Charging data event records, see clause 7.X

    chargingDataEvent                                   [190] ChargingDataEvent

}



IRITargetIdentifier ::= SEQUENCE
@@ -6734,6 +6741,127 @@ RoamingStatusUpdateInfo ::= SEQUENCE 
    iMSI           [1] IMSI OPTIONAL,

    pLMNID         [2] PLMNID OPTIONAL

}



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

-- Charging Data Definitions

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



ChargingDataEvent ::= SEQUENCE

{

    location                [1] Location OPTIONAL,

    chargingDataInformation [2] ChargingDataInformation

}



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

-- Charging Data Parameters

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



ChargingDataInformation ::= CHOICE

{

    nchfChargingDataRequest    [1] NchfChargingDataRequest,

    rfChargingDataRequest      [2] RfChargingDataRequest,

    translatedChargingDataInfo [3] TranslatedChargingDataInfo

}



NchfChargingDataRequest ::= SEQUENCE

{

    sBIchargingData   [1] SBIChargingData,

    nchfChargingEvent [2] NchfChargingEvent OPTIONAL,

    roamerInOut       [3] RoamerInOut

}



SBIChargingData ::= CHOICE

{

    fullSBIChargingData    [1] EncapsulatedSBIChargingData

}



EncapsulatedSBIChargingData ::= CHOICE

{

    encapsulatedSBIConvergedChargingData [1] SBIType,

    encapsulatedSBIOfflineChargingData   [2] SBIType

}



NchfChargingEvent ::= ENUMERATED

{

    pDUSessionChargingInformation(1),

    sMSChargingInformation(2),

    nEFChargingInformation(3),

    registrationChargingInformation(4),

    n2ConnectionChargingInformation(5),

    locationReportingChargingInformation(6),

    nSPAChargingInformation(7),

    nSMChargingInformation(8),

    mMTelChargingInformation(9),

    iMSChargingInformation(10),

    edgeInfrastructureUsageChargingInformation(11),

    eASDeploymentChargingInformation(12),

    directEdgeEnablingServiceChargingInformation(13),

    exposedEdgeEnablingServiceChargingInformation(14),

    proSeChargingInformation(15),

    mMSChargingInformation(16),

    mBSSessionChargingInformation(17),

    tSNChargingInformation(18),

    nSACFChargingInformation(19),

    nSSAAChargingInformation(20),

    rangingSLChargingInformation(21)

}



RoamerInOut ::= ENUMERATED

{

    in-bound(1),

    out-bound(2)

}



RfChargingDataRequest ::= SEQUENCE

{

    rfChargingData  [1] DiameterChargingData,

    rfChargingEvent [2] RfChargingEvent OPTIONAL

}



DiameterChargingData ::= CHOICE

{

    fullDiameterChargingData    [1] EncapsulatedRfChargingData

}



EncapsulatedRfChargingData ::= OCTET STRING



RfChargingEvent ::= ENUMERATED

{

    aoC-Information(1),

    pS-Information(2),

    iMS-Information(3),

    mMS-Information(4),

    lCS-Information(5),

    poC-Information(6),

    mBMS-Inform(7),

    sMS-Information(8),

    vCS-Information(9),

    mMTel-Information(10),

    proSe-Information(11),

    service-Generic-Information(12),

    iM-Information(13),

    dCD-Information(14),

    m2M-Information(15),

    cPDT-Information(16)

}



TranslatedChargingDataInfo ::= SEQUENCE



{

    translatedChargingData  [1] TranslatedChargingData

}



TranslatedChargingData ::= SEQUENCE

{

    releaseID           [1] INTEGER (0..7),

    versonID            [2] INTEGER (0..31),

    specificationNumber [3] INTEGER (0..31),

    releaseIDExtension  [4] INTEGER (0..255) OPTIONAL,

    recordData          [5] ExternalChargingASN

}



ExternalChargingASN ::= ExternalASNType



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

-- Common Parameters

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

33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+14 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
      <xs:element name="SDP" type="SDP"/>

      <xs:element name="STIRSHAKENProvisioning" type="STIRSHAKENTargetProvisioningExtensions"/>

      <xs:element name="LocationOnlyProvisioning" type="LocationOnlyProvisioningExtensions"/>

      <xs:element name="ChargingDataEvents" type="ChargingDataEventsExtensions"/>

    </xs:choice>

  </xs:complexType>
@@ -423,4 +424,17 @@ 
    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ChargingDataEventsExtensions">

    <xs:sequence>

      <xs:element name="ChargingDataEventsGenerated" type="ChargingDataEventsGenerated"/>

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="ChargingDataEventsGenerated">

    <xs:restriction base="xs:string">

      <xs:enumeration value="DefaultChargingDataInformation"/>

      <xs:enumeration value="TranslatedChargingDataInformation"/>

    </xs:restriction>

  </xs:simpleType>



</xs:schema>