From 08dacbdafd385004be3c9f6cba1d074eebef4fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 22 Jan 2025 09:43:38 +0000
Subject: [PATCH 01/25] Update _3gpp-common-trace.yang with appropriate
 descriptions and parameter names, aligned with latest Rel-16 version of TS
 28.622

---
 yang-models/_3gpp-common-trace.yang | 209 +++++++++++++++-------------
 1 file changed, 110 insertions(+), 99 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 94028e544..931857e8f 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -497,8 +497,8 @@ module _3gpp-common-trace {
           enum IMEISV;
           enum PUBLIC_ID;
           enum UTRAN_CELL;
-          enum E_UTRAN_CELL;
-          enum NG_RAN_CELL;
+          enum E-UTRAN_CELL;
+          enum NG-RAN_CELL;
           enum ENB;
           enum RNC;
           enum GNB;
@@ -514,13 +514,21 @@ module _3gpp-common-trace {
         attribute is applicable for both Trace and MDT. This attribute
         includes the ID type of the target as an enumeration and the ID value.
 
-        The traceTarget shall be public ID in case of a Management Based
-        Activation is done to an ScscfFunction. The traceTarget shall be
-        cell only in case of the UTRAN cell traffic trace function.
+        The traceTarget shall be "PUBLIC_ID" "in case of a Management Based
+        Activation is done to an SCSCFFunction (Serving Call Session Control Function)
+        or PCSCFFunction (Proxy Call Session Control Function) 
 
-        The traceTarget shall be E-UtranCell only in case of E-UTRAN cell
-        traffic trace function.The traceTarget shall be either IMSI or
-        IMEI(SV) if the Trace Session is activated to any of the following
+        The traceTarget shall be "UTRAN_CELL" only in case of 
+        UTRAN cell traffic trace function.
+
+        The traceTarget shall be "E-UTRAN_CELL" only in case of E-UTRAN cell
+        traffic trace function.
+        
+        The traceTarget shall be "NG-RAN_CELL" only in case of E-UTRAN cell
+        traffic trace function.
+
+        The traceTarget shall be either "IMSI", "IMEI" or
+        "IMEISV" if the Trace Session is activated to any of the following
         ManagedEntity(ies):
         - HssFunction
         - MscServerFunction
@@ -529,28 +537,35 @@ module _3gpp-common-trace {
         - BmscFunction
         - RncFunction
         - MmeFunction
-
-        The traceTarget shall be IMSI if the Trace Session is activated to a
-        ManagedEntity playing a role of ServinGWFunction.
-
-        In case of signaling based Trace/MDT, the traceTarget attribute shall 
-        be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute 
-        shall be able to carry a list of (cell or E-UtranCell or NRCellDU or 
-        TA/LA/RA).
+        - ServingGWFunction
+        - PGWFunction
+
+      The traceTarget shall be either “SUPI” or “IMEISV” if the Trace Session 
+      is activated to any of the following ManagedEntity(ies):
+        - AFFunction
+        - AMFFunction
+        - AUSFunction
+        - NEFFunction
+        - NRFFunction
+        - NSSFFunction
+        - PCFFunction
+        - SMFFunction
+        - UPFFunction
+        - UDMFunction
+
+
+        In case of signalling based MDT, the traceTarget attribute shall be 
+        able to carry "PUBLIC_ID", "IMSI", "IMEI",  "IMEISV)" or   "SUPI".
 
         In case of management based Immediate MDT, the traceTarget attribute
-        shall be null value, the areaScope attribute shall carry a list of
-        (Utrancell or E-UtranCell or NRCellDU).
+        shall be null value.
 
-        In case of management based Logged MDT, the traceTarget attribute
-        shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated 
-        on the specified eNB or RNC or gNB in traceTarget. The areaScope 
-        attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or 
-        TA/LA/RA).
+        In case of management based Logged MDT, the traceTarget attribute 
+        shall carry an "eNB" or a "gNB" or an "RNC". 
+        The Logged MDT should be initiated on the specified eNB/gNB/RNC in traceTarget. 
 
         In case of RLF reporting, or RCEF reporting,  the traceTarget 
-        attribute shall be null value, the areaScope attribute shall carry 
-        one or list of eNBs/gNBs";
+        attribute shall be null value.
       reference "3GPP TS 32.422";
     }
 
@@ -564,14 +579,14 @@ module _3gpp-common-trace {
       reference "Clause 5.1 of 3GPP TS 32.422";
     }
 
-    leaf MDTAnonymizationOfData {
+    leaf AnonymizationOfMDTData {
       when ../areaScope ;
       type enumeration {
         enum NO_IDENTITY;
         enum TAC_OF_IMEI;
       }
       default NO_IDENTITY;
-      description "Specifies level of MDT anonymization.";
+      description "Specifies the level of anonymization for management based MDT.";
       reference "3GPP TS 32.422 clause 5.10.12.";
     }
 
@@ -607,7 +622,7 @@ module _3gpp-common-trace {
       uses AreaScopeGrp;
     }
 
-    leaf MDTCollectionPeriodRrmLte {
+    leaf CollectionPeriodRrmLte {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -622,7 +637,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.20 of 3GPP TS 32.422";
     }
 
-    leaf MDTCollectionPeriodM6Lte {
+    leaf CollectionPeriodM6Lte {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -636,7 +651,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.32 of  TS 32.422 ";
     }
     
-    leaf MDTCollectionPeriodM7Lte {
+    leaf CollectionPeriodM7Lte {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
@@ -649,7 +664,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.22 of  TS 32.422 .";
     }
     
-    leaf MDTCollectionPeriodRrmUmts {
+    leaf CollectionPeriodRrmUmts {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -664,7 +679,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.21 of 3GPP TS 32.422";
     }
 
-    leaf MDTCollectionPeriodRrmNR {
+    leaf CollectionPeriodRrmNR {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -678,7 +693,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.30 of 3GPP TS 32.422";
     }
 
-    leaf MDTCollectionPeriodM6NR {
+    leaf CollectionPeriodM6NR {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
@@ -704,7 +719,7 @@ module _3gpp-common-trace {
       reference "clause 5.10.34 of  TS 32.422";
     }
     
-    leaf MDTCollectionPeriodM7NR {
+    leaf CollectionPeriodM7NR {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -717,7 +732,7 @@ module _3gpp-common-trace {
       reference "clause 5.10.35 of  TS 32.422";
     }
     
-    leaf MDTEventListForTriggeredMeasurement {
+    leaf EventListForTriggeredMeasurement {
       when '../jobType = "LOGGED_MDT_ONLY"';
       type enumeration {
         enum OUT_OF_COVERAGE ;
@@ -733,7 +748,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.28 of 3GPP TS 32.422";
     }
 
-    leaf MDTEventThreshold {
+    leaf EventThreshold {
       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
@@ -743,7 +758,7 @@ module _3gpp-common-trace {
       reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422";
     }
 
-    leaf MDTListOfMeasurements {
+    leaf ListOfMeasurements {
       when '../jobType = "IMMEDIATE_MDT_ONLY"';
       type int64;
       mandatory true;
@@ -753,7 +768,7 @@ module _3gpp-common-trace {
       reference "3GPP TS 32.422 clause 5.10.3";
     }
 
-    leaf MDTLoggingDuration {
+    leaf LoggingDuration {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "600|1200|2400|3600|5400|7200";
@@ -767,7 +782,7 @@ module _3gpp-common-trace {
       reference "5.10.9 of 3GPP TS 32.422";
     }
 
-    leaf MDTLoggingInterval {
+    leaf LoggingInterval {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "1280|2560|5120|10240|20480|"
@@ -781,47 +796,47 @@ module _3gpp-common-trace {
       reference "5.10.8 of 3GPP TS 32.422";
     }
 
-    leaf MDTLoggingEventThreshold {
+    leaf EventThresholdL1 {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "0..127";
       }
       description "It specifies the threshold which should trigger 
         the reporting in case of event based reporting of logged NR MDT. 
-        The attribute is applicable only for Logged MDT and when MDTReportType 
+        The attribute is applicable only for Logged MDT and when ReportType 
         is configured for event triggered reporting and when 
-        MDTEventListForTriggeredMeasurement is configured for L1 event. 
+        EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
       reference "clause 5.10.36 of TS 32.422";
     }
     
-    leaf MDTLoggedHysteresis {
+    leaf Hysteresisl1 {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "0..30";
       }
       description "It specifies the hysteresis used within the entry and leave 
         condition of the L1 event based reporting of logged NR MDT. 
-        The attribute is applicable only for Logged MDT, when MDTReportType 
+        The attribute is applicable only for Logged MDT, when ReportType 
         is configured for event triggered reporting and when 
-        MDTEventListForTriggeredMeasurement is configured for L1 event. 
+        EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
       reference "clause 5.10.37 of TS 32.422";
     }
     
-    leaf MDTLoggedTimeToTrigger {
+    leaf TimeToTriggerL1 {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type int32 ;
       description "It specifies the threshold which should trigger 
         the reporting in case of event based reporting of logged NR MDT. 
-        The attribute is applicable only for Logged MDT, when MDTReportType 
+        The attribute is applicable only for Logged MDT, when ReportType 
         is configured for event triggered reporting and when 
-        MDTEventListForTriggeredMeasurement is configured for L1 event. 
+        EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
       reference "clauses 5.10.38 of TS 32.422";
     }
     
-    leaf-list MDTMBSFNAreaList {
+    leaf-list MBSFNAreaList {
       when '../jobType = "LOGGED_MBSFN_MDT"';
       type string;
       min-elements 1;
@@ -832,7 +847,7 @@ module _3gpp-common-trace {
       reference "5.10.25 of 3GPP TS 32.422";
     }
 
-    leaf MDTMeasurementPeriodLTE {
+    leaf MeasurementPeriodLTE {
           when '../jobType = "IMMEDIATE_MDT_ONLY"'
             +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -848,7 +863,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.23 of 3GPP TS 32.422";
     }
 
-    leaf MDTMeasurementPeriodUMTS {
+    leaf MeasurementPeriodUMTS {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  'or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -864,7 +879,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.22 of 3GPP TS 32.422";
     }
 
-    leaf MDTMeasurementQuantity {
+    leaf MeasurementQuantity {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint64 ;
@@ -874,7 +889,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.15 of 3GPP TS 32.422";
     }
 
-    leaf MDTM4ThresholdUmts {
+    leaf EventThresholdUphUMTS {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
@@ -887,7 +902,7 @@ module _3gpp-common-trace {
         reference "3GPP TS 32.422 clause 5.10.A";
     }
     
-    list MDTPLMList {
+    list PlmnList {
       when '../jobType = "LOGGED_MDT_ONLY"';
       key "mcc mnc";
       uses types3gpp:PLMNId;
@@ -898,7 +913,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.24 of 3GPP TS 32.422";
     }
 
-    leaf MDTPositioningMethod {
+    leaf PositioningMethod {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
@@ -911,7 +926,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.19 of 3GPP TS 32.422";
     }
 
-    leaf MDTReportAmount {
+    leaf ReportAmount {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' and ../MDTReportingTrigger = "PERIODICAL"';
       type union {
@@ -926,12 +941,12 @@ module _3gpp-common-trace {
       description "It specifies the number of measurement reports that shall be
         taken for periodic reporting while the UE is in connected.
         The attribute is applicable only for Immediate MDT and when
-        MDTReportingTrigger is configured for periodical measurements. In
+        ReportingTrigger is configured for periodical measurements. In
         case this attribute is not used, it carries a null semantic.";
       reference "Clause 5.10.6 of 3GPP TS 32.422";
     }
 
-    leaf MDTReportingTrigger {
+    leaf ReportingTrigger {
       when '../jobType = "IMMEDIATE_MDT_ONLY"';
       type enumeration {
         enum PERIODICAL;
@@ -945,13 +960,13 @@ module _3gpp-common-trace {
       description "It specifies whether periodic or event based measurements
         should be collected.
         The attribute is applicable only for Immediate MDT and when the
-        MDTListOfMeasurements is configured for M1 (for both UMTS and LTE)
+        ListOfMeasurements is configured for M1 (for both UMTS and LTE)
         or M2 (only for UMTS). In case this attribute is not used, it carries
         a null semantic.";
       reference "Clause 5.10.4 of 3GPP TS 32.422";
     }
 
-    leaf MDTReportInterval {
+    leaf ReportInterval {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' and ../MDTReportingTrigger = "PERIODICAL"';
       type uint32 {
@@ -965,12 +980,12 @@ module _3gpp-common-trace {
       description "It specifies the interval between the periodical measurements
         that shall be taken when the UE is in connected mode.
         The attribute is applicable only for Immediate MDT and when
-        MDTReportingTrigger is configured for periodical measurements. In case
+        ReportingTrigger is configured for periodical measurements. In case
         this attribute is not used, it carries a null semantic.";
       reference "5.10.5 of 3GPP TS 32.422";
     }
 
-    leaf MDTReportType {
+    leaf ReportType {
       when '../jobType = "LOGGED_MDT_ONLY"';
       type enumeration {
         enum PERIODICAL;
@@ -981,7 +996,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.27 of 3GPP TS 32.422";
     }
 
-    leaf MDTSensorInformation {
+    leaf MensorInformation {
       type bits {
         bit BAROMETRIC_PRESSURE;
         bit UE_SPEED;
@@ -995,7 +1010,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.29 of 3GPP TS 32.422";
     }
 
-    leaf MDTTraceCollectionEntityID {
+    leaf TraceCollectionEntityID {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint8;
       mandatory true;
@@ -1104,31 +1119,30 @@ module _3gpp-common-trace {
         - In case of IMMEDIATE_MDT_ONLY additionally the following attributes 
         shall be available:
           - traceTarget
-          - MDTAnonymizationOfData, 
-          - MDTListOfMeasurements, 
-          - MDTCollectionPeriodRrmUmts (conditional for M3, M4 and M5 in UMTS),
-          - MDTMeasurementPeriodUMTS (conditional for M6 and M7 in UMTS),
-          - MDTCollectionPeriodRrmLte (conditional for M2 and M3 in LTE), 
-          - MDTMeasurementPeriodLTE (conditional for M4 and M5 in LTE),
-          - MDTCollectionPeriodM6Lte (conditional for M6 in LTE), 
-          - MDTCollectionPeriodM7Lte (conditional for M7 in LTE),
-          - MDTCollectionPeriodRrmNR (conditional for M4 and M5 in NR), 
-          - MDTCollectionPeriodM6NR (conditional for M6 in NR), 
-          - MDTCollectionPeriodM7NR (conditional for M7 in NR), 
-          - MDTReportInterval (conditional for M1 in LTE or NR and M1/M2 in 
+          - AnonymizationOfData, 
+          - ListOfMeasurements, 
+          - CollectionPeriodRrmUmts (conditional for M3, M4 and M5 in UMTS),
+          - MeasurementPeriodUMTS (conditional for M6 and M7 in UMTS),
+          - CollectionPeriodRrmLte (conditional for M2 and M3 in LTE), 
+          - MeasurementPeriodLTE (conditional for M4 and M5 in LTE),
+          - CollectionPeriodM6Lte (conditional for M6 in LTE), 
+          - CollectionPeriodM7Lte (conditional for M7 in LTE),
+          - CollectionPeriodRrmNR (conditional for M4 and M5 in NR), 
+          - CollectionPeriodM6NR (conditional for M6 in NR), 
+          - CollectionPeriodM7NR (conditional for M7 in NR), 
+          - ReportInterval (conditional for M1 in LTE or NR and M1/M2 in 
             UMTS), 
-          - MDTReportAmount (conditional for M1 in LTE or NR and M1/M2 in 
+          - ReportAmount (conditional for M1 in LTE or NR and M1/M2 in 
             UMTS), 
-          - MDTReportingTrigger (conditional for M1 in LTE or NR and M1/M2 in 
+          - ReportingTrigger (conditional for M1 in LTE or NR and M1/M2 in 
             UMTS), 
-          - MDTEventThreshold (conditional for A2 event reporting or A2 event 
+          - EventThreshold (conditional for A2 event reporting or A2 event 
             triggered periodic reporting), 
-          - MDTMeasurementQuantity (conditional for 1F event reporting). 
+          - MeasurementQuantity (conditional for 1F event reporting). 
 
-        For this case the optional attribute areaScope allows to specify 
-        the area in terms of cells or Tracking Area/Routing Area/Location area 
-        where the MDT data collection shall take place and the optional 
-        attributes MDTPositioningMethod, MDTSensorInformation allow to 
+        For this case the optional attribute areaScope defines the area scope
+        of MDT, which is specified in clause 5.10.2 of TS 32.44. Additionally, the optional 
+        attributes PositioningMethod, SensorInformation allow to 
         specify the positioning methods to use or the sensor information to 
         include.
 
@@ -1136,30 +1150,27 @@ module _3gpp-common-trace {
         TRACE_ONLY and IMMEDIATE_MDT_ONLY shall apply.
 
         - In case of LOGGED_MDT_ONLY additionally the following attributes 
-        shall be available: traceTarget, MDTAnonymizationOfData, 
-        MDTTraceCollectionEntityID, MDTLoggingInterval, 
-        MDTLoggingDuration, MDTReportType, 
-        MDTEventListForTriggeredMeasurements.
-
-        For this case the optional attribute areaScope allows to specify 
-        the area in terms of cells or Tracking Area/Routing Area/Location area 
-        where the MDT data collection shall take place, the optional attribute 
-        MDTPLMNList allows to specify the PLMNs where measurement collection, 
+        shall be available: traceTarget, AnonymizationOfData, 
+        TraceCollectionEntityID, LoggingInterval, 
+        LoggingDuration, ReportType, 
+        EventListForTriggeredMeasurements.
+
+        For this case the optional attribute areaScope defines the area
+        scope of MDT, which is specified in clause 5.10.2 of TS 32.422.
+        Additionaly, the optional attribute PLMNList allows to specify the PLMNs where measurement collection, 
         status indication and log reporting is allowed, the optional attribute 
         areaConfigurationForNeighCell allows to specify the area for 
         which UE is requested to perform measurements logging for neighbour 
         cells which have list of frequencies and the optional attribute 
-        MDTSensorInformation allows to specify the sensor information to 
+        SensorInformation allows to specify the sensor information to 
         include.
 
         - In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY additionally the 
-        attribute traceTarget shall be available, the optional attribute 
-        areaScope allows to specify the eNB or list of eNBs or gNB or 
-        list of gNBs where the reports should be collected.
+        attribute traceTarget shall be available.
 
         - In case of LOGGED_MBSFN_MDT additionally the following attributes 
-        shall be available: MDTAnonymizationOfData, MDTLoggingInterval, 
-        MDTLoggingDuration, MDTMBSFNAreaList.
+        shall be available: AnonymizationOfData, LoggingInterval, 
+        LoggingDuration, MBSFNAreaList.
         
         Creation and deletion of TraceJob instances by MnS consumers is optional;
         when not supported, the TraceJob instances may be created and deleted by
-- 
GitLab


From 4b2f23d43dca1b037234e5d94b9288ae0836d29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 22 Jan 2025 09:44:42 +0000
Subject: [PATCH 02/25] Update _3gpp-common-trace.yang with new revision

---
 yang-models/_3gpp-common-trace.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 931857e8f..8e73be331 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -22,6 +22,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2025-02-05 { reference "CR-xxxx"; }
   revision 2024-11-05 { reference "CR-0468"; }
   revision 2023-11-04 { reference "CR-0292 CR-0300"; }
   revision 2023-02-16 { reference "CR-0231"; }
-- 
GitLab


From 69f88c1f1f61892a4919e665153febc411a136e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 22 Jan 2025 09:54:15 +0000
Subject: [PATCH 03/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 8e73be331..81f65082e 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -515,21 +515,21 @@ module _3gpp-common-trace {
         attribute is applicable for both Trace and MDT. This attribute
         includes the ID type of the target as an enumeration and the ID value.
 
-        The traceTarget shall be "PUBLIC_ID" "in case of a Management Based
+        The traceTarget shall be PUBLIC_ID in case of a Management Based
         Activation is done to an SCSCFFunction (Serving Call Session Control Function)
         or PCSCFFunction (Proxy Call Session Control Function) 
 
-        The traceTarget shall be "UTRAN_CELL" only in case of 
+        The traceTarget shall be UTRAN_CELL only in case of 
         UTRAN cell traffic trace function.
 
-        The traceTarget shall be "E-UTRAN_CELL" only in case of E-UTRAN cell
+        The traceTarget shall be E-UTRAN_CELL only in case of E-UTRAN cell
         traffic trace function.
         
-        The traceTarget shall be "NG-RAN_CELL" only in case of E-UTRAN cell
+        The traceTarget shall be NG-RAN_CELL only in case of E-UTRAN cell
         traffic trace function.
 
-        The traceTarget shall be either "IMSI", "IMEI" or
-        "IMEISV" if the Trace Session is activated to any of the following
+        The traceTarget shall be either IMSI, IMEI or
+        IMEISV if the Trace Session is activated to any of the following
         ManagedEntity(ies):
         - HssFunction
         - MscServerFunction
@@ -541,7 +541,7 @@ module _3gpp-common-trace {
         - ServingGWFunction
         - PGWFunction
 
-      The traceTarget shall be either “SUPI” or “IMEISV” if the Trace Session 
+      The traceTarget shall be either SUPI or IMEISV if the Trace Session 
       is activated to any of the following ManagedEntity(ies):
         - AFFunction
         - AMFFunction
@@ -556,13 +556,13 @@ module _3gpp-common-trace {
 
 
         In case of signalling based MDT, the traceTarget attribute shall be 
-        able to carry "PUBLIC_ID", "IMSI", "IMEI",  "IMEISV)" or   "SUPI".
+        able to carry PUBLIC_ID, IMSI, IMEI,  IMEISV or   SUPI.
 
         In case of management based Immediate MDT, the traceTarget attribute
         shall be null value.
 
         In case of management based Logged MDT, the traceTarget attribute 
-        shall carry an "eNB" or a "gNB" or an "RNC". 
+        shall carry an eNB or a gNB or an RNC. 
         The Logged MDT should be initiated on the specified eNB/gNB/RNC in traceTarget. 
 
         In case of RLF reporting, or RCEF reporting,  the traceTarget 
-- 
GitLab


From 40c8cfe7f8982de2b583e33648e9bbcbebdcb374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 22 Jan 2025 09:57:01 +0000
Subject: [PATCH 04/25] Update _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 81f65082e..f6e7c9396 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -566,7 +566,7 @@ module _3gpp-common-trace {
         The Logged MDT should be initiated on the specified eNB/gNB/RNC in traceTarget. 
 
         In case of RLF reporting, or RCEF reporting,  the traceTarget 
-        attribute shall be null value.
+        attribute shall be null value."; 
       reference "3GPP TS 32.422";
     }
 
-- 
GitLab


From 0c3c9ee5caace7fa4ce14dea9664ae955675c8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 22 Jan 2025 11:45:59 +0000
Subject: [PATCH 05/25] Update _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 f6e7c9396..97a0b21a1 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -22,7 +22,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
-  revision 2025-02-05 { reference "CR-xxxx"; }
+  revision 2025-02-04 { reference "CR-xxxx"; }
   revision 2024-11-05 { reference "CR-0468"; }
   revision 2023-11-04 { reference "CR-0292 CR-0300"; }
   revision 2023-02-16 { reference "CR-0231"; }
-- 
GitLab


From 593943c5151e3e4bce0c0aaf9fb435b5d62f24c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 08:39:51 +0000
Subject: [PATCH 06/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 378 +++++++++++++++++++---------
 1 file changed, 258 insertions(+), 120 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 97a0b21a1..83197d119 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -85,8 +85,8 @@ module _3gpp-common-trace {
         +'+count(gNB-CU-CPInterfaces)+count(gNB-CU-UPInterfaces)'
         +'+count(gNB-DUInterfaces)';
 
-      description "Specifies the interfaces that need to be traced in the given
-        ManagedEntityFunction.The attribute is applicable only for Trace. In
+      description "Specifies the interfaces that need to be traced.
+        The attribute is applicable only for Trace. In
         case this attribute is not used, it carries a null semantic.";
       reference "Clause 5.5 of 3GPP TS 32.422 for additional details on the
         allowed values.";
@@ -402,12 +402,11 @@ module _3gpp-common-trace {
         enum GNB_CU_UP;
         enum GNB_DU;
       }
-      description "Specifies in which type of ManagedFunction the trace should
+      description "Specifies the network element types where the trace should
         be activated. The attribute is applicable only for Trace with
         Signalling Based Trace activation. In case this attribute is not used,
         it carries a null semantic";
-      reference "Clause 5.4 of 3GPP TS 32.422 for additional details on the
-        allowed values";
+      reference "Clause 5.4 of 3GPP TS 32.422";
     }
 
     leaf PLMNTarget {
@@ -419,20 +418,17 @@ module _3gpp-common-trace {
       reference "Clause 5.9b of 3GPP TS 32.422";
     }
 
-    leaf streamingTraceConsumerURI {
+    leaf traceReportingConsumerURI {
       when '../traceReportingFormat  = "STREAMING"';
       type inet:uri;
       mandatory true;
       description "URI of the Streaming Trace data reporting MnS consumer
-        (a.k.a. streaming target).
-        This attribute shall be present if file based trace data reporting is
-        supported and traceReportingFormat set to 'file based' or when
-        jobType is set to Logged MDT or Logged MBSFN MDT.";
+        (a.k.a. streaming target).";
       reference "Clause 5.9 of 3GPP TS 32.422";
     }
 
-    leaf traceCollectionEntityAddress {
-      when '../traceReportingFormat  = "FILE_BASED" or '
+    leaf traceCollectionEntityIPAddress {
+      when '../traceReportingFormat  = "FILE-BASED" or '
         +'../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type union {
         type inet:uri;
@@ -457,12 +453,8 @@ module _3gpp-common-trace {
         enum VENDORMAXIMUM;
       }
       default MAXIMUM;
-      description "Specifies how detailed information should be recorded in the
-        Network Element. The Trace Depth is a paremeter for Trace Session level,
-        i.e., the Trace Depth is the same for all of the NEs to be traced in
-        the same Trace Session.
-        The attribute is applicable only for Trace, otherwise it carries a null
-        semantic.";
+      description "Specifies the trace depth. The attribute is applicable only
+        for Trace. In case this attribute is not used, it carries a null semantic.";
       reference "Clause 5.3 of 3GPP TS 32.422";
     }
 
@@ -475,17 +467,25 @@ module _3gpp-common-trace {
         In case of shared network, it is the MCC and MNC of the Participating
         Operator that request the trace session that shall be provided.
         The attribute is applicable for both Trace and MDT.";
+      reference "Clause 5.7 of 3GPP TS 32.422";
+    }
+
+    leaf traceRecordingSessionReference {
+      type string; 
+      description "An identifier, which identifies the Trace Recording Session.
+        The attribute is applicable for both Trace and MDT.";
+      reference "Clause 5.7 of 3GPP TS 32.422";
     }
 
     leaf traceReportingFormat {
       type enumeration {
-        enum FILE_BASED;
+        enum FILE-BASED;
         enum STREAMING;
       }
-      default FILE_BASED;
+      default FILE-BASED;
       description "Specifies the trace reporting format - streaming trace
         reporting or file-based trace reporting";
-      reference "3GPP TS 32.422 clause 5.11";
+      reference "Clause 5.11 of 3GPP TS 32.422";
     }
     list traceTarget {
       key "targetIdType targetIdValue";
@@ -556,7 +556,7 @@ module _3gpp-common-trace {
 
 
         In case of signalling based MDT, the traceTarget attribute shall be 
-        able to carry PUBLIC_ID, IMSI, IMEI,  IMEISV or   SUPI.
+        able to carry PUBLIC_ID, IMSI, IMEI,  IMEISV or SUPI.
 
         In case of management based Immediate MDT, the traceTarget attribute
         shall be null value.
@@ -570,9 +570,58 @@ module _3gpp-common-trace {
       reference "3GPP TS 32.422";
     }
 
-    leaf triggeringEvent {
+    list triggeringEvents {
       when '../jobType = "TRACE_ONLY" or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
-      type string ;
+      type enumeration {
+        enum MO_MT_CALLS;
+        enum MO_MT_SMS;
+        enum LU_IMSIattach_IMSIdetach;
+        enum HANDOVER;
+        enum SS;
+        enum PDPcontext;
+        enum MO_MT_SMS
+        enum RAU_GPRSattach_GPRSdetach;
+        enum MBMScontext;
+        enum CONTEXT;
+        enum SIPsession_StandaloneTransaction;
+        enum MBMSactivation;
+        enum UEinitiatedPDNconnectivityRequest;
+        enum ServiceRequest;
+        enum InitialAttach_TAU_Detach;
+        enum UEinitiatedPDNdisconnection;
+        enum BearerActivationModificationDeletion;
+        enum Handover;
+        enum PDNconnectionCreation;
+        enum PDNconnectionTermination;
+        enum Registration;
+        enum UEderegistration;
+        enum NetworkDeregistration;
+        enum UEMobilityFromEPC;
+        enum UEMobilityToEPC;
+        enum PDUsessionEstablishment;
+        enum PDUsessionModification;
+        enum PDUsessionRelease;
+        enum PDUsessionUPactivationDeactivation;
+        enum MobilityBtw3gppAndN3gppTo5GC;
+        enum MobilityFromEpc;
+        enum AMpolicy;
+        enum SMpolicy;
+        enum Authorization;
+        enum BDTpolicy;
+        enum N4Session;
+        enum UEauthentication;
+        enum EventExposure;
+        enum PFDmanagement;
+        enum ParameterProvision;
+        enum Trigger;
+        enum NFmanagement;
+        enum NFdiscovery;
+        enum NSSelection;
+        enum NSSAI;
+        enum SMservice;
+        enum UEcontext;
+        enum SubscriberData;
+      }
       mandatory true;
       description "Specifies the triggering event parameter of the trace session.
         The attribute is applicable only for Trace. In case this attribute is
@@ -588,29 +637,75 @@ module _3gpp-common-trace {
       }
       default NO_IDENTITY;
       description "Specifies the level of anonymization for management based MDT.";
-      reference "3GPP TS 32.422 clause 5.10.12.";
+      reference "Clause 5.10.12 of 3GPP TS 32.422";
     }
 
-    list AreaConfigurationForNeighCell {
+    list areaConfigurationForNeighCell {
       when '../jobType = "LOGGED_MDT_ONLY"';
       key "idx";
       min-elements 1;
       leaf idx { type uint32 ; }
-
       description "It specifies the area for which UE is requested to perform
         measurement logging for neighbour cells which have list of frequencies.
         If it is not configured, the UE shall perform measurement logging for
         all the neighbour cells.
+        Applicable only to Logged MDT in NR.";
+      reference "Clause 5.10.26 of 3GPP TS 32.422";
+
+      uses AreaConfiGrp
+    }
 
-        Applicable only to NR Logged MDT.";
-      reference "3GPP TS 32.422 clause 5.10.26.";
+    grouping AreaConfigGrp {
+      description "Represents the AreaConfig dataType.
+        This <<dataType>> defines the area for which measurement logging should 
+        be performed. It is described by a list of cells and a list of 
+        frequencies.";
 
-      leaf frequency {
-        type string;
+      list freqInfo {
+        key arfcn;
+        min-elements 1;
+        max-elements 32;
+        description "It specifies the carrier frequency and bands used in 
+          a cell.";
+        uses FreqInfoGrp ;
       }
 
-      leaf cell {
-        type string;
+      leaf-list pciList {
+        type uint32 {
+          range 0..1007;
+        } 
+        min-elements 1;
+        max-elements 32;
+        description "List of neighbour cells subject for MDT scope.";
+      }
+    }
+
+    grouping FreqInfoGrp {
+      description "Represents the FreqInfo dataType. 
+        This <<dataType>> defines the RF reference frequency and the frequency 
+        operating bands used in a cell for a given direction (UL or DL) in FDD 
+        or for both UL and DL directions in TDD";
+    
+      leaf arfcn {
+        type uint32 {
+          range 0..3279165;
+        }
+        mandatory true;
+        description "RF Reference Frequency as defined in TS 38.104, 
+          clause 5.4.2.1. The frequency provided identifies the absolute 
+          frequency position of the reference resource block (Common RB 0) 
+          of the carrier. Its lowest subcarrier is also known as Point A.";
+      }
+    
+      leaf-list freqBands {
+        type uint32 {
+          range 1..1024;
+        } 
+        min-elements 1;
+        description "List of NR frequency operating bands. Primary NR 
+          Operating Band as defined in TS 38.104, clause 5.4.2.3.
+          The value 1 corresponds to n1, value 2 corresponds to NR operating 
+          band n2, etc.";
       }
     }
 
@@ -623,16 +718,23 @@ module _3gpp-common-trace {
       uses AreaScopeGrp;
     }
 
-    leaf CollectionPeriodRrmLte {
+    leaf collectionPeriodRRMLTE {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
-      type uint32 {
-        range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|"
-          +"24000|28000|32000|64000";
+      type enumeration {
+        enum 100ms;
+        enum 1000ms;
+        enum 1024ms;
+        enum 1280ms;
+        enum 2048ms;
+        enum 2560ms;
+        enum 5120ms;
+        enum 10000ms;
+        enum 10240ms;
+        enum 1min;
       }
-      units milliseconds;
       description "Specifies the collection period for collecting RRM configured
-        measurement samples for M2, M3 in LTE. The attribute is applicable only
+        measurement samples for M3 in LTE. The attribute is applicable only
         for Immediate MDT. In case this attribute is not used, it carries a
         null semantic.";
       reference "Clause 5.10.20 of 3GPP TS 32.422";
@@ -665,12 +767,12 @@ module _3gpp-common-trace {
       reference "Clause 5.10.22 of  TS 32.422 .";
     }
     
-    leaf CollectionPeriodRrmUmts {
+    leaf collectionPeriodRRMUMTS {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
-        range "1024|1280|2048|2560|5120|"
-          +"10240|60000";
+        range "100|250|500|1000|2000|"
+          +"3000|4000|6000";
       }
       units milliseconds;
       description "Specifies the collection period for collecting RRM configured
@@ -680,7 +782,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.21 of 3GPP TS 32.422";
     }
 
-    leaf CollectionPeriodRrmNR {
+    leaf collectionPeriodRRMNR {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -733,7 +835,7 @@ module _3gpp-common-trace {
       reference "clause 5.10.35 of  TS 32.422";
     }
     
-    leaf EventListForTriggeredMeasurement {
+    leaf eventListForTriggeredMeasurement {
       when '../jobType = "LOGGED_MDT_ONLY"';
       type enumeration {
         enum OUT_OF_COVERAGE ;
@@ -749,7 +851,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.28 of 3GPP TS 32.422";
     }
 
-    leaf EventThreshold {
+    leaf eventThreshold {
       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
@@ -759,17 +861,17 @@ module _3gpp-common-trace {
       reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422";
     }
 
-    leaf ListOfMeasurements {
+    leaf listOfMeasurements {
       when '../jobType = "IMMEDIATE_MDT_ONLY"';
       type int64;
       mandatory true;
       description "It specifies the UE measurements that shall be collected in
         an Immediate MDT job. The attribute is applicable only for Immediate MDT.
         In case this attribute is not used, it carries a null semantic.";
-      reference "3GPP TS 32.422 clause 5.10.3";
+      reference "Clause 5.10.3 of 3GPP TS 32.422";
     }
 
-    leaf LoggingDuration {
+    leaf loggingDuration {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "600|1200|2400|3600|5400|7200";
@@ -780,24 +882,28 @@ module _3gpp-common-trace {
         UE in case of Logged MDT. The attribute is applicable only for
         Logged MDT and Logged MBSFN MDT. In case this attribute is not used, it
         carries a null semantic.";
-      reference "5.10.9 of 3GPP TS 32.422";
+      reference "Clause 5.10.9 of 3GPP TS 32.422";
     }
 
-    leaf LoggingInterval {
+    leaf loggingInterval {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
-      type uint32 {
-        range "1280|2560|5120|10240|20480|"
-          +"30720|40960|61440";
+      type union {
+        type uint32 {
+          range "320|640|1280|2560|5120|10240|20480|"
+            +30720|40960|61440";
+        }
+        type enumeration {
+          enum INFINITY;
+        }
       }
-      units milliseconds;
       mandatory true;
-      description "Specifies the periodicty for Logged MDT. The attribute is
+      description "Specifies the periodicity for Logged MDT. The attribute is
         applicable only for Logged MDT and Logged MBSFN MDT. In case this
         attribute is not used, it carries a null semantic";
-      reference "5.10.8 of 3GPP TS 32.422";
+      reference "Clause 5.10.8 of 3GPP TS 32.422";
     }
 
-    leaf EventThresholdL1 {
+    leaf eventThresholdL1 {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "0..127";
@@ -808,10 +914,10 @@ module _3gpp-common-trace {
         is configured for event triggered reporting and when 
         EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
-      reference "clause 5.10.36 of TS 32.422";
+      reference "Clause 5.10.36 of TS 32.422";
     }
     
-    leaf Hysteresisl1 {
+    leaf hysteresisl1 {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "0..30";
@@ -822,75 +928,108 @@ module _3gpp-common-trace {
         is configured for event triggered reporting and when 
         EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
-      reference "clause 5.10.37 of TS 32.422";
+      reference "Clause 5.10.37 of TS 32.422";
     }
     
-    leaf TimeToTriggerL1 {
+    leaf timeToTriggerL1 {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
-      type int32 ;
+       type int32 {
+        range 0|40|64|80|100|128|160|256|320|480|512|640|1024|1280|2560|5120;
+      }
+      units milliseconds;
       description "It specifies the threshold which should trigger 
         the reporting in case of event based reporting of logged NR MDT. 
         The attribute is applicable only for Logged MDT, when ReportType 
         is configured for event triggered reporting and when 
         EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
-      reference "clauses 5.10.38 of TS 32.422";
+      reference "Clause 5.10.38 of TS 32.422";
     }
+
+    grouping MbsfnAreaGrp {
+      description "Represents the MbsfnArea dataType. 
+        This <<dataType>> defines a MBSFN area. It is composed of the MBSFN Area 
+        identifier and the carrier frequency (EARFCN).";
     
-    leaf-list MBSFNAreaList {
-      when '../jobType = "LOGGED_MBSFN_MDT"';
-      type string;
-      min-elements 1;
+      leaf mbsfnAreaId {
+        type uint32 {
+          range 1..max;
+        }
+        mandatory true;
+        description "MBSFN Area Identifier";
+      }
+    
+      leaf earfcn{
+        type uint32 {
+          range 1..max;
+        }
+        mandatory true;
+        description "Carrier Frequency";
+      }
+    }
+
+    
+    list mbsfnAreaList {
+      when '../../../jobType = "LOGGED_MBSFN_MDT"';
+      key "mbsfnAreaId earfcn";
       max-elements 8;
       description "The MBSFN Area consists of a MBSFN Area ID and Carrier
         Frequency (EARFCN). The target MBSFN area List can have up to 8 entries.
         This parameter is applicable only if the job type is Logged MBSFN MDT.";
-      reference "5.10.25 of 3GPP TS 32.422";
+      reference "Clause 5.10.25 of 3GPP TS 32.422";
+      uses MbsfnAreaGrp;
     }
 
-    leaf MeasurementPeriodLTE {
-          when '../jobType = "IMMEDIATE_MDT_ONLY"'
-            +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
-      type uint32 {
-        range "1024|1280|2048|2560|5120|"
-          +"10240|60000";
+
+    leaf measurementPeriodLTE {
+        when '../jobType = "IMMEDIATE_MDT_ONLY"'
+          +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
+      type enumeration {
+        enum 1024ms;
+        enum 2048ms;
+        enum 5120ms;
+        enum 10240ms;
+        enum 1min;
       }
-      units milliseconds;
       mandatory true;
-      description "It specifies the measurement period for the Data Volume and
-        Scheduled IP throughput measurements for MDT taken by the eNB.
+      description "It specifies the measurement period for the Data Volume (M4) and
+        Scheduled IP throughput measurements (M5) for LTE MDT taken by the eNB.
         The attribute is applicable only for Immediate MDT. In case this
         attribute is not used, it carries a null semantic.";
       reference "Clause 5.10.23 of 3GPP TS 32.422";
     }
 
-    leaf MeasurementPeriodUMTS {
+    leaf measurementPeriodUMTS {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  'or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
-        range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|"
+        range "1000|2000|3000|4000|6000|8000|12000|16000|20000|"
           +"24000|28000|32000|64000";
       }
       units milliseconds;
       mandatory true;
-      description "It specifies the measurement period for the Data Volume and
-        Throughput measurements for MDT taken by RNC.
+      description "It specifies the measurement period for the Data Volume (M6) and
+        Throughput measurements (M7) for UMTS MDT taken by RNC.
         The attribute is applicable only for Immediate MDT. In case this
         attribute is not used, it carries a null semantic.";
       reference "Clause 5.10.22 of 3GPP TS 32.422";
     }
 
-    leaf MeasurementQuantity {
+    leaf measurementQuantity {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
-      type uint64 ;
+      type enumeration {
+        enum CPICH_ECNO;
+        enum CPICH_RSCP;
+        enum PATHLOSS;
+      }
       mandatory true;
       description "It specifies the measurements that are collected in an MDT
         job for a UMTS MDT configured for event triggered reporting.";
       reference "Clause 5.10.15 of 3GPP TS 32.422";
     }
 
-    leaf EventThresholdUphUMTS {
+    leaf eventThresholdUphUMTS {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
@@ -900,26 +1039,25 @@ module _3gpp-common-trace {
         the reporting in case of event-triggered periodic reporting for M4 
         (UE power headroom measurement) in UMTS. In case this attribute is 
         not used, it carries a null semantic.";
-        reference "3GPP TS 32.422 clause 5.10.A";
+        reference "Clause 5.10.39 of 3GPP TS 32.422";
     }
     
-    list PlmnList {
+    list plmnList {
       when '../jobType = "LOGGED_MDT_ONLY"';
       key "mcc mnc";
       uses types3gpp:PLMNId;
-      min-elements 1;
       max-elements 16;
       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";
     }
 
-    leaf PositioningMethod {
+    leaf positioningMethod {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
         enum GNSS;
-        enum E_CELL_ID;
+        enum E-CELL_ID;
       }
       mandatory true;
       description "It specifies what positioning method should be used in the
@@ -927,7 +1065,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.19 of 3GPP TS 32.422";
     }
 
-    leaf ReportAmount {
+    leaf reportAmount {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' and ../MDTReportingTrigger = "PERIODICAL"';
       type union {
@@ -947,7 +1085,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.6 of 3GPP TS 32.422";
     }
 
-    leaf ReportingTrigger {
+    leaf reportingTrigger {
       when '../jobType = "IMMEDIATE_MDT_ONLY"';
       type enumeration {
         enum PERIODICAL;
@@ -967,7 +1105,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.4 of 3GPP TS 32.422";
     }
 
-    leaf ReportInterval {
+    leaf reportInterval {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' and ../MDTReportingTrigger = "PERIODICAL"';
       type uint32 {
@@ -986,7 +1124,7 @@ module _3gpp-common-trace {
       reference "5.10.5 of 3GPP TS 32.422";
     }
 
-    leaf ReportType {
+    leaf reportType {
       when '../jobType = "LOGGED_MDT_ONLY"';
       type enumeration {
         enum PERIODICAL;
@@ -997,7 +1135,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.27 of 3GPP TS 32.422";
     }
 
-    leaf MensorInformation {
+    leaf sensorInformation {
       type bits {
         bit BAROMETRIC_PRESSURE;
         bit UE_SPEED;
@@ -1011,7 +1149,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.29 of 3GPP TS 32.422";
     }
 
-    leaf TraceCollectionEntityID {
+    leaf traceCollectionEntityID {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type uint8;
       mandatory true;
@@ -1070,7 +1208,7 @@ module _3gpp-common-trace {
   grouping TraceSubtree {
     description "Contains classes that manage Tracing.
       Should be used in all  classes (or classes inheriting from)
-      - SubNnetwork
+      - SubNetwork
       - ManagedElement
       - ManagedFunction
 
@@ -1112,7 +1250,7 @@ module _3gpp-common-trace {
         For the different job types the attributes are differentiated as follows:
         - In case of TRACE_ONLY additionally the following attributes shall be 
         available: listOfNeTypes, traceDepth, traceTarget and 
-        triggeringEvent.
+        triggeringEvents.
 
         For this case the optional attribute listOfInterfaces allows to 
         specify the interfaces to be recorded.
@@ -1120,30 +1258,30 @@ module _3gpp-common-trace {
         - In case of IMMEDIATE_MDT_ONLY additionally the following attributes 
         shall be available:
           - traceTarget
-          - AnonymizationOfData, 
-          - ListOfMeasurements, 
-          - CollectionPeriodRrmUmts (conditional for M3, M4 and M5 in UMTS),
-          - MeasurementPeriodUMTS (conditional for M6 and M7 in UMTS),
-          - CollectionPeriodRrmLte (conditional for M2 and M3 in LTE), 
-          - MeasurementPeriodLTE (conditional for M4 and M5 in LTE),
-          - CollectionPeriodM6Lte (conditional for M6 in LTE), 
-          - CollectionPeriodM7Lte (conditional for M7 in LTE),
-          - CollectionPeriodRrmNR (conditional for M4 and M5 in NR), 
-          - CollectionPeriodM6NR (conditional for M6 in NR), 
-          - CollectionPeriodM7NR (conditional for M7 in NR), 
-          - ReportInterval (conditional for M1 in LTE or NR and M1/M2 in 
+          - anonymizationOfData, 
+          - listOfMeasurements, 
+          - collectionPeriodRRMUMTS (conditional for M3, M4 and M5 in UMTS),
+          - measurementPeriodUMTS (conditional for M6 and M7 in UMTS),
+          - collectionPeriodRRMLTE (conditional for M2 and M3 in LTE), 
+          - measurementPeriodLTE (conditional for M4 and M5 in LTE),
+          - collectionPeriodM6LTE (conditional for M6 in LTE), 
+          - collectionPeriodM7LTe (conditional for M7 in LTE),
+          - collectionPeriodRRMR (conditional for M4 and M5 in NR), 
+          - collectionPeriodM6NR (conditional for M6 in NR), 
+          - collectionPeriodM7NR (conditional for M7 in NR), 
+          - reportInterval (conditional for M1 in LTE or NR and M1/M2 in 
             UMTS), 
-          - ReportAmount (conditional for M1 in LTE or NR and M1/M2 in 
+          - reportAmount (conditional for M1 in LTE or NR and M1/M2 in 
             UMTS), 
-          - ReportingTrigger (conditional for M1 in LTE or NR and M1/M2 in 
+          - reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in 
             UMTS), 
-          - EventThreshold (conditional for A2 event reporting or A2 event 
+          - eventThreshold (conditional for A2 event reporting or A2 event 
             triggered periodic reporting), 
-          - MeasurementQuantity (conditional for 1F event reporting). 
+          - measurementQuantity (conditional for 1F event reporting). 
 
         For this case the optional attribute areaScope defines the area scope
         of MDT, which is specified in clause 5.10.2 of TS 32.44. Additionally, the optional 
-        attributes PositioningMethod, SensorInformation allow to 
+        attributes positioningMethod, sensorInformation allow to 
         specify the positioning methods to use or the sensor information to 
         include.
 
@@ -1151,10 +1289,10 @@ module _3gpp-common-trace {
         TRACE_ONLY and IMMEDIATE_MDT_ONLY shall apply.
 
         - In case of LOGGED_MDT_ONLY additionally the following attributes 
-        shall be available: traceTarget, AnonymizationOfData, 
-        TraceCollectionEntityID, LoggingInterval, 
-        LoggingDuration, ReportType, 
-        EventListForTriggeredMeasurements.
+        shall be available: traceTarget, anonymizationOfData, 
+        traceCollectionEntityID, loggingInterval, 
+        loggingDuration, reportType, 
+        eventListForTriggeredMeasurements.
 
         For this case the optional attribute areaScope defines the area
         scope of MDT, which is specified in clause 5.10.2 of TS 32.422.
@@ -1170,8 +1308,8 @@ module _3gpp-common-trace {
         attribute traceTarget shall be available.
 
         - In case of LOGGED_MBSFN_MDT additionally the following attributes 
-        shall be available: AnonymizationOfData, LoggingInterval, 
-        LoggingDuration, MBSFNAreaList.
+        shall be available: anonymizationOfData, loggingInterval, 
+        loggingDuration, msbnfAreaList.
         
         Creation and deletion of TraceJob instances by MnS consumers is optional;
         when not supported, the TraceJob instances may be created and deleted by
-- 
GitLab


From e4a7f3feaacbc8b6713484e8cdd0f02b8a7870c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 08:45:28 +0000
Subject: [PATCH 07/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 96 ++++++++++++++---------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 83197d119..49770d0d6 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -573,54 +573,54 @@ module _3gpp-common-trace {
     list triggeringEvents {
       when '../jobType = "TRACE_ONLY" or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
-        enum MO_MT_CALLS;
-        enum MO_MT_SMS;
-        enum LU_IMSIattach_IMSIdetach;
-        enum HANDOVER;
-        enum SS;
-        enum PDPcontext;
-        enum MO_MT_SMS
-        enum RAU_GPRSattach_GPRSdetach;
-        enum MBMScontext;
-        enum CONTEXT;
-        enum SIPsession_StandaloneTransaction;
-        enum MBMSactivation;
-        enum UEinitiatedPDNconnectivityRequest;
-        enum ServiceRequest;
-        enum InitialAttach_TAU_Detach;
-        enum UEinitiatedPDNdisconnection;
-        enum BearerActivationModificationDeletion;
-        enum Handover;
-        enum PDNconnectionCreation;
-        enum PDNconnectionTermination;
-        enum Registration;
-        enum UEderegistration;
-        enum NetworkDeregistration;
-        enum UEMobilityFromEPC;
-        enum UEMobilityToEPC;
-        enum PDUsessionEstablishment;
-        enum PDUsessionModification;
-        enum PDUsessionRelease;
-        enum PDUsessionUPactivationDeactivation;
-        enum MobilityBtw3gppAndN3gppTo5GC;
-        enum MobilityFromEpc;
-        enum AMpolicy;
-        enum SMpolicy;
-        enum Authorization;
-        enum BDTpolicy;
-        enum N4Session;
-        enum UEauthentication;
-        enum EventExposure;
-        enum PFDmanagement;
-        enum ParameterProvision;
-        enum Trigger;
-        enum NFmanagement;
-        enum NFdiscovery;
-        enum NSSelection;
-        enum NSSAI;
-        enum SMservice;
-        enum UEcontext;
-        enum SubscriberData;
+        enum MO_MT_CALLS ;
+        enum MO_MT_SMS ; 
+        enum LU_IMSIattach_IMSIdetach ; 
+        enum HANDOVER ;
+        enum SS ;
+        enum PDPcontext ;
+        enum MO_MT_SMS ; 
+        enum RAU_GPRSattach_GPRSdetach ;
+        enum MBMScontext ;
+        enum CONTEXT ;
+        enum SIPsession_StandaloneTransaction ;
+        enum MBMSactivation ;
+        enum UEinitiatedPDNconnectivityRequest ;
+        enum ServiceRequest ;
+        enum InitialAttach_TAU_Detach ;
+        enum UEinitiatedPDNdisconnection ;
+        enum BearerActivationModificationDeletion ;
+        enum Handover ;
+        enum PDNconnectionCreation ;
+        enum PDNconnectionTermination ;
+        enum Registration ;
+        enum UEderegistration ;
+        enum NetworkDeregistration ;
+        enum UEMobilityFromEPC ;
+        enum UEMobilityToEPC ;
+        enum PDUsessionEstablishment ;
+        enum PDUsessionModification ;
+        enum PDUsessionRelease ;
+        enum PDUsessionUPactivationDeactivation ;
+        enum MobilityBtw3gppAndN3gppTo5GC ;
+        enum MobilityFromEpc ;
+        enum AMpolicy ;
+        enum SMpolicy ;
+        enum Authorization ;
+        enum BDTpolicy ;
+        enum N4Session ;
+        enum UEauthentication ;
+        enum EventExposure ;
+        enum PFDmanagement ;
+        enum ParameterProvision ;
+        enum Trigger ;
+        enum NFmanagement ;
+        enum NFdiscovery ;
+        enum NSSelection ;
+        enum NSSAI ;
+        enum SMservice ;
+        enum UEcontext ;
+        enum SubscriberData ;
       }
       mandatory true;
       description "Specifies the triggering event parameter of the trace session.
-- 
GitLab


From b6d2cb2b3cc411c421a21ed0f63f05a795b08286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 08:48:08 +0000
Subject: [PATCH 08/25] Update _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 49770d0d6..0abf7abfb 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -652,7 +652,7 @@ module _3gpp-common-trace {
         Applicable only to Logged MDT in NR.";
       reference "Clause 5.10.26 of 3GPP TS 32.422";
 
-      uses AreaConfiGrp
+      uses AreaConfigGrp;
     }
 
     grouping AreaConfigGrp {
-- 
GitLab


From 933316b351d46f6857d2cbe9e999d9472ac5d633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 08:50:09 +0000
Subject: [PATCH 09/25] Update _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 0abf7abfb..fbeef7f9b 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -890,7 +890,7 @@ module _3gpp-common-trace {
       type union {
         type uint32 {
           range "320|640|1280|2560|5120|10240|20480|"
-            +30720|40960|61440";
+            +"30720|40960|61440";
         }
         type enumeration {
           enum INFINITY;
-- 
GitLab


From 2bdbce9ad5cccc4a15f02bf212c779aa0ec5e441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 08:55:57 +0000
Subject: [PATCH 10/25] Update _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 fbeef7f9b..917992886 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -970,7 +970,7 @@ module _3gpp-common-trace {
 
     
     list mbsfnAreaList {
-      when '../../../jobType = "LOGGED_MBSFN_MDT"';
+      when '../jobType = "LOGGED_MBSFN_MDT"';
       key "mbsfnAreaId earfcn";
       max-elements 8;
       description "The MBSFN Area consists of a MBSFN Area ID and Carrier
-- 
GitLab


From e034813e7eec4b28ef625df5a962f03ccb2672f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 09:01:49 +0000
Subject: [PATCH 11/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 917992886..268c1be78 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1067,7 +1067,7 @@ module _3gpp-common-trace {
 
     leaf reportAmount {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
-        +  ' and ../MDTReportingTrigger = "PERIODICAL"';
+        +  ' and ../reportingTrigger = "PERIODICAL"';
       type union {
         type uint32 {
           range "1|4|8|16|32|64" ;
@@ -1080,7 +1080,7 @@ module _3gpp-common-trace {
       description "It specifies the number of measurement reports that shall be
         taken for periodic reporting while the UE is in connected.
         The attribute is applicable only for Immediate MDT and when
-        ReportingTrigger is configured for periodical measurements. In
+        reportingTrigger is configured for periodical measurements. In
         case this attribute is not used, it carries a null semantic.";
       reference "Clause 5.10.6 of 3GPP TS 32.422";
     }
-- 
GitLab


From 7ad6ed351f036dea2b02b7bdc45698a91d8e2b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 09:04:45 +0000
Subject: [PATCH 12/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 268c1be78..c134da852 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -926,7 +926,7 @@ module _3gpp-common-trace {
         condition of the L1 event based reporting of logged NR MDT. 
         The attribute is applicable only for Logged MDT, when ReportType 
         is configured for event triggered reporting and when 
-        EventListForTriggeredMeasurement is configured for L1 event. 
+        eventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
       reference "Clause 5.10.37 of TS 32.422";
     }
@@ -1107,7 +1107,7 @@ module _3gpp-common-trace {
 
     leaf reportInterval {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
-        +  ' and ../MDTReportingTrigger = "PERIODICAL"';
+        +  ' and ../reportingTrigger = "PERIODICAL"';
       type uint32 {
         range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|"
           +"5120|6000|8000|10240|12000|16000|20000|"
@@ -1119,7 +1119,7 @@ module _3gpp-common-trace {
       description "It specifies the interval between the periodical measurements
         that shall be taken when the UE is in connected mode.
         The attribute is applicable only for Immediate MDT and when
-        ReportingTrigger is configured for periodical measurements. In case
+        reportingTrigger is configured for periodical measurements. In case
         this attribute is not used, it carries a null semantic.";
       reference "5.10.5 of 3GPP TS 32.422";
     }
-- 
GitLab


From de3b67ddfc8f9c4c80cab5a91fc83b981a3de4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 09:10:40 +0000
Subject: [PATCH 13/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index c134da852..18de5cdeb 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -570,7 +570,7 @@ module _3gpp-common-trace {
       reference "3GPP TS 32.422";
     }
 
-    list triggeringEvents {
+    leaf triggeringEvents {
       when '../jobType = "TRACE_ONLY" or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
         enum MO_MT_CALLS ;
@@ -629,7 +629,7 @@ module _3gpp-common-trace {
       reference "Clause 5.1 of 3GPP TS 32.422";
     }
 
-    leaf AnonymizationOfMDTData {
+    leaf anonymizationOfMDTData {
       when ../areaScope ;
       type enumeration {
         enum NO_IDENTITY;
-- 
GitLab


From 7049a13d9357cbea427127bb1dc8769e5dea9220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 23 Jan 2025 09:12:08 +0000
Subject: [PATCH 14/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 18de5cdeb..723ae47d9 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -579,7 +579,6 @@ module _3gpp-common-trace {
         enum HANDOVER ;
         enum SS ;
         enum PDPcontext ;
-        enum MO_MT_SMS ; 
         enum RAU_GPRSattach_GPRSdetach ;
         enum MBMScontext ;
         enum CONTEXT ;
-- 
GitLab


From 867bfa32320cf1dc011fe7c00a25ac6126b8a79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 28 Jan 2025 17:33:01 +0000
Subject: [PATCH 15/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 723ae47d9..3a1581f41 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1022,7 +1022,6 @@ module _3gpp-common-trace {
         enum CPICH_RSCP;
         enum PATHLOSS;
       }
-      mandatory true;
       description "It specifies the measurements that are collected in an MDT
         job for a UMTS MDT configured for event triggered reporting.";
       reference "Clause 5.10.15 of 3GPP TS 32.422";
-- 
GitLab


From 0a8daf422a0adc92afc9d50898455774c33699a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 28 Jan 2025 17:54:49 +0000
Subject: [PATCH 16/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 3a1581f41..f3674269d 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -909,7 +909,7 @@ module _3gpp-common-trace {
       }
       description "It specifies the threshold which should trigger 
         the reporting in case of event based reporting of logged NR MDT. 
-        The attribute is applicable only for Logged MDT and when ReportType 
+        The attribute is applicable only for Logged MDT and when reportType 
         is configured for event triggered reporting and when 
         EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
@@ -923,7 +923,7 @@ module _3gpp-common-trace {
       }
       description "It specifies the hysteresis used within the entry and leave 
         condition of the L1 event based reporting of logged NR MDT. 
-        The attribute is applicable only for Logged MDT, when ReportType 
+        The attribute is applicable only for Logged MDT, when reportType 
         is configured for event triggered reporting and when 
         eventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
@@ -938,7 +938,7 @@ module _3gpp-common-trace {
       units milliseconds;
       description "It specifies the threshold which should trigger 
         the reporting in case of event based reporting of logged NR MDT. 
-        The attribute is applicable only for Logged MDT, when ReportType 
+        The attribute is applicable only for Logged MDT, when reportType 
         is configured for event triggered reporting and when 
         EventListForTriggeredMeasurement is configured for L1 event. 
         In case this attribute is not used, it carries a null semantic.";
@@ -1070,6 +1070,7 @@ module _3gpp-common-trace {
         type uint32 {
           range "1|4|8|16|32|64" ;
         }
+        units milliseconds;
         type enumeration {
           enum INFINITY;
         }
-- 
GitLab


From 89f5fad2bca5473a024bf212965c447d4b1a1d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 28 Jan 2025 18:14:56 +0000
Subject: [PATCH 17/25] Update _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 f3674269d..06f56fd49 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1070,10 +1070,10 @@ module _3gpp-common-trace {
         type uint32 {
           range "1|4|8|16|32|64" ;
         }
-        units milliseconds;
         type enumeration {
           enum INFINITY;
         }
+      units milliseconds;
       }
       mandatory true;
       description "It specifies the number of measurement reports that shall be
-- 
GitLab


From ad9cd00181fc8c851759b33e1a0d87643a733500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 28 Jan 2025 18:18:43 +0000
Subject: [PATCH 18/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 06f56fd49..46563d3a8 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -887,13 +887,17 @@ module _3gpp-common-trace {
     leaf loggingInterval {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
       type union {
-        type uint32 {
-          range "320|640|1280|2560|5120|10240|20480|"
-            +"30720|40960|61440";
-        }
-        type enumeration {
-          enum INFINITY;
-        }
+        enum 320ms;
+        enum 640ms;
+        enum 1280ms;
+        enum 2560ms;
+        enum 5120ms;
+        enum 10240ms;
+        enum 20480ms;
+        enum 30720ms;
+        enum 40960ms;
+        enum 61440ms;
+        enum INFINITY;
       }
       mandatory true;
       description "Specifies the periodicity for Logged MDT. The attribute is
-- 
GitLab


From c47e2b31e4d461791858347ed9fcf5648233c134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 28 Jan 2025 18:19:00 +0000
Subject: [PATCH 19/25] Update _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 46563d3a8..a9a9b35f6 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -886,7 +886,7 @@ module _3gpp-common-trace {
 
     leaf loggingInterval {
       when '../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
-      type union {
+      type enumeration {
         enum 320ms;
         enum 640ms;
         enum 1280ms;
-- 
GitLab


From 6561beafc8498643951c896cd8fc248753b71524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 28 Jan 2025 18:21:59 +0000
Subject: [PATCH 20/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index a9a9b35f6..7f8858bdd 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1070,14 +1070,14 @@ module _3gpp-common-trace {
     leaf reportAmount {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' and ../reportingTrigger = "PERIODICAL"';
-      type union {
-        type uint32 {
-          range "1|4|8|16|32|64" ;
-        }
-        type enumeration {
-          enum INFINITY;
-        }
-      units milliseconds;
+      type enumeration {
+        enum 1ms;
+        enum 4ms;
+        enum 8ms;
+        enum 16ms;
+        enum 32ms;
+        enum 64ms;
+        enum INFINITY;
       }
       mandatory true;
       description "It specifies the number of measurement reports that shall be
-- 
GitLab


From b9386004b56d9f7b7198ced9b811c2cb02ab43d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 29 Jan 2025 15:49:21 +0000
Subject: [PATCH 21/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 7f8858bdd..d8281661a 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -739,7 +739,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.20 of 3GPP TS 32.422";
     }
 
-    leaf CollectionPeriodM6Lte {
+    leaf CollectionPeriodM6LTE {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -753,7 +753,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.32 of  TS 32.422 ";
     }
     
-    leaf CollectionPeriodM7Lte {
+    leaf CollectionPeriodM7LTE {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
-- 
GitLab


From 7f2496be3f681ae0fe9640730fc95fd6c3d318da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 29 Jan 2025 16:02:05 +0000
Subject: [PATCH 22/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index d8281661a..269255a0a 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -739,7 +739,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.20 of 3GPP TS 32.422";
     }
 
-    leaf CollectionPeriodM6LTE {
+    leaf collectionPeriodM6LTE {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -753,7 +753,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.32 of  TS 32.422 ";
     }
     
-    leaf CollectionPeriodM7LTE {
+    leaf collectionPeriodM7LTE {
       when '../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
@@ -795,7 +795,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.30 of 3GPP TS 32.422";
     }
 
-    leaf CollectionPeriodM6NR {
+    leaf collectionPeriodM6NR {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
@@ -821,7 +821,7 @@ module _3gpp-common-trace {
       reference "clause 5.10.34 of  TS 32.422";
     }
     
-    leaf CollectionPeriodM7NR {
+    leaf collectionPeriodM7NR {
       when '../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -1079,7 +1079,6 @@ module _3gpp-common-trace {
         enum 64ms;
         enum INFINITY;
       }
-      mandatory true;
       description "It specifies the number of measurement reports that shall be
         taken for periodic reporting while the UE is in connected.
         The attribute is applicable only for Immediate MDT and when
-- 
GitLab


From 6c90568386a0ffb417f1974fa72479592933be11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 29 Jan 2025 16:05:50 +0000
Subject: [PATCH 23/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 269255a0a..7e7250d55 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1138,12 +1138,11 @@ module _3gpp-common-trace {
     }
 
     leaf sensorInformation {
-      type bits {
-        bit BAROMETRIC_PRESSURE;
-        bit UE_SPEED;
-        bit UE_ORIENTATION;
+      type enumeration {
+        enum BAROMETRIC_PRESSURE;
+        enum UE_SPEED;
+        enum UE_ORIENTATION;
       }
-      default "";
       description "It specifies which sensor information shall be included in
         logged NR MDT and immediate NR MDT measurement if they are available.
         The following sensor measurement can be included or excluded for 
-- 
GitLab


From d6394199274536332f785efc6c0bc2aaa44926d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Wed, 29 Jan 2025 16:15:19 +0000
Subject: [PATCH 24/25] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 40 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 7e7250d55..064f28335 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1258,27 +1258,25 @@ module _3gpp-common-trace {
 
         - In case of IMMEDIATE_MDT_ONLY additionally the following attributes 
         shall be available:
-          - traceTarget
-          - anonymizationOfData, 
-          - listOfMeasurements, 
-          - collectionPeriodRRMUMTS (conditional for M3, M4 and M5 in UMTS),
-          - measurementPeriodUMTS (conditional for M6 and M7 in UMTS),
-          - collectionPeriodRRMLTE (conditional for M2 and M3 in LTE), 
-          - measurementPeriodLTE (conditional for M4 and M5 in LTE),
-          - collectionPeriodM6LTE (conditional for M6 in LTE), 
-          - collectionPeriodM7LTe (conditional for M7 in LTE),
-          - collectionPeriodRRMR (conditional for M4 and M5 in NR), 
-          - collectionPeriodM6NR (conditional for M6 in NR), 
-          - collectionPeriodM7NR (conditional for M7 in NR), 
-          - reportInterval (conditional for M1 in LTE or NR and M1/M2 in 
-            UMTS), 
-          - reportAmount (conditional for M1 in LTE or NR and M1/M2 in 
-            UMTS), 
-          - reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in 
-            UMTS), 
-          - eventThreshold (conditional for A2 event reporting or A2 event 
-            triggered periodic reporting), 
-          - measurementQuantity (conditional for 1F event reporting). 
+          -	anonymizationOfMDTData, 
+          -	listOfMeasurements, 
+          -	collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS),
+          -	measurementPeriodUMTS (conditional for M6 and M7 in UMTS),
+          -	collectionPeriodRRMLTE (conditional for M3 in LTE), 
+          -	measurementPeriodLTE (conditional for M4 and M5 in LTE),
+          -	collectionPeriodM6LTE (conditional for M6 in LTE), 
+          -	collectionPeriodM7LTE (conditional for M7 in LTE),
+          -	collectionPeriodRRMNR (conditional for M4 and M5 in NR), 
+          -	collectionPeriodM6NR (conditional for M6 in NR), 
+          -	collectionPeriodM7NR (conditional for M7 in NR), 
+          -	beamLevelMeasurement (conditional for M1 in NR),
+          -	reportInterval (conditional for M1 in LTE or NR and M1/M2 in UMTS), 
+          -	reportAmount (conditional for M1 in LTE or NR and M1/M2 in UMTS), 
+          -	reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in UMTS), 
+          -	eventThreshold (conditional for A2 event reporting or A2 event triggered periodic reporting), 
+          -	measurementQuantity (conditional for 1F event reporting). 
+          -	excessPacketDelayThresholds (conditional for M6 UL measurement in NR). 
+
 
         For this case the optional attribute areaScope defines the area scope
         of MDT, which is specified in clause 5.10.2 of TS 32.44. Additionally, the optional 
-- 
GitLab


From adeaeb127beede3c687ebb897b91912b12d326c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Thu, 6 Feb 2025 09:47:33 +0000
Subject: [PATCH 25/25] Update _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 064f28335..986700f4f 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -22,7 +22,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
-  revision 2025-02-04 { reference "CR-xxxx"; }
+  revision 2025-02-04 { reference "CR-0501"; }
   revision 2024-11-05 { reference "CR-0468"; }
   revision 2023-11-04 { reference "CR-0292 CR-0300"; }
   revision 2023-02-16 { reference "CR-0231"; }
-- 
GitLab