From 3098f1030404b12dbb033713fdb6ae15c817be20 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 17 Jun 2025 06:30:14 -0500 Subject: [PATCH 1/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 51 +++++++++++++++++------------ 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bec576ffc..7a3a65694 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1527,10 +1527,14 @@ module _3gpp-common-trace { 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."; + 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. In case of + IMMEDIATE_MDT_AND_LOGGED_MDT, both the attribute + immediateMdtConfig and the attribute loggedMdtConfig are + applicable"; leaf anonymizationOfMDTData { when ../areaScope ; @@ -1597,7 +1601,17 @@ module _3gpp-common-trace { description "It indicates the PLMNs where measurement collection, status indication and log reporting is allowed."; reference "Clause 5.10.24 of 3GPP TS 32.422."; - } + } + + list traceReferenceList { + key "idx"; + min-elements 1; + description "A list of Trace References for C-MDT is supported in + NR-RAN."; + reference "Clause 5.10 of 3GPP TS 32.422."; + leaf idx { type uint32 ; } + uses trace3gpp:TraceReferenceGrp ; + } } grouping UECoreMeasConfigGrp { @@ -1862,7 +1876,7 @@ module _3gpp-common-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"'; + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "Trace config"; max-elements 1; @@ -1872,13 +1886,13 @@ 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"; max-elements 1; @@ -1972,18 +1986,13 @@ 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. + 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/or 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 bepresent. The rrcReportType allows the tracing of RRC reports. -- GitLab From f1dedb9fb0dac55992945f99586a4b8dbf8be755 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 17 Jun 2025 06:32:09 -0500 Subject: [PATCH 2/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 7a3a65694..540dbb980 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1892,7 +1892,7 @@ module _3gpp-common-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'; + + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; key idx; description "MDT config"; max-elements 1; -- GitLab From a710c1526d73528ce76be27fdec1b264fd15eaaa Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 11 Jul 2025 08:36:11 -0500 Subject: [PATCH 3/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 197 ++++++++++++++++++++++------ 1 file changed, 154 insertions(+), 43 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 540dbb980..fad0d06c8 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -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"; } @@ -1451,8 +1537,9 @@ module _3gpp-common-trace { } leaf hysteresisL1 { - when '../../../jobType = "LOGGED_MDT_ONLY" or ' - + '../../../jobType = "LOGGED_MBSFN_MDT"'; + when '../../../jobType = "LOGGED_MDT_ONLY" or' + + ' ../../../jobType = "LOGGED_MBSFN_MDT" or' + + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type uint32 { range "0..30"; } @@ -1465,8 +1552,9 @@ module _3gpp-common-trace { } leaf timeToTriggerL1 { - when '../../../jobType = "LOGGED_MDT_ONLY" or ' - + '../../../jobType = "LOGGED_MBSFN_MDT"'; + when '../../../jobType = "LOGGED_MDT_ONLY" or' + + ' ../../../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 <> 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; } -- GitLab From 0ca4f5db3eea52d7c902c6e198b2cda319d48afd Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 11 Jul 2025 08:39:28 -0500 Subject: [PATCH 4/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index fad0d06c8..aa44a76c5 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -854,11 +854,11 @@ module _3gpp-common-trace { "; leaf listOfMeasurements { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum M1; -- GitLab From 8762670e9b5977c63c23629a54f5745a3f540bdf Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 11 Jul 2025 08:43:09 -0500 Subject: [PATCH 5/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 148 ++++++++++++++-------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index aa44a76c5..38e8f9f5a 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -883,11 +883,11 @@ module _3gpp-common-trace { } leaf reportingTrigger { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum PERIODICAL; @@ -907,12 +907,12 @@ 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" + 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" + "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|" @@ -929,12 +929,12 @@ 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" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"' + ' and ../reportingTrigger = "PERIODICAL"'; type union { type uint32 { @@ -952,11 +952,11 @@ module _3gpp-common-trace { } leaf eventThreshold { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "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 @@ -967,11 +967,11 @@ module _3gpp-common-trace { } leaf collectionPeriodRRMNR { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type uint32 { range "1024|2048|5120|10240|60000"; @@ -984,11 +984,11 @@ module _3gpp-common-trace { } leaf collectionPeriodM6NR { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum 120ms; @@ -1013,11 +1013,11 @@ module _3gpp-common-trace { } leaf collectionPeriodM7NR { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type uint32 { range "1..60"; @@ -1029,11 +1029,11 @@ module _3gpp-common-trace { } leaf collectionPeriodRRMLTE { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum 100ms; @@ -1054,11 +1054,11 @@ module _3gpp-common-trace { } leaf measurementPeriodLTE { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum 1024ms; @@ -1076,11 +1076,11 @@ module _3gpp-common-trace { } leaf collectionPeriodM6LTE { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type uint32 { range "1024|2048|5120|10240"; @@ -1094,11 +1094,11 @@ module _3gpp-common-trace { } leaf collectionPeriodM7LTE { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type uint16 { range 1..60 ; @@ -1110,11 +1110,11 @@ module _3gpp-common-trace { } leaf eventThresholdUphUMTS { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type uint16 { range 0..31 ; @@ -1126,11 +1126,11 @@ module _3gpp-common-trace { } leaf collectionPeriodRRMUMTS { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type uint32 { range "100|250|500|1000|2000|" @@ -1144,11 +1144,11 @@ module _3gpp-common-trace { } leaf measurementPeriodUMTS { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "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|" @@ -1163,11 +1163,11 @@ module _3gpp-common-trace { } leaf measurementQuantity { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum CPICH_ECNO; @@ -1180,11 +1180,11 @@ module _3gpp-common-trace { } leaf beamLevelMeasurement { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type boolean; default false; @@ -1194,11 +1194,11 @@ module _3gpp-common-trace { } leaf positioningMethod { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum GNSS; @@ -1491,11 +1491,11 @@ module _3gpp-common-trace { } leaf reportType { - when '../../../jobType = "IMMEDIATE_MDT_ONLY" - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE" - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS" + 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" + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'; type enumeration { enum PERIODICAL; -- GitLab From 73e374a0d44baea0bc95c57db0043c5df869457d Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Thu, 24 Jul 2025 09:46:03 -0500 Subject: [PATCH 6/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 46 ++++++++++++++++++----------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 38e8f9f5a..958027a48 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 2025-08-07 { reference "CR-0552" ; } 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" ; } @@ -1608,22 +1609,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 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 sensor information to include. + + The attribute traceReferenceList contains all 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."; leaf anonymizationOfMDTData { when ../areaScope ; @@ -2100,12 +2112,12 @@ module _3gpp-common-trace { 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/or LOGGED_MBSFN_MDT the configuration parameters of + 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. + parameters of attribute ueCoreMeasConfig shall be applied. - If jobType has the value RRC Report, the attribute rrcReportType shall + If jobType has the value RRC_REPORT, the attribute rrcReportType shall bepresent. The rrcReportType allows the tracing of RRC reports. Creation and deletion of TraceJob instances by MnS consumers is -- GitLab From 8a7cbbf8f439aa2ad126c4c4b16217715d151ed6 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 27 Aug 2025 04:03:34 -0500 Subject: [PATCH 7/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 39 +++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 958027a48..f874f0781 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1621,9 +1621,9 @@ module _3gpp-common-trace { The optional attribute sensorInformation allows to specify the sensor information to include. - The attribute traceReferenceList contains all 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. + 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 @@ -1704,14 +1704,17 @@ module _3gpp-common-trace { reference "Clause 5.10.24 of 3GPP TS 32.422."; } - list traceReferenceList { + list trsrPrefixCfg { key "idx"; - min-elements 1; - description "A list of Trace References for C-MDT is supported in - NR-RAN."; + 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:TraceReferenceGrp ; + uses trace3gpp:trsrPrefixCfgGrp ; } } @@ -1766,6 +1769,20 @@ 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 bit" + + } + } + grouping TraceJobGrp { leaf jobType { @@ -2004,9 +2021,9 @@ module _3gpp-common-trace { 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. + 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 contains IMMEDIATE_MDT, the -- GitLab From 0cc9c87e442c86544decfe874aac564efc1aaced Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 27 Aug 2025 04:05:46 -0500 Subject: [PATCH 8/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index f874f0781..419eb4fa8 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1771,14 +1771,14 @@ module _3gpp-common-trace { grouping trsrPrefixCfgGrp { leaf trstPrefix { - type string + type string; mandatory true; - description "A 2 byte Octet String. This is the base TRSR prefix" + description "A 2 byte Octet String. This is the base TRSR prefix"; } leaf trsrPrefixLength { - type int32 + type int32; mandatory true; - description "An integer to indicate how many bit" + description "An integer to indicate how many bit"; } } -- GitLab From b6dc3f943489c3615fd72d44caf2a3af2bb0dbd1 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 27 Aug 2025 17:31:11 -0500 Subject: [PATCH 9/9] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 419eb4fa8..ebc7a9ffa 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1627,11 +1627,11 @@ module _3gpp-common-trace { 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, + or both are available: If the attribute jobType indictes 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 + 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 @@ -1778,7 +1778,8 @@ module _3gpp-common-trace { leaf trsrPrefixLength { type int32; mandatory true; - description "An integer to indicate how many bit"; + description "An integer to indicate how many bits are used for the + TRSR prefix"; } } @@ -2026,12 +2027,12 @@ module _3gpp-common-trace { 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 contains IMMEDIATE_MDT, the + available: If the attribute jobType indictes 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. + 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."; -- GitLab