Commit e9236ea9 authored by lengyelb's avatar lengyelb
Browse files

Locally rebased and merged !1789

parent ed915aa0
Loading
Loading
Loading
Loading
Loading
+207 −58
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ module _3gpp-common-trace {
      Integration Reference Point (IRP);
      Information Service (IS)" ;

  revision 2025-08-07 { reference "CR-0551 CR-0562" ; }
  revision 2025-08-07 { reference "CR-0551 CR-0552 CR-0562" ; }
  revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; }
  revision 2025-02-07 { reference "CR-0504" ; }
  revision 2025-02-05 { reference "CR-0461" ; }
@@ -872,7 +872,12 @@ module _3gpp-common-trace {
        ";

    leaf listOfMeasurements {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"';
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum M1;
        enum M2;
@@ -896,7 +901,12 @@ module _3gpp-common-trace {
    }

   leaf reportingTrigger {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"';
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum PERIODICAL;
        enum A2_FOR_LTE;
@@ -916,6 +926,11 @@ module _3gpp-common-trace {

   leaf reportInterval {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'
        +  ' and ../reportingTrigger = "PERIODICAL"';
      type uint32 {
        range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|"
@@ -933,6 +948,11 @@ module _3gpp-common-trace {

   leaf reportAmount {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'
        +  ' and ../reportingTrigger = "PERIODICAL"';
      type union {
        type uint32 {
@@ -950,7 +970,12 @@ module _3gpp-common-trace {
    }

   leaf eventThreshold {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"';
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type int64;
      description "Specifies the threshold which should trigger the reporting
        in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute
@@ -961,7 +986,11 @@ module _3gpp-common-trace {

   leaf collectionPeriodRRMNR {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "1024|2048|5120|10240|60000";
      }
@@ -974,7 +1003,11 @@ module _3gpp-common-trace {

   leaf collectionPeriodM6NR {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum 120ms;
        enum 240ms;
@@ -999,7 +1032,11 @@ module _3gpp-common-trace {

    leaf collectionPeriodM7NR {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "1..60";
      }
@@ -1011,7 +1048,11 @@ module _3gpp-common-trace {

   leaf collectionPeriodRRMLTE {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
       type enumeration {
        enum 100ms;
        enum 1000ms;
@@ -1032,7 +1073,11 @@ module _3gpp-common-trace {

   leaf measurementPeriodLTE {
          when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
            +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum 1024ms;
        enum 2048ms;
@@ -1050,7 +1095,11 @@ module _3gpp-common-trace {

    leaf collectionPeriodM6LTE {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "1024|2048|5120|10240";
      }
@@ -1064,7 +1113,11 @@ module _3gpp-common-trace {

    leaf collectionPeriodM7LTE {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint16 {
        range 1..60 ;
      }
@@ -1076,7 +1129,11 @@ module _3gpp-common-trace {

    leaf eventThresholdUphUMTS {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint16 {
        range 0..31 ;
      }
@@ -1088,7 +1145,11 @@ module _3gpp-common-trace {

    leaf collectionPeriodRRMUMTS {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "100|250|500|1000|2000|"
          +"3000|4000|6000";
@@ -1102,7 +1163,11 @@ module _3gpp-common-trace {

    leaf measurementPeriodUMTS {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "1000|2000|3000|4000|6000|8000|12000|16000|20000|"
          +"24000|28000|32000|64000";
@@ -1117,7 +1182,11 @@ module _3gpp-common-trace {

    leaf measurementQuantity {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum CPICH_ECNO;
        enum CPICH_RSCP;
@@ -1130,7 +1199,11 @@ module _3gpp-common-trace {

    leaf beamLevelMeasurement {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type boolean;
      default false;
      description "Indicates whether the NR M1 beam level measurements shall
@@ -1140,7 +1213,11 @@ module _3gpp-common-trace {

    leaf positioningMethod {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum GNSS;
        enum E_CELL_ID;
@@ -1397,7 +1474,8 @@ module _3gpp-common-trace {

    leaf loggingDuration {
      when '../../../jobType = "LOGGED_MDT_ONLY" or'
        + ' ../../../jobType = "LOGGED_MBSFN_MDT"';
        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "600|1200|2400|3600|5400|7200";
      }
@@ -1410,7 +1488,8 @@ module _3gpp-common-trace {

    leaf loggingInterval {
      when '../../../jobType = "LOGGED_MDT_ONLY" or'
        + ' ../../../jobType = "LOGGED_MBSFN_MDT"';
        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum 320ms;
        enum 640ms;
@@ -1430,7 +1509,12 @@ module _3gpp-common-trace {
    }

    leaf reportType {
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"';
      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = 
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum PERIODICAL;
        enum EVENT_TRIGGERED;
@@ -1440,7 +1524,8 @@ module _3gpp-common-trace {
    }

    leaf eventListForEventTriggeredMeasurement {
      when '../../../jobType = "LOGGED_MDT_ONLY"';
      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type enumeration {
        enum OUT_OF_COVERAGE ;
        enum A2_EVENT ;
@@ -1456,7 +1541,8 @@ module _3gpp-common-trace {

    leaf eventThresholdL1 {
      when '../../../jobType = "LOGGED_MDT_ONLY" or'
        + ' ../../../jobType = "LOGGED_MBSFN_MDT"';
        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "0..127";
      }
@@ -1470,7 +1556,8 @@ module _3gpp-common-trace {

    leaf hysteresisL1 {
      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
         + '../../../jobType = "LOGGED_MBSFN_MDT"';
        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type uint32 {
        range "0..30";
      }
@@ -1484,7 +1571,8 @@ module _3gpp-common-trace {

    leaf timeToTriggerL1 {
      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
          + '../../../jobType = "LOGGED_MBSFN_MDT"';
        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      type int32 {
        range 0|40|64|80|100|128|160|256|320|480|512|640|1024|1280|2560|5120;
      }
@@ -1497,8 +1585,9 @@ module _3gpp-common-trace {
      reference "clause 5.10.38 of TS 32.422";
    }

    list areaConfigurationForNeighCell {
      when '../../../jobType = "LOGGED_MDT_ONLY"';
    list areaConfigurationForNeighCells {
      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      key "idx";
      leaf idx { type uint32 ; }
      description "It specifies the area for which UE is requested to perform
@@ -1537,18 +1626,33 @@ module _3gpp-common-trace {
  }

  grouping MdtConfigGrp {
    description "Defines the configuration parameters of IOC
     TraceJob which are specific for MDT. The attribute
     anonymizationOfMdtData specifies the level of anonymization
     of MDT data.  The attribute areaScope defines the area scope
    description "Defines the configuration parameters of IOC TraceJob which are
     specific for MDT or any combination of MDT. 
     
     The attribute anonymizationOfMdtData specifies the level of anonymization 
     of MDT data.  
     
     The attribute areaScope defines the area scope
     of MDT, which is specified in clause 5.10.2 of TS 32.422.
     
     The optional attribute sensorInformation allows to specify
     the sensor information to include.  Based on the value
     configured for attribute jobType in IOC TraceJob, the attributes
     immediateMdtConfig or loggedMdtConfig are available: In case of
     IMMEDIATE_MDT_ONLY or IMMEDIATE_MDT_AND_TRACE the attribute
     immediateMdtConfig is applicable. In case of LOGGED_MDT_ONLY or
     LOGGED_MBSFN_MDT the attribute loggedMdtConfig is applicable.";
     the sensor information to include. 
     
     The attribute trsrPrefixCfg contains the TRSR prefix 
     configuration parameters which shall be used by the NR-RAN nodes 
     during TRSR assignment for a C-MDT job.

     Based on the value configured for attribute jobType in IOC 
     TraceJob, the attributes immediateMdtConfig or loggedMdtConfig 
     or both are available: If the attribute jobType indictes immediate MDT, 
     the attribute immediateMdtConfig is applicable. If the attribute jobType 
     indictes logged MDT or logged MBSFN MDT, the attribute loggedMdtConfig is 
     applicable. If the attribute jobType indictes both immediate MDT and 
     logged MDT, both the attribute immediateMdtConfig and 
     the attribute loggedMdtConfig are applicable.

     The optional attribute plmnList allows to specify the PLMNs where 
     measurements collection, status indication and log reporting is allowed.";

   leaf anonymizationOfMdtData {
      when ../areaScope ;
@@ -1616,6 +1720,19 @@ module _3gpp-common-trace {
        indication and log reporting is allowed.";
      reference "Clause 5.10.24 of 3GPP TS 32.422.";
    }

    list trsrPrefixCfg {
      key "idx";
      max-elements 1;
      description "The TRSR prefix configuration parameters which are used by 
        NR-RAN at TRSR assignment for a given C-MDT job. It defines both the 
        base TRSR prefix and the size of the TRSR prefix. The attribute 
        trstPrefix specifies the base TRSR prefix. The attribute 
        trsrPrefixLength defines the size of base TRSR prefix.";
      reference "Clause 5.10 of 3GPP TS 32.422.";
      leaf idx { type uint32 ; }
      uses trace3gpp:trsrPrefixCfgGrp ; 
    }   
  }

  grouping UECoreMeasConfigGrp {
@@ -1669,6 +1786,21 @@ module _3gpp-common-trace {
    }
  }

  grouping trsrPrefixCfgGrp {
    leaf trstPrefix {
      type string;
      mandatory true;
      description "A 2 byte Octet String. This is the base TRSR prefix";
    }
    leaf trsrPrefixLength {
      type int32;
      mandatory true;
      description "An integer to indicate how many bits are used for the 
        TRSR prefix";

    }
  }

  grouping TraceJobGrp {

    leaf jobType {
@@ -1685,6 +1817,7 @@ module _3gpp-common-trace {
        enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS;
        enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS;
        enum RRC_REPORT;
        enum IMMEDIATE_MDT_AND_LOGGED_MDT;
      }
      default TRACE_ONLY;
      description "It specifies whether the
@@ -1890,15 +2023,36 @@ module _3gpp-common-trace {

    list mdtConfig {
      when '../jobType = "IMMEDIATE_MDT_ONLY"'
        + ' or ../jobType = "LOGGED_MDT_ONLY"'
        + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'
        + ' or ../jobType = "RLF_REPORT_ONLY"'
        + ' or ../jobType = "RCEF_REPORT_ONLY"'
        + ' or ../jobType = "LOGGED_MBSFN_MDT"'
        + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        + ' or ../jobType =
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"';
        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
        + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
      key idx;
      description "MDT config";
      description "This <<dataType>> defines the configuration parameters of
        IOC TraceJob which are specific for MDT or any combination of MDT. 
        The attribute anonymizationOfMdtData specifies the level of 
        anonymization of MDT data.
        The optional attribute areaScopedefines the area scope of MDT, which 
        is specified in clause 5.10.2 of TS 32.422.
        The attribute sensorInformation allows to specify the sensor 
        information to include.
        The attribute trsrPrefixCfg contains the TRSR prefix 
        configuration parameters which shall be used by the NR-RAN nodes 
        during TRSR assignment for a C-MDT job.
        Based on the value configured for attribute jobType in IOC TraceJob, 
        the attributes immediateMdtConfig or loggedMdtConfig or both are 
        available: If the attribute jobType indictes immediate MDT, the 
        attribute immediateMdtConfig is applicable. If the attribute jobType 
        indictes logged MDT or logged MBSFN MDT, the attribute loggedMdtConfig
        is applicable. If the attribute jobType indictes both immediate MDT 
        and logged MDT, both the attribute immediateMdtConfig and the 
        attribute loggedMdtConfig are applicable.
        The optional attribute plmnList allows to specify the PLMNs where 
        measurements collection, status indication and log reporting is 
        allowed.";
      max-elements 1;
      uses MdtConfigGrp;
      leaf idx { type string; }
@@ -1990,20 +2144,15 @@ module _3gpp-common-trace {
        The attribute listOfTraceMetrics allows configuraton of which metrics
        shall be recorded.

        The attribute jobType specifies the kind of data to collect. In case of
        TRACE_ONLY, the configuration parameters of attribute traceConfig
        shall be applied. In case of IMMEDIATE_MDT_ONLY, LOGGED_MDT_ONLY,
        RLF_REPORT_ONLY, RCEF_REPORT_ONLY and LOGGED_MBSFN_MDT the
        configuration parameters of
        attribute mdtConfig or a subset of these shall be applied. In case of
        5GC_UE_LEVEL_MEASUREMENTS_ONLY, the configuration parameters
        of attribute ueCoreMeasConfig shall be applied. In case of any
        combination of Trace, Immediate MDT, and 5GC UE level measurements,
        the configuration parameters
        of the corresponding attributes, traceConfig, mdtConfig and
        ueCoreMeasConfig are applicable.

        If jobType has the value RRC Report, the attribute rrcReportType shall
        The attribute jobType specifies the kind of data to collect. In case 
        of TRACE_ONLY, the configuration parameters of attribute traceConfig 
        shall be applied. If the attribute jobType contains IMMEDIATE_MDT, 
        LOGGED_MDT and LOGGED_MBSFN_MDT the configuration parameters of 
        attribute mdtConfig or a subset of these shall be applied. If the 
        attribute jobType contains 5GC_UE_LEVEL_MEASUREMENTS, the configuration
        parameters of attribute ueCoreMeasConfig shall be applied.  

        If jobType has the value RRC_REPORT, the attribute rrcReportType shall
        be present. The rrcReportType allows the tracing of RRC reports.

        Creation and deletion of TraceJob instances by MnS consumers is