Commit a710c152 authored by Zu Qiang's avatar Zu Qiang 🛀
Browse files

Update file _3gpp-common-trace.yang

parent f1dedb9f

yang-models/_3gpp-common-trace.yang

+154 −43
Original line number Diff line number Diff line
@@ -854,7 +854,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;
@@ -878,7 +883,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;
@@ -897,7 +907,12 @@ module _3gpp-common-trace { 
    }



   leaf reportInterval {

      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"

        +  ' and ../reportingTrigger = "PERIODICAL"';

      type uint32 {

        range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|"
@@ -914,7 +929,12 @@ module _3gpp-common-trace { 
    }

    

   leaf reportAmount {

      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"

        +  ' and ../reportingTrigger = "PERIODICAL"';

      type union {

        type uint32 {
@@ -932,7 +952,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
@@ -942,8 +967,12 @@ module _3gpp-common-trace { 
    }

    

   leaf collectionPeriodRRMNR {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 uint32 {

        range "1024|2048|5120|10240|60000";

      }
@@ -955,8 +984,12 @@ module _3gpp-common-trace { 
    }



   leaf collectionPeriodM6NR {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 120ms;

        enum 240ms;
@@ -980,8 +1013,12 @@ module _3gpp-common-trace { 
    }

    

    leaf collectionPeriodM7NR {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 uint32 {

        range "1..60";

      }
@@ -992,8 +1029,12 @@ module _3gpp-common-trace { 
    }



   leaf collectionPeriodRRMLTE {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 100ms;

        enum 1000ms;
@@ -1013,8 +1054,12 @@ module _3gpp-common-trace { 
    }



   leaf measurementPeriodLTE {

          when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

            +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 1024ms;

        enum 2048ms;
@@ -1031,8 +1076,12 @@ module _3gpp-common-trace { 
    }

    

    leaf collectionPeriodM6LTE {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 uint32 {

        range "1024|2048|5120|10240";

      }
@@ -1045,8 +1094,12 @@ module _3gpp-common-trace { 
    }

    

    leaf collectionPeriodM7LTE {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 uint16 {

        range 1..60 ;

      }
@@ -1057,8 +1110,12 @@ module _3gpp-common-trace { 
    }



    leaf eventThresholdUphUMTS {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 uint16 {

        range 0..31 ;

      }
@@ -1069,8 +1126,12 @@ module _3gpp-common-trace { 
    }



    leaf collectionPeriodRRMUMTS {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 uint32 {

        range "100|250|500|1000|2000|"

          +"3000|4000|6000";
@@ -1083,8 +1144,12 @@ module _3gpp-common-trace { 
    }



    leaf measurementPeriodUMTS {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        +  'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 uint32 {

        range "1000|2000|3000|4000|6000|8000|12000|16000|20000|"

          +"24000|28000|32000|64000";
@@ -1098,8 +1163,12 @@ module _3gpp-common-trace { 
    }



    leaf measurementQuantity {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 CPICH_ECNO;

        enum CPICH_RSCP;
@@ -1111,8 +1180,12 @@ module _3gpp-common-trace { 
    }

    

    leaf beamLevelMeasurement {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 boolean;

      default false;

      description "Indicates whether the NR M1 beam level measurements shall
@@ -1121,8 +1194,12 @@ module _3gpp-common-trace { 
    }



    leaf positioningMethod {

      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'

        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';

      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 GNSS;

        enum E_CELL_ID;
@@ -1379,7 +1456,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";

      }
@@ -1392,7 +1470,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;
@@ -1412,7 +1491,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;
@@ -1422,7 +1506,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 ;
@@ -1438,7 +1523,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";

      }
@@ -1452,7 +1538,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";

      }
@@ -1466,7 +1553,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;

      }
@@ -1480,7 +1568,8 @@ module _3gpp-common-trace { 
    }

    

    list areaConfigurationForNeighCells {

      when '../../../jobType = "LOGGED_MDT_ONLY"';

      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
@@ -1531,7 +1620,7 @@ module _3gpp-common-trace { 
     If the attribute jobType contains IMMEDIATE_MDT the attribute 

     immediateMdtConfig is applicable. If the attribute jobType 

     contains LOGGED_MDT or LOGGED_MBSFN_MDT the attribute 

     loggedMdtConfig is applicable. In case of 

     loggedMdtConfig is applicable. If the attribute jobType contains 

     IMMEDIATE_MDT_AND_LOGGED_MDT, both the attribute 

     immediateMdtConfig and the attribute loggedMdtConfig are 

     applicable";
@@ -1681,6 +1770,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
@@ -1894,7 +1984,28 @@ module _3gpp-common-trace { 
        "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 traceReferenceList contains all the Trace References 

        which are sent to all participating NR-RAN nodes in the Trace Session 

        activation requests for the same C-MDT job in NR-RAN.

        Based on the value configured for attribute jobType in IOC TraceJob, 

        the attributes immediateMdtConfig or loggedMdtConfig or both are 

        available: If the attribute jobType contains IMMEDIATE_MDT, the 

        attribute immediateMdtConfig is applicable. If the attribute jobType 

        contains LOGGED_MDT or LOGGED_MBSFN_MDT the attribute loggedMdtConfig 

        is applicable. If the attribute jobType contains 

        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; }