diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index a17cdbf98b0cd3c4ae130440ecb8714cebdfc3aa..cd2a69cb7605a80a64e7c6d8cd15218217ed8130 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-01-29 { reference "CR-0316"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } revision 2023-11-03 { reference CR-0302 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -1233,6 +1234,38 @@ module _3gpp-common-trace { } } + grouping UEMeasConfigGrp { + description "Represents the UEMeasConfig dataType. + This <> defines the aconfiguration parameters of IOC TraceJob + which are specific for UE level measurements collection."; + + leaf-list ueMeasurements { + type string; + description "It specifies the List of UE level measurements."; + } + + leaf ueMeasGranularityPeriod { + type uint32; + description "It specifies the Granularity period used to produce UE level + measurements. The period is defined in milliseconds (ms)."; + } + + leaf-list nfTypeToMeasure { + type string; + description "It specifies the NF types to measure."; + } + + leaf-list objectInstances { + type string; + description "List of object instances."; + } + + leaf-list rootObjectInstances { + type string; + description "List of root object instances."; + } + } + grouping TraceJobGrp { leaf jobType { @@ -1244,12 +1277,17 @@ module _3gpp-common-trace { enum RLF_REPORT_ONLY; enum RCEF_REPORT_ONLY; enum LOGGED_MBSFN_MDT; + enum 5GC_UE_LEVEL_MEASUREMENTS_ONLY; + enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the - TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined - Trace and MDT job. The attribute is applicable for Trace, MDT, RCEF and - RLF reporting."; + TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE level measurement collection, or any combination + of Trace, immediate MDT and 5GC UE level measurement collection. + The attribute is applicable for Trace, MDT, RCEF and + RLF reporting, and 5GC UE level measurement collection."; reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } @@ -1388,7 +1426,9 @@ module _3gpp-common-trace { list traceConfig { when '../jobType = "TRACE_ONLY"' - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "Trace config"; max-elements 1; @@ -1401,7 +1441,9 @@ module _3gpp-common-trace { + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + ' or ../jobType = "RLF_REPORT_ONLY"' + ' or ../jobType = "RCEF_REPORT_ONLY"' - + ' or ../jobType = "LOGGED_MBSFN_MDT"'; + + ' 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"'; key idx; description "MDT config"; max-elements 1; @@ -1409,6 +1451,17 @@ module _3gpp-common-trace { leaf idx { type string; } } + list ueMeasConfig { + when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + key idx; + description "5GC UE level measurements config"; + max-elements 1; + uses UEMeasConfigGrp; + leaf idx { type string; } + } list nPNTarget { description "applicable only for NR and shall be present in case of NPN either a PNI-NPN or a SNPN) and for management-based activation when @@ -1477,14 +1530,15 @@ module _3gpp-common-trace { selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN. - 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 IMMEDIATE_MDT_AND_TRACE both attributes, traceConfig and - mdtConfig are applicable. + 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 reports + 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. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created