From 3390db97055bb156837c89faafe08a4c3690e2c1 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 12:55:53 +0000
Subject: [PATCH 01/20] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 297 +++++++++++++++++++---------
 1 file changed, 206 insertions(+), 91 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index d27c56607..828e62466 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -13,7 +13,7 @@ module _3gpp-common-trace {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
   description "Trace handling
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
@@ -25,6 +25,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2025-02-06 { reference "CR-XXXX" ; }
   revision 2024-11-05 { reference "CR-0470" ; }
   revision 2024-10-06 { reference "CR-0459"; }
   revision 2024-08-06 { reference "CR-0376 CR-0378 CR-0420"; }
@@ -576,12 +577,10 @@ 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";
+        Signalling Based Trace activation. ";
+      reference "Clause 5.4 of 3GPP TS 32.422";
     }
 
     leaf traceDepth {
@@ -596,71 +595,166 @@ 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 "It specifies the trace depth. The attribute is applicable only for Trace.";
       reference "Clause 5.3 of 3GPP TS 32.422";
     }  
     
-    leaf triggeringEvents {
-      type enumeration {
-        enum MO_MT_CALLS;
-        enum MO_MT_SMS;
-        enum LU_IMSIattach_IMSIdetach;
-        enum HANDOVER;
-        enum SS;
-        enum PDPcontext;
-        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;
-      }
+    list triggeringEvents {
+      key idx;
       description "It specifies the triggering event parameter of the trace 
-        session. The attribute is applicable only for Trace. In case this 
-        attribute is not used, it carries a null semantic.
+        session. The attribute is applicable only for Trace.";
+      reference "Clause 5.1 of 3GPP TS 32.422"; 
+      leaf idx { type unit32; }
 
-        See the clause 5.1 of 3GPP TS 32.422 for additional details on the 
-        allowed values.";
+      leaf-list MSC_SERVER {
+        type enumeration {
+          enum MO_MT_CALLS;
+          enum MO_MT_SMS;
+          enum LU_IMSIattach_IMSIdetach;
+          enum SS; 
+        }
+      }
+
+      leaf-list SGSN {
+        type enumeration {
+          enum PDPcontext;
+          enum MO_MT_SMS;
+          enum RAU_GPRSattach_GPRSdetach;
+          MBMScontext;
+        }
+      }
+
+      
+      leaf-list MGW {
+        type enumeration {
+          enum CONTEXT
+        }
+      }
+
+      leaf-list GGSN {
+        type enumeration {
+          enum PDPcontext;
+          enum MBMScontext;
+        }
+      }
+
+      leaf-list IMS {
+        type enumeration {
+          enum SIPsession_StandaloenTransaction;
+        }
+      }
+
+      leaf-list BM_SC {
+        type enumeration {
+          enum MBMSactivation;
+        }
+      }
+
+      leaf-list MME {
+        type enumeration {
+          enum UEinitiatedPDNconnectivityRequest;
+          enum ServiceRequest;
+          enum InitialAttach_TAU_Detach;
+          enum UEInitiatedPDNdisconnection;
+          enum BearerActivationModificationDeletion;
+          enum Handover;
+        }
+      }
+
+      
+      leaf-list SGW {
+        type enumeration {
+          enum PDNconnectionCreation;
+          enum PDNconnectionTermination;
+          enum BearerActivationModificationDeletion;
+        }
+      }
+
+      leaf-list PGW {
+        type enumeration {
+          enum PDNconnectionCreation;
+          enum PDNconnectionTermination;
+          enum BearerActivationModificationDeletion;
+        }
+      }
+
+      leaf-list AMF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list SMF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list PCF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list UPF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list AUSF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list NEF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list NRF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list NSSF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list SMSF {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+      leaf-list UDM {
+        type enumeration {
+          enum X;
+          enum Y;
+        }
+      }
+
+
+
+
+
+
+     
+      
     }
   }
 
@@ -1665,13 +1759,20 @@ 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 UTRAN_CELL only in case of the 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 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 NG_RAN_CELL only in case of NR 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
@@ -1680,28 +1781,42 @@ module _3gpp-common-trace {
         - BmscFunction
         - RncFunction
         - MmeFunction
+        - ServingGWFunction
+        - PGWFunction
+
+        The traceTarget shall be either SUPI or IMEISV if the Trace Session
+        is activated to any of the followed ManagedEntity(ies):
+        - AFFunction
+        - AMFFunction
+        - AUSFFunction
+        - NEFFunction
+        - NRFFunction
+        - NSSFFunction
+        - PCSCFFunction
+        - SMFFunction
+        - UPFFunction
+        - UDMFunction
+
+        In case of signalling based MDT, the traceTarget attribute should
+        be able to carry PUBLIC_ID, IMSI, IMEI, IMEISV or SUPI.
 
-        The traceTarget shall be IMSI if the Trace Session is activated to a
-        ManagedEntity playing a role of ServinGWFunction.
+        In case of management based Immediate MDT, the traceTarget attribute
+        shall be null value.
 
-        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).
+        In case of management based Logged MDT, the traceTarge attribute
+        shall carry an eNB or gNB or an RNC. The Logged MDT should be
+        initiated on the specified eNB/gNB/RNC in traceTarget.
 
-        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).
-
-        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 RLF reporting, or RCEF reporting,  the traceTarget 
-        attribute shall be null value, the areaScope attribute shall carry 
-        one or list of eNBs/gNBs";
+        In case of RLF reporting, or RCEF reporting, the traceTarget attribute
+        shall be null value. 
+
+        In case of signalling based 5GC UE level measurements collection, the 
+        traceTarget attribute shall be able to carry IMEISV or SUPI.
+        
+        In case of management based 5GC UE level measurements collection, the
+        traceTarget attribute shall be to carry the corresponding Measured UE
+        Identifier as defined by the bullet g) of the 5GC UE level measurements
+        (see TS 28.559) when the traceJob is craeted at the subject ManagedEntity";
       reference "3GPP TS 32.422";
     }
 
-- 
GitLab


From 22d2405d7983a7d13c0b531e78b4b30d494e0ccd 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:11:51 +0000
Subject: [PATCH 02/20] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 413 +++++++++++++---------------
 1 file changed, 195 insertions(+), 218 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 828e62466..2db45da1e 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -680,81 +680,90 @@ module _3gpp-common-trace {
 
       leaf-list AMF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum Registration;
+          enum ServiceRequest;
+          enum Handover;
+          enum UEderegistration;
+          enum NetworkDeregistration;
+          enum UEMobilityFromEPC;
+          enum UEMobilityToEPC;
+          enum CovergedChargingService;
         }
       }
 
       leaf-list SMF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum PDUsessionEstablishment;
+          enum PDUsessionModification;
+          enum PDUsessionRelease;
+          enum PDUsessionUPactivationDeactivation;
+          enum MobilityBtw3gppAndN3gppTo5GC;
+          enum MobilityFromEpc;
+          enum MobilityBtwISMForVSMF;
+          enum CovergedChargingService;
+          enum OfflineOnlyCharging;
         }
       }
 
       leaf-list PCF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum AMpolicy;
+          enum SMpolicy;
+          enum Authorization;
+          enum BDTpolicy;
+          enum SpendingLimitControl;
         }
       }
 
       leaf-list UPF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum N4Session;
         }
       }
 
       leaf-list AUSF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum UEauthentication;
         }
       }
 
       leaf-list NEF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum EventExposure;
+          enum PFDmanagement;
+          enum ParameterProvisiong;
+          enum Trigger;
         }
       }
 
       leaf-list NRF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum NFmanagement;
+          enum NFdiscovery;
         }
       }
 
       leaf-list NSSF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum NSSelection;
+          enum NSSAI;
         }
       }
 
       leaf-list SMSF {
         type enumeration {
-          enum X;
-          enum Y;
+          enum SMService;
         }
       }
 
       leaf-list UDM {
         type enumeration {
-          enum X;
-          enum Y;
+          enum UEcontext;
+          enum SubscriberData;
+          enum UEauthentication;
+          enum EventExposure;
         }
       }
-
-
-
-
-
-
-     
-      
     }
   }
 
@@ -855,9 +864,8 @@ module _3gpp-common-trace {
         enum M9;
       }
       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";
+        an Immediate MDT job. The attribute is applicable only for Immediate MDT.";
+      reference "Clause 5.10.3 of 3GPP TS 32.422";
     }
 
    leaf reportingTrigger {
@@ -875,8 +883,7 @@ module _3gpp-common-trace {
         should be collected.
         The attribute is applicable only for Immediate MDT and when the
         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.";
+        or M2 (only for UMTS).";
       reference "Clause 5.10.4 of 3GPP TS 32.422";
     }
 
@@ -893,8 +900,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
-        this attribute is not used, it carries a null semantic.";
+        reportingTrigger is configured for periodical measurements.";
       reference "5.10.5 of 3GPP TS 32.422";
     }
     
@@ -912,8 +918,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
-        case this attribute is not used, it carries a null semantic.";
+        reportingTrigger is configured for periodical measurements.";
       reference "Clause 5.10.6 of 3GPP TS 32.422";
     }
     
@@ -923,8 +928,7 @@ module _3gpp-common-trace {
       description "Specifies the threshold which should trigger the reporting
         in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute
         is applicable only for Immediate MDT and when reportingTrigger is
-        configured for A2 event in LTE or 1F event or 1l event in UMTS. In
-        case this attribute is not used, it carries a null semantic.";
+        configured for A2 event in LTE or 1F event or 1l event in UMTS.";
       reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422";
     }
     
@@ -937,8 +941,7 @@ module _3gpp-common-trace {
       units milliseconds;
       description "Specifies the collection period for collecting RRM 
         configured measurement samples for M4, M5 in NR. The attribute is 
-        applicable only for Immediate MDT. In case this attribute is not 
-        used, it carries a null semantic.";
+        applicable only for Immediate MDT.";
       reference "Clause 5.10.30 of 3GPP TS 32.422";
     }
 
@@ -963,8 +966,7 @@ module _3gpp-common-trace {
       }
       description "It specifies the collection period for the Packet Delay 
         measurement (M6) for NR MDT taken by the gNB. The attribute is 
-        applicable only for Immediate MDT. In case this attribute is not used, 
-        it carries a null semantic.";
+        applicable only for Immediate MDT.";
       reference "clause 5.10.34 of  TS 32.422";
     }
     
@@ -976,39 +978,45 @@ module _3gpp-common-trace {
       }
       description "It specifies the collection period for the Packet Loss Rate 
         measurement (M7) for NR MDT taken by the gNB. The attribute is 
-        applicable only for Immediate MDT. In case this attribute is not used, 
-        it carries a null semantic.";    
+        applicable only for Immediate MDT. ";    
       reference "clause 5.10.35 of  TS 32.422";
     }
 
    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
-        for Immediate MDT. In case this attribute is not used, it carries a
-        null semantic.";
+        measurement samples for M3 in LTE. The attribute is applicable only
+        for Immediate MDT.";
       reference "Clause 5.10.20 of 3GPP TS 32.422";
     }
 
    leaf measurementPeriodLTE {
           when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
             +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
-      type uint32 {
-        range "1024|1280|2048|2560|5120|"
-          +"10240|60000";
+      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.
-        The attribute is applicable only for Immediate MDT. In case this
-        attribute is not used, it carries a null semantic.";
+      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.";
       reference "Clause 5.10.23 of 3GPP TS 32.422";
     }
     
@@ -1021,8 +1029,7 @@ module _3gpp-common-trace {
       units milliseconds;
       description "Specifies the collection period for the Packet Delay 
         measurement (M6) for 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.";
+        only for Immediate MDT.";
       reference "Clause 5.10.32 of  TS 32.422 ";
     }
     
@@ -1034,8 +1041,7 @@ module _3gpp-common-trace {
       }
       description "It specifies the collection period for the Packet Loss Rate 
         measurement (M7) 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.";
+        applicable only for Immediate MDT.";
       reference "Clause 5.10.33 of  TS 32.422 .";
     }
 
@@ -1047,23 +1053,21 @@ module _3gpp-common-trace {
       }        
       description "It specifies the threshold which should trigger 
         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 "5.10.39 of TS 32.422";
+        (UE power headroom measurement) in UMTS.";
+        reference "Clause 5.10.39 of TS 32.422";
     }
 
     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
         measurement samples for M3, M4, M5 in UMTS. The attribute is applicable
-        only for Immediate MDT. In case this attribute is not used, it carries
-        a null semantic";
+        only for Immediate MDT.";
       reference "Clause 5.10.21 of 3GPP TS 32.422";
     }
 
@@ -1071,15 +1075,14 @@ module _3gpp-common-trace {
       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.
-        The attribute is applicable only for Immediate MDT. In case this
-        attribute is not used, it carries a null semantic.";
+        The attribute is applicable only for Immediate MDT.";
       reference "Clause 5.10.22 of 3GPP TS 32.422";
     }
 
@@ -1141,10 +1144,8 @@ module _3gpp-common-trace {
         taken for periodic reporting while the UE is in connected mode. 
         The attribute is applicable only for Immediate MDT and combined Trace 
         and Immediate MDT and when reportingTrigger is configured for periodical 
-        measurements and applicable only for LTE. In case this attribute is not 
-        used, it carries a null semantic.
-        See the clause 5.10.6 of TS 32.422 for additional details on the 
-        allowed values.";
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422.";
     }
     
     leaf reportAmountM4LTE {
@@ -1159,13 +1160,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for LTE. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for LTE."; 
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM5LTE {
@@ -1180,13 +1179,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for LTE. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+       and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM6LTE {
@@ -1201,13 +1198,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for LTE. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM7LTE {
@@ -1222,13 +1217,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for LTE. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM1NR {
@@ -1243,13 +1236,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for NR. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM4NR {
@@ -1264,13 +1255,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for NR. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for NR."; 
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM5NR {
@@ -1285,13 +1274,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for NR. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for NR.";
+        reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM6NR {
@@ -1306,13 +1293,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for NR. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
 
     leaf reportAmountM7NR {
@@ -1327,13 +1312,11 @@ module _3gpp-common-trace {
         enum INFINITY;
       }
       description "It specifies the number of measurement reports that shall be 
-      taken for periodic reporting while the UE is in connected mode. 
-      The attribute is applicable only for Immediate MDT and combined Trace 
-      and Immediate MDT and when reportingTrigger is configured for periodical 
-      measurements and applicable only for NR. In case this attribute is not 
-      used, it carries a null semantic.
-      See the clause 5.10.6 of TS 32.422 for additional details on the 
-      allowed values.";
+        taken for periodic reporting while the UE is in connected mode. 
+        The attribute is applicable only for Immediate MDT and combined Trace 
+        and Immediate MDT and when reportingTrigger is configured for periodical 
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422."; 
     }
   }
 
@@ -1367,8 +1350,8 @@ module _3gpp-common-trace {
     leaf traceCollectionEntityId {
       type int64;
       description "It specifies the TCE Id which is sent to the UE in 
-        Logged MDT. See the clause 5.10.11 of 3GPP TS 32.422 for additional 
-        details on the allowed values.";
+        Logged MDT.";
+      reference: "Clause 5.10.11 of 3GPP TS 32.422."; 
     }
     
     leaf loggingDuration {
@@ -1380,24 +1363,26 @@ module _3gpp-common-trace {
       units seconds;
       description "Specifies how long the MDT configuration is valid at the
         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";
+        Logged MDT and Logged MBSFN MDT.";
+      reference "Clause 5.10.9 of 3GPP TS 32.422";
     }
 
     leaf loggingInterval {
       when '../../../jobType = "LOGGED_MDT_ONLY" or' 
         + ' ../../../jobType = "LOGGED_MBSFN_MDT"';
-      type uint32 {
-        range "0|320|640|1280|2560|5120|10240|20480|"
-          +"30720|40960|61440";
-      }
-      units milliseconds;
+        type union {
+          type uint32 {
+            range "320|640|1280|2560|5120|10240|20480|"
+              +"30720|40960|61440";
+          }
+          units milliseconds
+          type enumeration {
+            enum INFINITY;
+          }
+        }
       description "Specifies the periodicty 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.
-        The value 0 indicates Infinity for NR.";
-      reference "5.10.8 of 3GPP TS 32.422";
+        applicable only for Logged MDT and Logged MBSFN MDT.";
+      reference "Clause 5.10.8 of 3GPP TS 32.422";
     }
     
     leaf reportType {
@@ -1435,8 +1420,7 @@ module _3gpp-common-trace {
         the reporting in case of event based reporting of logged NR MDT. 
         The attribute is applicable only for Logged MDT and when reportType 
         is configured for event triggered reporting and when 
-        eventListForEventTriggeredMeasurement is configured for L1 event. 
-        In case this attribute is not used, it carries a null semantic.";
+        eventListForEventTriggeredMeasurement is configured for L1 event.";
       reference "clause 5.10.36 of TS 32.422";
     }
     
@@ -1450,8 +1434,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 
-        eventListForEventTriggeredMeasurement is configured for L1 event. 
-        In case this attribute is not used, it carries a null semantic.";
+        eventListForEventTriggeredMeasurement is configured for L1 event. ";
       reference "clause 5.10.37 of TS 32.422";
     }
 
@@ -1466,8 +1449,7 @@ module _3gpp-common-trace {
         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 
-        eventListForEventTriggeredMeasurement is configured for L1 event. 
-        In case this attribute is not used, it carries a null semantic.";
+        eventListForEventTriggeredMeasurement is configured for L1 event.";
       reference "clauses 5.10.38 of TS 32.422";
     }
     
@@ -1481,7 +1463,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.24 of 3GPP TS 32.422";
     }
     
-    list areaConfigurationForNeighCells {
+    list areaConfigurationForNeighCell {
       when '../../../jobType = "LOGGED_MDT_ONLY"';
       key "idx";
       leaf idx { type uint32 ; }
@@ -1491,7 +1473,7 @@ module _3gpp-common-trace {
         all the neighbour cells.
 
         Applicable only to NR Logged MDT.";
-      reference "3GPP TS 32.422 clause 5.10.26.";
+      reference "Clause 5.10.26 of 3GPP TS 32.422";
 
       uses AreaConfigGrp;
     }
@@ -1503,7 +1485,7 @@ module _3gpp-common-trace {
       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;
     }
@@ -1539,8 +1521,9 @@ module _3gpp-common-trace {
         enum TAC_OF_IMEI;
       }
       default NO_IDENTITY;
-      description "Specifies level of MDT anonymization.";
-      reference "3GPP TS 32.422 clause 5.10.12.";
+      description "Specifies the level of anonymization of MDT data.
+        This attribute is only applicable for management based activation";
+      reference "Clause 5.10.12 of 3GPP TS 32.422";
     }
 
    list areaScope {
@@ -1559,17 +1542,13 @@ module _3gpp-common-trace {
         enum UE_ORIENTATION;
       }
       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 
-        the UE.";
+        logged NR MDT and immediate NR MDT measurement if they are available.";
       reference "Clause 5.10.29 of 3GPP TS 32.422";
     }
 
     list immediateMdtConfig {
       description "The set of parameters specific for Immediate MDT 
-        configuration.
-        This attribute shall be present only if MDT is supported and the jobType 
-        attribute is set to Immediate MDT or combined Trace and Immediate MDT";
+        configuration.";
       key idx;
       max-elements 1;
       leaf idx { type string; }
@@ -1578,9 +1557,7 @@ module _3gpp-common-trace {
       
     list loggedMdtConfig {
       description "The set of parameters specific for Logged MDT and Logged 
-        MBSFN MDT configuration.
-        This attribute shall be present only if MDT is supported and the 
-        jobType attribute is set to Logged MDT or Logged MBSFN MDT.";
+        MBSFN MDT configuration.";
       key idx;
       max-elements 1;
       leaf idx { type string; }
@@ -1591,7 +1568,7 @@ module _3gpp-common-trace {
       type boolean;
       default false;
       description "Specifies whether the MDT configuration is for MN  
-        only or not. The value FALSE means the MDT configuration is for 
+        only or not. The default value is FALSE which means the MDT configuration is for 
         both MN and SN. The value TRUE means the MDT configuration is  
         for MN only.";
     }   
@@ -1604,12 +1581,21 @@ module _3gpp-common-trace {
     
     leaf-list ueCoreMeasurements {
       type string;
-      description "It specifies the List of 5GC UE level measurements.";
+      description "List of 5GC UE level measurements identified by name. 
+        allowedValues: The list may include 5GC UE level measurements 
+        defined in TS 28.558, or vendor specific measurements.
+        For 5GC UE level measurements defined in TS 28.558 [57], the name is constructed as follows:
+        -	"family.measurementName.subcounter" for measurement type with specified subcounter
+        -	"family.measurementName.ALL" for measurement type with all supported subcounters
+        -	"family.measurementName" for measurement type without subcounters
+        -	"family" for measurement family, including all measurement types and 
+        the associated subcounters under this family.
+        For non-3GPP specified 5GC UE level measurements the name is defined elsewhere.";
     }
 
     leaf ueCoreMeasGranularityPeriod {
       type uint32;
-      description "It specifies the Granularity period used to produce 5GC UE 
+      description "Granularity period used to produce 5GC UE 
         level measurements. The period is defined in milliseconds (ms).";
     }
 
@@ -1626,12 +1612,16 @@ module _3gpp-common-trace {
     
     leaf-list objectInstances {
       type string;
-      description "List of object instances.";
+      description "List of object instances. 
+        Each object instance is identified by its DN.";
     }
 
     leaf-list rootObjectInstances {
       type string;
-      description "List of root object instances.";
+      description "List of object instances.
+        Each object instance is identified by its DN and designates
+        the root of a substree that contains the root object and all
+        descendant objects.";
     }
   }
 
@@ -1652,22 +1642,16 @@ module _3gpp-common-trace {
         enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS;      
       }
       default TRACE_ONLY;
-      description "Specifies the MDT mode and it specifies also whether the
+      description "It specifies whether the
         TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE 
-        level measurement collection, or any combination 
-        of Trace, immediate MDT and 5GC UE level measurement collection. 
-        The attribute is applicable for Trace, MDT, RCEF and
-        RLF reporting, and 5GC UE level measurement collection.";
-      reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the
-        allowed values.";
+        level measurements job, or a combined job. It also defines the MDT mode.";
+      reference "Clause 5.9a of 3GPP TS 32.422.";
     }
     
     list pLMNTarget {
       key "mcc mnc";
       description "Specifies which PLMN that the subscriber of the session to
-        be recorded uses as selected PLMN. PLMN Target might differ from the
-        PLMN specified in the Trace Reference";
-      reference "Clause 5.9b of 3GPP TS 32.422";
+        be recorded uses as selected PLMN.";
       
       uses types3gpp:PLMNId;
     }
@@ -1676,7 +1660,13 @@ module _3gpp-common-trace {
       when '../jobType = "TRACE_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type string;
-      description "Specifies the metrics to be reported.";
+      description "List of trace metrics identified by name.
+        Includes trace messages, MDT measurements (Immediate MDT, 
+        Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, 
+        see TS 32.422). Trace messages are identified with their message
+        identifier. Trace metric identifier is constructed as
+        defined in clause 10 of TS 32.422.
+        For non-3GPP specified trace metrics the name is defined elsewhere.";
       reference "Clause 10 of 3GPP TS 32.422";
     }
 
@@ -1685,9 +1675,8 @@ module _3gpp-common-trace {
       description "It specifies the address of the Trace Collection Entity 
         when the attribute traceReportingFormat is configured for the 
         file-based reporting. The attribute is applicable for both Trace and 
-        MDT.
-        See the clause 5.9 of TS 32.422 for additional details on the allowed 
-        values.";
+        MDT.";
+      reference "Clause 5.9 of 3GPP TS 32.422";
     }
     
     leaf traceReportingConsumerUri {
@@ -1722,10 +1711,10 @@ module _3gpp-common-trace {
 
     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";
@@ -1742,8 +1731,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;
@@ -1765,10 +1754,10 @@ module _3gpp-common-trace {
         The traceTarget shall be UTRAN_CELL only in case of the 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 NR cell
+        The traceTarget shall be NG-RAN_CELL only in case of NR cell
         traffic trace function.
 
         The traceTarget shall be either IMSI, IMEI or
@@ -1800,23 +1789,11 @@ module _3gpp-common-trace {
         In case of signalling based MDT, the traceTarget attribute should
         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.
-
-        In case of management based Logged MDT, the traceTarge attribute
-        shall carry an eNB or 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. 
-
-        In case of signalling based 5GC UE level measurements collection, the 
-        traceTarget attribute shall be able to carry IMEISV or SUPI.
-        
-        In case of management based 5GC UE level measurements collection, the
-        traceTarget attribute shall be to carry the corresponding Measured UE
-        Identifier as defined by the bullet g) of the 5GC UE level measurements
-        (see TS 28.559) when the traceJob is craeted at the subject ManagedEntity";
+        In case of management based 5GC UE level measurements collection, 
+        the traceTarget attribute shall be able to carry the corresponding 
+        Measured UE Identifier as defined by the bullet g) of the 5GC UE 
+        level measurements (see TS 28.558) when the TraceJob is created 
+        at the subject ManagedEntity.";
       reference "3GPP TS 32.422";
     }
 
@@ -1876,7 +1853,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
 
-- 
GitLab


From 374045650d384c6966de528d7488e432ba50c82a 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:19 +0000
Subject: [PATCH 03/20] 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 2db45da1e..5ba146460 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -627,7 +627,7 @@ module _3gpp-common-trace {
       
       leaf-list MGW {
         type enumeration {
-          enum CONTEXT
+          enum CONTEXT;
         }
       }
 
-- 
GitLab


From 290202922d6fb85da55d62ee8897fd99bc3ff70c 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:23:20 +0000
Subject: [PATCH 04/20] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 5ba146460..2b2e9ef77 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1351,7 +1351,7 @@ module _3gpp-common-trace {
       type int64;
       description "It specifies the TCE Id which is sent to the UE in 
         Logged MDT.";
-      reference: "Clause 5.10.11 of 3GPP TS 32.422."; 
+      reference "Clause 5.10.11 of 3GPP TS 32.422."; 
     }
     
     leaf loggingDuration {
@@ -1370,16 +1370,20 @@ 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";
-          }
-          units milliseconds
-          type enumeration {
-            enum INFINITY;
-          }
-        }
+      type enumeration {
+        enum 320ms;
+        enum 640ms;
+        enum 1280ms;
+        enum 2560ms;
+        enum 5120ms;
+        enum 10240ms;
+        enum 20480ms;
+        enum 30720ms;
+        enum 40960ms;
+        enum 61440ms;
+        enum INFINITY;
+      }
+
       description "Specifies the periodicty for Logged MDT. The attribute is
         applicable only for Logged MDT and Logged MBSFN MDT.";
       reference "Clause 5.10.8 of 3GPP TS 32.422";
-- 
GitLab


From 4ddee821d0cded9abc05b32d11bf695bedddd137 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:24:51 +0000
Subject: [PATCH 05/20] Update _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 2b2e9ef77..0563d68da 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1589,10 +1589,10 @@ module _3gpp-common-trace {
         allowedValues: The list may include 5GC UE level measurements 
         defined in TS 28.558, or vendor specific measurements.
         For 5GC UE level measurements defined in TS 28.558 [57], the name is constructed as follows:
-        -	"family.measurementName.subcounter" for measurement type with specified subcounter
-        -	"family.measurementName.ALL" for measurement type with all supported subcounters
-        -	"family.measurementName" for measurement type without subcounters
-        -	"family" for measurement family, including all measurement types and 
+        -	family.measurementName.subcounter for measurement type with specified subcounter
+        -	family.measurementName.ALL for measurement type with all supported subcounters
+        -	family.measurementName for measurement type without subcounters
+        -	family for measurement family, including all measurement types and 
         the associated subcounters under this family.
         For non-3GPP specified 5GC UE level measurements the name is defined elsewhere.";
     }
-- 
GitLab


From 4ad4e6e5d32d4c6ce0fc4a7b15178fa1322b6676 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:27:03 +0000
Subject: [PATCH 06/20] 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 0563d68da..208c15b38 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -604,7 +604,7 @@ module _3gpp-common-trace {
       description "It specifies the triggering event parameter of the trace 
         session. The attribute is applicable only for Trace.";
       reference "Clause 5.1 of 3GPP TS 32.422"; 
-      leaf idx { type unit32; }
+      leaf idx { type uint32; }
 
       leaf-list MSC_SERVER {
         type enumeration {
@@ -620,7 +620,7 @@ module _3gpp-common-trace {
           enum PDPcontext;
           enum MO_MT_SMS;
           enum RAU_GPRSattach_GPRSdetach;
-          MBMScontext;
+          enum MBMScontext;
         }
       }
 
-- 
GitLab


From c18f633d27daf13258a874e2d755c53967186858 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 09:19:41 +0000
Subject: [PATCH 07/20] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 208c15b38..2557b4713 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -580,7 +580,7 @@ module _3gpp-common-trace {
       description "Specifies the network element types where the trace should
         be activated. The attribute is applicable only for Trace with
         Signalling Based Trace activation. ";
-      reference "Clause 5.4 of 3GPP TS 32.422";
+      reference "Clause 5.4 of 3GPP TS 32.422.";
     }
 
     leaf traceDepth {
@@ -596,7 +596,7 @@ module _3gpp-common-trace {
       }
       default MAXIMUM;
       description "It specifies the trace depth. The attribute is applicable only for Trace.";
-      reference "Clause 5.3 of 3GPP TS 32.422";
+      reference "Clause 5.3 of 3GPP TS 32.422.";
     }  
     
     list triggeringEvents {
@@ -865,7 +865,7 @@ module _3gpp-common-trace {
       }
       description "It specifies the UE measurements that shall be collected in
         an Immediate MDT job. The attribute is applicable only for Immediate MDT.";
-      reference "Clause 5.10.3 of 3GPP TS 32.422";
+      reference "Clause 5.10.3 of 3GPP TS 32.422.";
     }
 
    leaf reportingTrigger {
@@ -884,7 +884,7 @@ module _3gpp-common-trace {
         The attribute is applicable only for Immediate MDT and when the
         listOfMeasurements is configured for M1 (for both UMTS and LTE)
         or M2 (only for UMTS).";
-      reference "Clause 5.10.4 of 3GPP TS 32.422";
+      reference "Clause 5.10.4 of 3GPP TS 32.422.";
     }
 
    leaf reportInterval {
@@ -901,7 +901,7 @@ module _3gpp-common-trace {
         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.";
-      reference "5.10.5 of 3GPP TS 32.422";
+      reference "5.10.5 of 3GPP TS 32.422.";
     }
     
    leaf reportAmount {
@@ -919,7 +919,7 @@ module _3gpp-common-trace {
         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.";
-      reference "Clause 5.10.6 of 3GPP TS 32.422";
+      reference "Clause 5.10.6 of 3GPP TS 32.422.";
     }
     
    leaf eventThreshold {
@@ -929,7 +929,7 @@ module _3gpp-common-trace {
         in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute
         is applicable only for Immediate MDT and when reportingTrigger is
         configured for A2 event in LTE or 1F event or 1l event in UMTS.";
-      reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422";
+      reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422.";
     }
     
    leaf collectionPeriodRRMNR {
@@ -942,7 +942,7 @@ module _3gpp-common-trace {
       description "Specifies the collection period for collecting RRM 
         configured measurement samples for M4, M5 in NR. The attribute is 
         applicable only for Immediate MDT.";
-      reference "Clause 5.10.30 of 3GPP TS 32.422";
+      reference "Clause 5.10.30 of 3GPP TS 32.422.";
     }
 
    leaf collectionPeriodM6NR {
@@ -967,7 +967,7 @@ module _3gpp-common-trace {
       description "It specifies the collection period for the Packet Delay 
         measurement (M6) for NR MDT taken by the gNB. The attribute is 
         applicable only for Immediate MDT.";
-      reference "clause 5.10.34 of  TS 32.422";
+      reference "clause 5.10.34 of  TS 32.422.";
     }
     
     leaf collectionPeriodM7NR {
@@ -979,7 +979,7 @@ module _3gpp-common-trace {
       description "It specifies the collection period for the Packet Loss Rate 
         measurement (M7) for NR MDT taken by the gNB. The attribute is 
         applicable only for Immediate MDT. ";    
-      reference "clause 5.10.35 of  TS 32.422";
+      reference "clause 5.10.35 of  TS 32.422.";
     }
 
    leaf collectionPeriodRRMLTE {
@@ -1000,7 +1000,7 @@ module _3gpp-common-trace {
       description "Specifies the collection period for collecting RRM configured
         measurement samples for M3 in LTE. The attribute is applicable only
         for Immediate MDT.";
-      reference "Clause 5.10.20 of 3GPP TS 32.422";
+      reference "Clause 5.10.20 of 3GPP TS 32.422.";
     }
 
    leaf measurementPeriodLTE {
@@ -1017,7 +1017,7 @@ module _3gpp-common-trace {
       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.";
-      reference "Clause 5.10.23 of 3GPP TS 32.422";
+      reference "Clause 5.10.23 of 3GPP TS 32.422.";
     }
     
     leaf collectionPeriodM6LTE {
@@ -1030,7 +1030,7 @@ module _3gpp-common-trace {
       description "Specifies the collection period for the Packet Delay 
         measurement (M6) for MDT taken by the eNB. The attribute is applicable 
         only for Immediate MDT.";
-      reference "Clause 5.10.32 of  TS 32.422 ";
+      reference "Clause 5.10.32 of  TS 32.422.";
     }
     
     leaf collectionPeriodM7LTE {
@@ -1042,7 +1042,7 @@ module _3gpp-common-trace {
       description "It specifies the collection period for the Packet Loss Rate 
         measurement (M7) for LTE MDT taken by the eNB. The attribute is 
         applicable only for Immediate MDT.";
-      reference "Clause 5.10.33 of  TS 32.422 .";
+      reference "Clause 5.10.33 of  TS 32.422.";
     }
 
     leaf eventThresholdUphUMTS {
@@ -1054,7 +1054,7 @@ module _3gpp-common-trace {
       description "It specifies the threshold which should trigger 
         the reporting in case of event-triggered periodic reporting for M4 
         (UE power headroom measurement) in UMTS.";
-        reference "Clause 5.10.39 of TS 32.422";
+        reference "Clause 5.10.39 of TS 32.422.";
     }
 
     leaf collectionPeriodRRMUMTS {
@@ -1068,7 +1068,7 @@ module _3gpp-common-trace {
       description "Specifies the collection period for collecting RRM configured
         measurement samples for M3, M4, M5 in UMTS. The attribute is applicable
         only for Immediate MDT.";
-      reference "Clause 5.10.21 of 3GPP TS 32.422";
+      reference "Clause 5.10.21 of 3GPP TS 32.422.";
     }
 
     leaf measurementPeriodUMTS {
@@ -1083,7 +1083,7 @@ module _3gpp-common-trace {
       description "It specifies the measurement period for the Data Volume and
         Throughput measurements for MDT taken by RNC.
         The attribute is applicable only for Immediate MDT.";
-      reference "Clause 5.10.22 of 3GPP TS 32.422";
+      reference "Clause 5.10.22 of 3GPP TS 32.422.";
     }
 
     leaf measurementQuantity {
@@ -1096,7 +1096,7 @@ module _3gpp-common-trace {
       }
       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";
+      reference "Clause 5.10.15 of 3GPP TS 32.422.";
     }
     
     leaf beamLevelMeasurement {
@@ -1106,7 +1106,7 @@ module _3gpp-common-trace {
       default false;
       description "Indicates whether the NR M1 beam level measurements shall 
         be included or not.";
-      reference "Clause 5.10.40 of TS 32.422";
+      reference "Clause 5.10.40 of TS 32.422.";
     }
 
     leaf positioningMethod {
@@ -1118,7 +1118,7 @@ module _3gpp-common-trace {
       }
       description "It specifies what positioning method should be used in the
         MDT job.";
-      reference "Clause 5.10.19 of 3GPP TS 32.422";
+      reference "Clause 5.10.19 of 3GPP TS 32.422.";
     }
     
     list excessPacketDelayThresholds {
@@ -1364,7 +1364,7 @@ module _3gpp-common-trace {
       description "Specifies how long the MDT configuration is valid at the
         UE in case of Logged MDT. The attribute is applicable only for
         Logged MDT and Logged MBSFN MDT.";
-      reference "Clause 5.10.9 of 3GPP TS 32.422";
+      reference "Clause 5.10.9 of 3GPP TS 32.422.";
     }
 
     leaf loggingInterval {
@@ -1386,7 +1386,7 @@ module _3gpp-common-trace {
 
       description "Specifies the periodicty for Logged MDT. The attribute is
         applicable only for Logged MDT and Logged MBSFN MDT.";
-      reference "Clause 5.10.8 of 3GPP TS 32.422";
+      reference "Clause 5.10.8 of 3GPP TS 32.422.";
     }
     
     leaf reportType {
@@ -1396,7 +1396,7 @@ module _3gpp-common-trace {
         enum EVENT_TRIGGERED;
       }
       description "It specifies report type for logged NR MDT";
-      reference "Clause 5.10.27 of 3GPP TS 32.422";
+      reference "Clause 5.10.27 of 3GPP TS 32.422.";
     }
     
     leaf eventListForEventTriggeredMeasurement {
@@ -1411,7 +1411,7 @@ module _3gpp-common-trace {
         condition being fulfilled:
         - Out of coverage.
         - A2 event.";
-      reference "Clause 5.10.28 of 3GPP TS 32.422";
+      reference "Clause 5.10.28 of 3GPP TS 32.422.";
     }
 
     leaf eventThresholdL1 {
@@ -1425,7 +1425,7 @@ module _3gpp-common-trace {
         The attribute is applicable only for Logged MDT and when reportType 
         is configured for event triggered reporting and when 
         eventListForEventTriggeredMeasurement is configured for L1 event.";
-      reference "clause 5.10.36 of TS 32.422";
+      reference "clause 5.10.36 of TS 32.422.";
     }
     
     leaf hysteresisL1 {
@@ -1439,7 +1439,7 @@ module _3gpp-common-trace {
         The attribute is applicable only for Logged MDT, when reportType 
         is configured for event triggered reporting and when 
         eventListForEventTriggeredMeasurement is configured for L1 event. ";
-      reference "clause 5.10.37 of TS 32.422";
+      reference "clause 5.10.37 of TS 32.422.";
     }
 
     leaf timeToTriggerL1 {
@@ -1454,7 +1454,7 @@ module _3gpp-common-trace {
         The attribute is applicable only for Logged MDT, when reportType 
         is configured for event triggered reporting and when 
         eventListForEventTriggeredMeasurement is configured for L1 event.";
-      reference "clauses 5.10.38 of TS 32.422";
+      reference "clauses 5.10.38 of TS 32.422.";
     }
     
     list pLMNList {
@@ -1464,7 +1464,7 @@ module _3gpp-common-trace {
       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";
+      reference "Clause 5.10.24 of 3GPP TS 32.422.";
     }
     
     list areaConfigurationForNeighCell {
@@ -1477,7 +1477,7 @@ module _3gpp-common-trace {
         all the neighbour cells.
 
         Applicable only to NR Logged MDT.";
-      reference "Clause 5.10.26 of 3GPP TS 32.422";
+      reference "Clause 5.10.26 of 3GPP TS 32.422.";
 
       uses AreaConfigGrp;
     }
@@ -1489,7 +1489,7 @@ module _3gpp-common-trace {
       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 "Clause 5.10.25 of 3GPP TS 32.422";
+      reference "Clause 5.10.25 of 3GPP TS 32.422.";
       
       uses MbsfnAreaGrp;
     }
@@ -1527,7 +1527,7 @@ module _3gpp-common-trace {
       default NO_IDENTITY;
       description "Specifies the level of anonymization of MDT data.
         This attribute is only applicable for management based activation";
-      reference "Clause 5.10.12 of 3GPP TS 32.422";
+      reference "Clause 5.10.12 of 3GPP TS 32.422.";
     }
 
    list areaScope {
@@ -1547,7 +1547,7 @@ module _3gpp-common-trace {
       }
       description "It specifies which sensor information shall be included in
         logged NR MDT and immediate NR MDT measurement if they are available.";
-      reference "Clause 5.10.29 of 3GPP TS 32.422";
+      reference "Clause 5.10.29 of 3GPP TS 32.422.";
     }
 
     list immediateMdtConfig {
@@ -1588,7 +1588,7 @@ module _3gpp-common-trace {
       description "List of 5GC UE level measurements identified by name. 
         allowedValues: The list may include 5GC UE level measurements 
         defined in TS 28.558, or vendor specific measurements.
-        For 5GC UE level measurements defined in TS 28.558 [57], the name is constructed as follows:
+        For 5GC UE level measurements defined in TS 28.558, the name is constructed as follows:
         -	family.measurementName.subcounter for measurement type with specified subcounter
         -	family.measurementName.ALL for measurement type with all supported subcounters
         -	family.measurementName for measurement type without subcounters
@@ -1671,7 +1671,7 @@ module _3gpp-common-trace {
         identifier. Trace metric identifier is constructed as
         defined in clause 10 of TS 32.422.
         For non-3GPP specified trace metrics the name is defined elsewhere.";
-      reference "Clause 10 of 3GPP TS 32.422";
+      reference "Clause 10 of 3GPP TS 32.422.";
     }
 
     leaf traceCollectionEntityIPAddress {
@@ -1680,7 +1680,7 @@ module _3gpp-common-trace {
         when the attribute traceReportingFormat is configured for the 
         file-based reporting. The attribute is applicable for both Trace and 
         MDT.";
-      reference "Clause 5.9 of 3GPP TS 32.422";
+      reference "Clause 5.9 of 3GPP TS 32.422.";
     }
     
     leaf traceReportingConsumerUri {
@@ -1688,7 +1688,7 @@ module _3gpp-common-trace {
       type inet:uri;
       description "URI of the Streaming Trace data reporting MnS consumer
         (a.k.a. streaming target).";
-      reference "Clause 5.9 of 3GPP TS 32.422";
+      reference "Clause 5.9 of 3GPP TS 32.422.";
     }
     
     list traceReference {
@@ -1700,7 +1700,7 @@ 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.6 of 3GPP TS 32.422";
+      reference "Clause 5.6 of 3GPP TS 32.422.";
 
       leaf idx { type uint32 ; }
       uses trace3gpp:TraceReferenceGrp ;    
@@ -1798,7 +1798,7 @@ module _3gpp-common-trace {
         Measured UE Identifier as defined by the bullet g) of the 5GC UE 
         level measurements (see TS 28.558) when the TraceJob is created 
         at the subject ManagedEntity.";
-      reference "3GPP TS 32.422";
+      reference "3GPP TS 32.422.";
     }
 
     list traceConfig {
-- 
GitLab


From 612fbfe631812a0c28650b37440dfb23153ee487 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 09:34:32 +0000
Subject: [PATCH 08/20] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 2557b4713..26605c884 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -778,14 +778,24 @@ module _3gpp-common-trace {
 
       The following attributes are conditional available based on the
       measurements configured in listOfMeasurements:
-        -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,
-        -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),
+        -reportAmount (conditional for M1/M2 in UMTS),
+        -reportAmountM1LTE (conditional for M1 in LTE),
+        -reportAmountM4LTE (conditional for M4 in LTE),
+        -reportAmountM5LTE (conditional for M5 in LTE),
+        -reportAmountM6LTE (conditional for M6 in LTE),
+        -reportAmountM7LTE (conditional for M7 in LTE),
+        -reportAmountM1NR (conditional for M1 in NR),
+        -reportAmountM4NR (conditional for M4 in NR),
+        -reportAmountM5NR (conditional for M5 in NR),
+        -reportAmountM6NR (conditional for M6 in NR),
+        -reportAmountM7NR (conditional for M7 in NR),
+        -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),
+        -collectionPeriodRRMNR (conditional for M4 and M5 in NR),
+        -collectionPeriodM6NR (conditional for M6 in NR),
+        -collectionPeriodM7NR (conditional for M7 in NR),
         -collectionPeriodRRMLTE (conditional for M3 in LTE),
         -measurementPeriodLTE (conditional for M4 and M5 in LTE),
         -collectionPeriodM6LTE (conditional for M6 in LTE),
@@ -827,7 +837,8 @@ module _3gpp-common-trace {
         
         - For measurement M2 in LTE or NR, reporting is according to RRM
         configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331.  
-        For measurement M4 in UMTS, reporting is either according to RRM 
+        
+        - For measurement M4 in UMTS, reporting is either according to RRM 
         configuration, see TS 25.321 and TS 25.331 or periodic or event
         triggered periodic using parameter collectionPeriodRRMUMTS and 
         eventThresholdUphUMTS.
@@ -841,9 +852,16 @@ module _3gpp-common-trace {
         is the interval between two measurements (collectionPeriodRrmNr, 
         collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE,
         measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE,
-        collectionPeriodRRMUMTS, measurementPeriodUMTS).  If no collection
+        collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of 
+        reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR, 
+        reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, reportAmountM6LTE,
+        reportAmountM7LTE).  If no collection
         period is configured for M5 in UMTS, all available measurements are
-        logged according to RRM configuration.";
+        logged according to RRM configuration.
+        
+        - Measurements M8 and M9 in NR or LTE are reported according to configured 
+        M1 and/or M6 related UE measurement reporting. 
+        ";
         
    leaf listOfMeasurements {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"';
-- 
GitLab


From 140db8f4faccc8012e3557375bfd4efee49facb5 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 09:37:48 +0000
Subject: [PATCH 09/20] 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 26605c884..ba012b829 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -919,7 +919,7 @@ module _3gpp-common-trace {
         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.";
-      reference "5.10.5 of 3GPP TS 32.422.";
+      reference "Clause 5.10.5 of 3GPP TS 32.422.";
     }
     
    leaf reportAmount {
-- 
GitLab


From f265b4c8c82aac47f5e39a3d6309439795381969 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 09:51:52 +0000
Subject: [PATCH 10/20] 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 ba012b829..84418a774 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1097,7 +1097,6 @@ module _3gpp-common-trace {
           +"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.
         The attribute is applicable only for Immediate MDT.";
-- 
GitLab


From 10ab408ccbdc3bc4283b5a2226972d04716814ca 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 10:03:52 +0000
Subject: [PATCH 11/20] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 84418a774..c994e0fde 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1340,6 +1340,13 @@ module _3gpp-common-trace {
   grouping LoggedMdtConfigGrp {
     description "This <<dataType>> defines the configuration parameters of 
     IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. 
+
+    Based on the value configured for attribute jobType in IOC TraceJob, 
+    different attributes are available. In case of LOGGED_MDT_ONLY, the 
+    attributes reportType, eventListForEventTriggeredMeasurement, 
+    eventThresholdL1, hysteresisL1, timeToTriggerL1, areaConfigurationForNeighCells
+    and npnIdentityList are applicable. In case of LOGGED_MBSFN_MDT, 
+    the attribute mbsfnAreaList is applicable. 
     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 
-- 
GitLab


From 450ed5ffae141b5bd1949cc4c90d3366d3f556b9 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 10:12:14 +0000
Subject: [PATCH 12/20] 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 c994e0fde..95c492d9d 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -144,9 +144,10 @@ module _3gpp-common-trace {
     }
 
     list nPNIdentityList {
-      description "list of NPN IDs of in NR. It is either a list of PNI-NPNs 
-        identified by CAG ID with associated plmn-Identity or a list of SNPN 
-        identified by Network ID with associated plmn-Identity";
+      description "It defines which NPNs that can be served by the NR cell, 
+        and which CAG IDs or NIDs can be supported by the NR cell for 
+        corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell.
+        (NPN-Identity referring to TS 38.331).";
       key idx;
       min-elements 1;
       uses NpnIdGrp;
-- 
GitLab


From 2738ad843e5cc94caf4d58682b68b7f6e7e3baa4 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 10:42:13 +0000
Subject: [PATCH 13/20] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 95c492d9d..ac521afbf 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1611,13 +1611,14 @@ module _3gpp-common-trace {
     leaf-list ueCoreMeasurements {
       type string;
       description "List of 5GC UE level measurements identified by name. 
-        allowedValues: The list may include 5GC UE level measurements 
+        The list may include 5GC UE level measurements 
         defined in TS 28.558, or vendor specific measurements.
+        
         For 5GC UE level measurements defined in TS 28.558, the name is constructed as follows:
-        -	family.measurementName.subcounter for measurement type with specified subcounter
-        -	family.measurementName.ALL for measurement type with all supported subcounters
-        -	family.measurementName for measurement type without subcounters
-        -	family for measurement family, including all measurement types and 
+        -	'family.measurementName.subcounter' for measurement type with specified subcounter
+        -	'family.measurementName.ALL' for measurement type with all supported subcounters
+        -	'family.measurementName' for measurement type without subcounters
+        -	'family' for measurement family, including all measurement types and 
         the associated subcounters under this family.
         For non-3GPP specified 5GC UE level measurements the name is defined elsewhere.";
     }
@@ -1777,20 +1778,20 @@ 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 UTRAN cell traffic 
+        The traceTarget shall be 'UTRAN_CELL' only in case of the 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 NR cell
+        The traceTarget shall be 'NG-RAN_CELL' only in case of NR 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
@@ -1802,7 +1803,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 followed ManagedEntity(ies):
         - AFFunction
         - AMFFunction
@@ -1816,7 +1817,7 @@ module _3gpp-common-trace {
         - UDMFunction
 
         In case of signalling based MDT, the traceTarget attribute should
-        be able to carry PUBLIC_ID, IMSI, IMEI, IMEISV or SUPI.
+        be able to carry 'PUBLIC_ID', 'IMSI', 'IMEI', 'IMEISV' or 'SUPI'.
 
         In case of management based 5GC UE level measurements collection, 
         the traceTarget attribute shall be able to carry the corresponding 
-- 
GitLab


From 6f47b7d8b7627f9167201bb5761dc64b8bb06bdb 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 13:44:05 +0000
Subject: [PATCH 14/20] Update _3gpp-common-trace.yang

---
 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 ac521afbf..6aa5cc17c 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -606,6 +606,7 @@ module _3gpp-common-trace {
         session. The attribute is applicable only for Trace.";
       reference "Clause 5.1 of 3GPP TS 32.422"; 
       leaf idx { type uint32; }
+      max-elements 1
 
       leaf-list MSC_SERVER {
         type enumeration {
-- 
GitLab


From e156000862d5352c5e226921a95a67806b3b620f 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 13:51:47 +0000
Subject: [PATCH 15/20] 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 6aa5cc17c..7818ae531 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -606,7 +606,7 @@ module _3gpp-common-trace {
         session. The attribute is applicable only for Trace.";
       reference "Clause 5.1 of 3GPP TS 32.422"; 
       leaf idx { type uint32; }
-      max-elements 1
+      max-elements 1;
 
       leaf-list MSC_SERVER {
         type enumeration {
-- 
GitLab


From 7449a1ea8000659bf22773e27bb695b252eb493d 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:43:56 +0000
Subject: [PATCH 16/20] 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 7818ae531..3a8fdfdfb 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -255,7 +255,7 @@ module _3gpp-common-trace {
       The attribute traceDepth allows to configure the level of detail 
       of the information which shall be recorded.  For trace the reporting
       is event based, where the triggering event is configured with 
-      attribute triggeringEvent. For each triggering event the first and 
+      attribute triggeringEvents. For each triggering event the first and 
       last message (start/stop triggering event) to record  are specified.";
 
     list listOfInterfaces {
-- 
GitLab


From ec91737b06dc7fd5a2c52e84b06aea99f48d09a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 4 Feb 2025 09:39:04 +0000
Subject: [PATCH 17/20] 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 3a8fdfdfb..f83b5c526 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1598,7 +1598,7 @@ module _3gpp-common-trace {
       type boolean;
       default false;
       description "Specifies whether the MDT configuration is for MN  
-        only or not. The default value is FALSE which means the MDT configuration is for 
+        only or not. The value FALSE means the MDT configuration is for 
         both MN and SN. The value TRUE means the MDT configuration is  
         for MN only.";
     }   
-- 
GitLab


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

---
 yang-models/_3gpp-common-trace.yang | 136 ++++++++++++++++------------
 1 file changed, 76 insertions(+), 60 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index f83b5c526..41a168ac8 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -596,7 +596,8 @@ module _3gpp-common-trace {
         enum VENDORMAXIMUM;
       }
       default MAXIMUM;
-      description "It specifies the trace depth. The attribute is applicable only for Trace.";
+      description "It specifies the trace depth. The attribute is 
+        applicable only for Trace.";
       reference "Clause 5.3 of 3GPP TS 32.422.";
     }  
     
@@ -856,13 +857,13 @@ module _3gpp-common-trace {
         measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE,
         collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of 
         reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR, 
-        reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, reportAmountM6LTE,
-        reportAmountM7LTE).  If no collection
-        period is configured for M5 in UMTS, all available measurements are
-        logged according to RRM configuration.
+        reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, 
+        reportAmountM6LTE, reportAmountM7LTE).  If no collection
+        period is configured for M5 in UMTS, all available measurements
+        ar elogged according to RRM configuration.
         
-        - Measurements M8 and M9 in NR or LTE are reported according to configured 
-        M1 and/or M6 related UE measurement reporting. 
+        - Measurements M8 and M9 in NR or LTE are reported according to 
+        configured M1 and/or M6 related UE measurement reporting. 
         ";
         
    leaf listOfMeasurements {
@@ -883,8 +884,9 @@ module _3gpp-common-trace {
         enum M8;
         enum M9;
       }
-      description "It specifies the UE measurements that shall be collected in
-        an Immediate MDT job. The attribute is applicable only for Immediate MDT.";
+      description "It specifies the UE measurements that shall be 
+        collected in an Immediate MDT job. The attribute is 
+        applicable only for Immediate MDT.";
       reference "Clause 5.10.3 of 3GPP TS 32.422.";
     }
 
@@ -899,8 +901,8 @@ module _3gpp-common-trace {
         enum ALL_CONFIGURED_RRM_FOR_LTE;
         enum ALL_CONFIGURED_RRM_FOR_UMTS;
       }
-      description "It specifies whether periodic or event based measurements
-        should be collected.
+      description "It specifies whether periodic or event based 
+        measurements should be collected.
         The attribute is applicable only for Immediate MDT and when the
         listOfMeasurements is configured for M1 (for both UMTS and LTE)
         or M2 (only for UMTS).";
@@ -1034,9 +1036,10 @@ module _3gpp-common-trace {
         enum 1min;
       }
       mandatory true;
-      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.";
+      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.";
       reference "Clause 5.10.23 of 3GPP TS 32.422.";
     }
     
@@ -1341,37 +1344,41 @@ module _3gpp-common-trace {
 
   grouping LoggedMdtConfigGrp {
     description "This <<dataType>> defines the configuration parameters of 
-    IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. 
-
-    Based on the value configured for attribute jobType in IOC TraceJob, 
-    different attributes are available. In case of LOGGED_MDT_ONLY, the 
-    attributes reportType, eventListForEventTriggeredMeasurement, 
-    eventThresholdL1, hysteresisL1, timeToTriggerL1, areaConfigurationForNeighCells
-    and npnIdentityList are applicable. In case of LOGGED_MBSFN_MDT, 
-    the attribute mbsfnAreaList is applicable. 
-    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.  For logged MDT in UMTS 
-    and LTE, the reporting is periodical. Parameter loggingInterval determines 
-    the interval between the reports and parameter loggingDuration determines 
-    how long the configuration is valid meaning after this duration has passed 
-    no further reports are sent. In NR, the reporting can be periodical or event 
-    based, determined by parameter reportType. For periodical reporting the 
-    same parameters as in LTE and UMTS apply. For event based reporting, 
-    parameter eventListForEventTriggeredMeasurement configures the event type, 
-    namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as 
-    event type, the logging is performed according to parameter loggingInterval
-    at regular intervals only when the conditions indicated by eventThresholdL1, 
-    hysteresisL1, timeToTriggerL1 (defining the thresholds, hysteresis and time 
-    to trigger) are met and if UE is 'camped normally' state (TS 38.331, 
-    TS 38.304).  In case 'out of coverage' is selected as event type, the
-    logging is performed according to parameter loggingInterval at regular 
-    intervals only when the UE is in 'any cell selection' state. 
-    Furthermore, logging is performed immediately upon transition from the
-    'any cell selection' state to the 'camped normally' state (TS 38.331, 
-    TS 38.304).";
+      IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. 
+
+      Based on the value configured for attribute jobType in IOC TraceJob, 
+      different attributes are available. In case of LOGGED_MDT_ONLY, the 
+      attributes reportType, eventListForEventTriggeredMeasurement, 
+      eventThresholdL1, hysteresisL1, timeToTriggerL1, 
+      areaConfigurationForNeighCells
+      and npnIdentityList are applicable. In case of LOGGED_MBSFN_MDT, 
+      the attribute mbsfnAreaList is applicable. 
+      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.  For logged MDT in UMTS 
+      and LTE, the reporting is periodical. Parameter loggingInterval 
+      determines  the interval between the reports and parameter 
+      loggingDuration determines how long the configuration is valid 
+      meaning after this duration has passed no further reports are sent. 
+      In NR, the reporting can be periodical or event 
+      based, determined by parameter reportType. For periodical reporting the 
+      same parameters as in LTE and UMTS apply. For event based reporting, 
+      parameter eventListForEventTriggeredMeasurement configures the event 
+      type, namely 'out of coverage' or 'L1 event'. In case 'L1 event' is
+      selected as event type, the logging is performed according to 
+      parameter loggingInterval at regular intervals only when the
+      conditions indicated by eventThresholdL1, 
+      hysteresisL1, timeToTriggerL1 (defining the thresholds, hysteresis 
+      and time to trigger) are met and if UE is 'camped normally' state 
+      (TS 38.331, TS 38.304).  In case 'out of coverage' is selected as 
+      event type, the
+      logging is performed according to parameter loggingInterval at regular 
+      intervals only when the UE is in 'any cell selection' state. 
+      Furthermore, logging is performed immediately upon transition from the
+      'any cell selection' state to the 'camped normally' state (TS 38.331, 
+      TS 38.304).";
     
     leaf traceCollectionEntityId {
       type int64;
@@ -1535,7 +1542,8 @@ module _3gpp-common-trace {
     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 of MDT, which is specified in clause 5.10.2 of TS 32.422.  The   
+     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 
@@ -1606,8 +1614,9 @@ module _3gpp-common-trace {
 
   grouping UECoreMeasConfigGrp {
     description "Represents the UECoreMeasConfig dataType.
-      This <<dataType>> defines the aconfiguration parameters of IOC TraceJob
-        which are specific for 5GC UE level measurements collection.";
+      This <<dataType>> defines the aconfiguration parameters of IOC 
+      TraceJob which are specific for 5GC UE level measurements 
+      collection.";
     
     leaf-list ueCoreMeasurements {
       type string;
@@ -1615,13 +1624,19 @@ module _3gpp-common-trace {
         The list may include 5GC UE level measurements 
         defined in TS 28.558, or vendor specific measurements.
         
-        For 5GC UE level measurements defined in TS 28.558, the name is constructed as follows:
-        -	'family.measurementName.subcounter' for measurement type with specified subcounter
-        -	'family.measurementName.ALL' for measurement type with all supported subcounters
-        -	'family.measurementName' for measurement type without subcounters
-        -	'family' for measurement family, including all measurement types and 
+        For 5GC UE level measurements defined in TS 28.558, the 
+        name is constructed as follows:
+        -	'family.measurementName.subcounter' for measurement type 
+        with specified subcounter
+        -	'family.measurementName.ALL' for measurement type with all 
+        supported subcounters
+        -	'family.measurementName' for measurement type without 
+        subcounters
+        -	'family' for measurement family, including all measurement 
+        types and 
         the associated subcounters under this family.
-        For non-3GPP specified 5GC UE level measurements the name is defined elsewhere.";
+        For non-3GPP specified 5GC UE level measurements the name is 
+        defined elsewhere.";
     }
 
     leaf ueCoreMeasGranularityPeriod {
@@ -1674,8 +1689,9 @@ module _3gpp-common-trace {
       }
       default TRACE_ONLY;
       description "It specifies whether the
-        TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE 
-        level measurements job, or a combined job. It also defines the MDT mode.";
+        TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 
+        5GC UE level measurements job, or a combined job. It also 
+        defines the MDT mode.";
       reference "Clause 5.9a of 3GPP TS 32.422.";
     }
     
@@ -1780,10 +1796,10 @@ module _3gpp-common-trace {
         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 (Serving Call Session Control Function) 
-        or PCSCFFunction (Proxy Call Session Control Function). 
-        The traceTarget shall be 'UTRAN_CELL' only in case of the UTRAN cell traffic 
-        trace function.
+        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 UTRAN cell traffic trace function.
 
         The traceTarget shall be 'E-UTRAN_CELL' only in case of E-UTRAN cell
         traffic trace function.
-- 
GitLab


From c83d554f7341cea7d9bb2d1dbf9e923005a8d136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Tue, 4 Feb 2025 09:58:46 +0000
Subject: [PATCH 19/20] 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 41a168ac8..bacfe3cb6 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1568,7 +1568,6 @@ module _3gpp-common-trace {
       key "idx";
       leaf idx { type uint32 ; }
       description "It specifies the area where data shall be collected.";
-      min-elements 0;
       max-elements 1;
       uses AreaScopeGrp;      
     }
@@ -1626,13 +1625,13 @@ module _3gpp-common-trace {
         
         For 5GC UE level measurements defined in TS 28.558, the 
         name is constructed as follows:
-        -	'family.measurementName.subcounter' for measurement type 
+        'family.measurementName.subcounter' for measurement type 
         with specified subcounter
-        -	'family.measurementName.ALL' for measurement type with all 
+        'family.measurementName.ALL' for measurement type with all 
         supported subcounters
-        -	'family.measurementName' for measurement type without 
+        'family.measurementName' for measurement type without 
         subcounters
-        -	'family' for measurement family, including all measurement 
+        'family' for measurement family, including all measurement 
         types and 
         the associated subcounters under this family.
         For non-3GPP specified 5GC UE level measurements the name is 
-- 
GitLab


From d9bd4264b4df07e7c84d51e755a89e2075aa9f41 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:45:03 +0000
Subject: [PATCH 20/20] 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 bacfe3cb6..efe706935 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -25,7 +25,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
-  revision 2025-02-06 { reference "CR-XXXX" ; }
+  revision 2025-02-06 { reference "CR-0503" ; }
   revision 2024-11-05 { reference "CR-0470" ; }
   revision 2024-10-06 { reference "CR-0459"; }
   revision 2024-08-06 { reference "CR-0376 CR-0378 CR-0420"; }
-- 
GitLab