Commit 19f02b24 authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'Rel18_TS28.623_Rename_attributes_for_5GC_UE_level_measurement'... 

Merge branch 'Rel18_TS28.623_Rename_attributes_for_5GC_UE_level_measurement' into 'Integration_Rel18_SA5_156_YANG'

Rel18 TS28.623 CR0376 rename attributes for 5GC UE level measurement

See merge request !1211
parents 6d4ec182 365d000c

yang-models/_3gpp-common-trace.yang

+18 −17
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ module _3gpp-common-trace { 
      Integration Reference Point (IRP);

      Information Service (IS)" ;



  revision 2024-08-05 { reference "CR-0376"; }

  revision 2024-05-12 { reference "CR-0401"; }

  revision 2024-05-06 { reference CR-0359; }

  revision 2024-04-06 { reference "CR-0342"; }
@@ -1521,20 +1522,20 @@ module _3gpp-common-trace { 
    }    

  }



  grouping UEMeasConfigGrp {

    description "Represents the UEMeasConfig dataType.

  grouping UECoreMeasConfigGrp {

    description "Represents the UECoreMeasConfig dataType.

      This <<dataType>> defines the aconfiguration parameters of IOC TraceJob

        which are specific for UE level measurements collection.";

        which are specific for 5GC UE level measurements collection.";

    

    leaf-list ueMeasurements {

    leaf-list ueCoreMeasurements {

      type string;

      description "It specifies the List of UE level measurements.";

      description "It specifies the List of 5GC UE level measurements.";

    }



    leaf ueMeasGranularityPeriod {

    leaf ueCoreMeasGranularityPeriod {

      type uint32;

      description "It specifies the Granularity period used to produce UE level 

        measurements. The period is defined in milliseconds (ms).";

      description "It specifies the Granularity period used to produce 5GC UE 

        level measurements. The period is defined in milliseconds (ms).";

    }



    leaf nfTypeToMeasure {
@@ -1752,7 +1753,7 @@ module _3gpp-common-trace { 
      leaf idx { type string; }    

    }



    list ueMeasConfig { 

    list ueCoreMeasConfig { 

      when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"'

         + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"'

         + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
@@ -1761,7 +1762,7 @@ module _3gpp-common-trace { 
      key idx;

      description "5GC UE level measurements config";

      max-elements 1;       

      uses UEMeasConfigGrp;

      uses UECoreMeasConfigGrp;

      leaf idx { type string; }    

    }
@@ -1839,10 +1840,10 @@ module _3gpp-common-trace { 
        only, RCEF reports only and Logged MBSFN MDT, the configuration 

        parameters of attribute mdtConfig or a subset of these shall be 

        applied. In case of UE measurements only, the configuration parameters

        of attribute ueMeasConfig shall be applied. In case of any combination 

        of Trace, Immediate MDT, Trace and UE measurements, the configuration

        parameters of the corresponding attributes traceConfig, mdtConfig and 

        ueMeasConfig are applicable. 

        of attribute ueCoreMeasConfig shall be applied. In case of any

        combination of Trace, Immediate MDT, Trace and UE measurements, the

        configuration parameters of the corresponding attributes traceConfig,

        mdtConfig and ueCoreMeasConfig are applicable. 



        Creation and deletion of TraceJob instances by MnS consumers is 

        optional; when not supported, the TraceJob instances may be created