From 41d4606dd5d0f9699eee6119b45633774f57784e Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 2 Apr 2024 21:37:18 +0200
Subject: [PATCH 01/14] adding only-system-created and aligning r17 and r18
 versions

---
 yang-models/_3gpp-common-fm.yang              |  4 +-
 yang-models/_3gpp-common-yang-extensions.yang | 37 +++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index ca4d7eaca..01caf4e27 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -12,7 +12,7 @@ module _3gpp-common-fm {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
   description "Defines a Fault Management model
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
 
   reference "3GPP TS 28.623
@@ -25,6 +25,7 @@ module _3gpp-common-fm {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-04-05 { reference CR-0333 ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2023-05-09 { reference CR-0249;   }
   revision 2022-10-31 { reference CR-0195;   }
@@ -496,6 +497,7 @@ module _3gpp-common-fm {
     list AlarmList {
       key id;
       max-elements 1;
+      yext3gpp:only-system-created;
       description "The AlarmList represents the capability to store and manage
         alarm records. The management scope of an AlarmList is defined by all
         descendant objects of the base managed object, which is the object
diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang
index d98af752c..4a5e49043 100755
--- a/yang-models/_3gpp-common-yang-extensions.yang
+++ b/yang-models/_3gpp-common-yang-extensions.yang
@@ -4,12 +4,11 @@ module _3gpp-common-yang-extensions {
   prefix yext3gpp ;
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
   description "The module defines YANG extensions needed 
     3GPP YANG modeling.
 
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
-    TTA, TTC). All rights reserved.
-
     Extensions MUST be defined with the following structure in the
     description statement:
         - What is this statement.
@@ -39,12 +38,36 @@ module _3gpp-common-yang-extensions {
     If support for an extension is missing the extension statement needs
     individual handling or it SHOULD be removed from the module using
     the extension e.g. with a deviation.
-          ";
-
-  revision 2023-09-17 { reference CR-0270 ; } 
-  revision 2022-10-31 { reference CR-0195;   }
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Solution Set (SS) definitions
+      3GPP TS 28.623";
+
+  revision 2024-04-05 { reference "CR-0332, 0333" ; } 
+  revision 2023-09-17 { reference "CR-0270, 0271" ; } 
+  revision 2022-10-31 { reference "CR-0195, 0196";   }
   revision 2019-06-23 { reference "Initial version";   }
 
+  extension only-system-created {
+    description
+      "Indicates that the MOI can only be created and deleted by the 
+       NmS producer. 
+       System created MOIs can have both read-only and read-write data
+       node children. Implementers shall add the extension to standard 
+       models if they restrict creation/deletion of an IOC.
+       
+       The statement MUST only be a sub-statement of the list statement,
+       with the parent list statement representing an IOC.
+
+       Zero or one only-system-created statement per parent statement is
+       allowed. No sub-statements are allowed.
+            
+       Adding this statement is an NBC change, removing it is BC.";
+  }
+
   extension notNotifyable {
     description
       "Indicates that data change notifications shall not be sent 
-- 
GitLab


From 09d00313a7bb22262f6ba38116953fd52b94c005 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 2 Apr 2024 21:44:49 +0200
Subject: [PATCH 02/14] correct CR number in fm

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

diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index 01caf4e27..51da632b5 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -25,7 +25,7 @@ module _3gpp-common-fm {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
-  revision 2024-04-05 { reference CR-0333 ; } 
+  revision 2024-04-05 { reference CR-0332 ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2023-05-09 { reference CR-0249;   }
   revision 2022-10-31 { reference CR-0195;   }
-- 
GitLab


From 5b748eb38303639ca0fce23b0897d82ba7a55e46 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 16 Apr 2024 12:15:19 +0800
Subject: [PATCH 03/14] Change NmS to MnS

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

diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang
index 4a5e49043..dc9c8e5b5 100755
--- a/yang-models/_3gpp-common-yang-extensions.yang
+++ b/yang-models/_3gpp-common-yang-extensions.yang
@@ -54,7 +54,7 @@ module _3gpp-common-yang-extensions {
   extension only-system-created {
     description
       "Indicates that the MOI can only be created and deleted by the 
-       NmS producer. 
+       MnS producer. 
        System created MOIs can have both read-only and read-write data
        node children. Implementers shall add the extension to standard 
        models if they restrict creation/deletion of an IOC.
-- 
GitLab


From 8a66f00f7a38959dace3ff7dda7108a65ac2f909 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Sun, 7 Apr 2024 11:34:57 +0000
Subject: [PATCH 04/14] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index e719feb99..16c721576 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 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
 
   reference "3GPP TS 28.623
@@ -26,6 +26,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-04-05 { reference "CR-0341" ; }
   revision 2023-11-05 { reference "CR-0293 CR-0301" ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2023-07-25 { reference CR00252; }
@@ -428,6 +429,14 @@ module _3gpp-common-trace {
       uses types3gpp:PLMNId;
     }
 
+    leaf-list {
+      when '../jobType = "TRACE_ONLY"'
+        +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
+      type string;
+      description "Specifies the messages to be reported.";
+      reference "Clause 10 of 3GPP TS 32.422";
+    }
+
     leaf traceReportingConsumerUri {
       when '../traceReportingFormat  = "STREAMING"';
       type inet:uri;
-- 
GitLab


From d4b3f647bba59547c1fe608c383332bc36dce12d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Sun, 7 Apr 2024 11:35:37 +0000
Subject: [PATCH 05/14] 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 16c721576..19de1fe87 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -429,7 +429,7 @@ module _3gpp-common-trace {
       uses types3gpp:PLMNId;
     }
 
-    leaf-list {
+    leaf-list traceMessages {
       when '../jobType = "TRACE_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type string;
-- 
GitLab


From 9dcc1097c24ded03f7e0b76c8ae3a8925e20db7c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Sun, 7 Apr 2024 12:07:11 +0000
Subject: [PATCH 06/14] 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 19de1fe87..05fb58914 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -429,7 +429,7 @@ module _3gpp-common-trace {
       uses types3gpp:PLMNId;
     }
 
-    leaf-list traceMessages {
+    leaf-list listOfTraceMessages {
       when '../jobType = "TRACE_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type string;
-- 
GitLab


From 722ead83ede474c253e1c63ffe491df2b883ffca Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 18 Apr 2024 04:24:30 +0000
Subject: [PATCH 07/14] Update file _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 05fb58914..049e55c95 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -429,7 +429,7 @@ module _3gpp-common-trace {
       uses types3gpp:PLMNId;
     }
 
-    leaf-list listOfTraceMessages {
+    leaf-list listOfTraceMetrics {
       when '../jobType = "TRACE_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type string;
-- 
GitLab


From 52cd2c6a79cece9afed804a1c75c302904c9db04 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Fri, 3 May 2024 00:22:58 +0200
Subject: [PATCH 08/14] Locally rebasing and merging MR1105

---
 yang-models/_3gpp-5gc-nrm-nwdaffunction.yang  |  5 ++--
 yang-models/_3gpp-common-fm.yang              |  3 ++-
 .../_3gpp-common-managed-function.yang        |  5 ++--
 yang-models/_3gpp-common-measurements.yang    |  9 ++++----
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 23 ++++++++++---------
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
index 4d677f6a1..cbc732d1f 100755
--- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
@@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-nwdaffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NWDAF function in 5GC. For more 
     information about the NWDAF, see 3GPP TS 23.501.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2024-02-23 { reference CR-1219 ; } 
   revision 2023-09-17 { reference CR-1042 ; } 
   revision 2020-11-07 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
@@ -128,7 +129,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
   augment "/me3gpp:ManagedElement" {
     list NWDAFFunction {
       description "5G Core NWDAF Function";
-      reference "3GPP TS 28.541";
+      reference "3GPP TS 28.541 3GPP TS 23.501";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index 51da632b5..266ffb43a 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -26,6 +26,7 @@ module _3gpp-common-fm {
       Information Service (IS)";
 
   revision 2024-04-05 { reference CR-0332 ; } 
+  revision 2024-02-23 { reference CR-0347; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2023-05-09 { reference CR-0249;   }
   revision 2022-10-31 { reference CR-0195;   }
@@ -446,7 +447,7 @@ module _3gpp-common-fm {
     description "Represents the AlarmList IOC.";
 
     leaf administrativeState {
-      type types3gpp:AdministrativeState ;
+      type types3gpp:BasicAdministrativeState ;
       default LOCKED;
       description "When set to UNLOCKED, the alarm list is updated.
         When the set to LOCKED, the existing alarm records are not
diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang
index 7a2afd820..afa166483 100755
--- a/yang-models/_3gpp-common-managed-function.yang
+++ b/yang-models/_3gpp-common-managed-function.yang
@@ -13,7 +13,7 @@ module _3gpp-common-managed-function {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The module defines a base class/grouping for major 3GPP 
     functions.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference 
     "3GPP TS 28.622 
@@ -24,6 +24,7 @@ module _3gpp-common-managed-function {
     3GPP TS 28.620 
     Umbrella Information Model (UIM)";
 
+  revision 2024-02-23 { reference CR-0347 ; } 
   revision 2023-12-17 { reference CR-0327 ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2022-10-31 { reference CR-0195;   }
@@ -114,7 +115,7 @@ module _3gpp-common-managed-function {
     }
 
     leaf administrativeState  {
-      type types3gpp:AdministrativeState;
+      type types3gpp:BasicAdministrativeState;
       mandatory true;
       description "Permission to use or prohibition against using the instance";
     }
diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang
index 4c184c57b..3940a8596 100755
--- a/yang-models/_3gpp-common-measurements.yang
+++ b/yang-models/_3gpp-common-measurements.yang
@@ -44,7 +44,7 @@ module _3gpp-common-measurements {
     Measurements can be contained under ManagedElement, SubNetwork, or
     any list representing a class inheriting from Subnetwork or
     ManagedFunction. Note: KPIs will only be supported under SubNetwork
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
 
   reference "3GPP TS 28.623
@@ -57,9 +57,10 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-02-23 { reference CR-0347; } 
   revision 2024-01-29 { reference "CR-0327"; }
   revision 2023-11-17 { reference "CR-0298"; }
-  revision 2023-11-05 { reference CR-0306 ; } 
+  revision 2023-11-05 { reference CR-0306; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2023-02-15 { reference "CR-0239";}
   revision 2022-11-03 { reference "CR-0193"; }
@@ -242,7 +243,7 @@ module _3gpp-common-measurements {
 
     leaf administrativeState {
       default UNLOCKED;
-      type types3gpp:AdministrativeState ;
+      type types3gpp:BasicAdministrativeState ;
       description "Enable or disables production of the metrics";
     }
 
@@ -326,7 +327,7 @@ module _3gpp-common-measurements {
 
     leaf administrativeState {
       default UNLOCKED;
-      type types3gpp:AdministrativeState ;
+      type types3gpp:BasicAdministrativeState ;
       description "Enables or disables the ThresholdMonitor.";
     }
 
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 8122bcc3b..8ad80d956 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -13,22 +13,23 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the GNBCUCPFunction Information 
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-02-23 { reference CR-1219; } 
   revision 2023-09-17 { reference CR-1042 ; } 
   revision 2022-07-27 { reference "CR-0769"; }
   revision 2021-11-06 { reference "CR-0611" ; }
   revision 2021-11-05 { reference "CR-0609"; }
-  revision 2020-10-02 { reference CR-0384 ; }
+  revision 2020-10-02 { reference CR-0384; }
   revision 2020-08-06 { reference "CR-0333"; }
   revision 2020-08-03 { reference "CR-0321"; }
   revision 2020-06-03 { reference "CR-0286"; }
-  revision 2020-05-08 { reference S5-203316 ; }
+  revision 2020-05-08 { reference S5-203316; }
   revision 2020-04-28 { reference "0260"; }
-  revision 2020-02-14 { reference S5-20XXXX ; }
-  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2020-02-14 { reference S5-20XXXX; }
+  revision 2019-10-28 { reference S5-193518; }
   revision 2019-06-17 { reference "Initial revision"; }
 
   feature DESManagementFunction {
@@ -81,27 +82,27 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       uses types3gpp:PLMNId;
     } 
 
-    leaf-list x2BlackList {
+    leaf-list x2BlockList {
       type string;
       description "List of nodes to which X2 connections are prohibited.";
     }
 
-    leaf-list x2WhiteList {
+    leaf-list x2AllowList {
       type string;
       description "List of nodes to which X2 connections are enforced.";
     }
 
-    leaf-list xnBlackList {
+    leaf-list xnBlockList {
       type string;
       description "List of nodes to which Xn connections are prohibited.";
     }
 
-    leaf-list xnWhiteList {
+    leaf-list xnAllowList {
       type string;
       description "List of nodes to which X2 connections are enforced.";
     }
 
-    leaf-list xnHOBlackList {
+    leaf-list xnHOBlockList {
       type string;
       description "List of nodes to which handovers over  Xn are prohibited.";
     }
@@ -112,7 +113,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
         supports (is associated to).";
     }
 
-    leaf-list x2HOBlackList {
+    leaf-list x2HOBlockList {
       type string;
       description "List of nodes to which handovers over X2 are prohibited.";
     }
-- 
GitLab


From a64dfa7f356aa64d3acda9f77a719fb3027080e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Mon, 13 May 2024 13:34:46 +0000
Subject: [PATCH 09/14] Update _3gpp-common-files.yang

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

diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang
index 464be0ab7..c0f3c3cdc 100644
--- a/yang-models/_3gpp-common-files.yang
+++ b/yang-models/_3gpp-common-files.yang
@@ -208,9 +208,9 @@ module _3gpp-common-files {
 
         The attribute '_linkToFiles' allows a MnS consumer to create simple 
         and targeted subscriptions for 'notifyFileReady', 
-        'notifyFilePreparationError' and 'notifyFileDeletion', or 
-        'notifyMOICreation', 'notifyMOIChanges', 'notifyFilePreparationError'  
-        and 'notifyFileDeletion' related to 'File' instances created or deleted 
+        and 'notifyFilePreparationError', or 
+        'notifyMOICreation', 'notifyMOIChanges' and 'notifyFilePreparationError'  
+         related to 'File' instances created or deleted 
         under the 'Files' instance of a specific job. The subscription needs 
         to scope simply objects one level below the 'Files' object.
 
@@ -323,4 +323,4 @@ module _3gpp-common-files {
       }
     }
   }  
-}
\ No newline at end of file
+}
-- 
GitLab


From b7c1f75555da78c7a909f60b9c7f093388016699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Mon, 13 May 2024 13:53:32 +0000
Subject: [PATCH 10/14] Update _3gpp-common-files.yang with revision
 information

---
 yang-models/_3gpp-common-files.yang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang
index c0f3c3cdc..99252d115 100644
--- a/yang-models/_3gpp-common-files.yang
+++ b/yang-models/_3gpp-common-files.yang
@@ -13,7 +13,7 @@ module _3gpp-common-files {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of File retrieval NRM fragment 
     including the IOCs File and Files.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 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-files {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-05-11 { reference CR-0xxx ; }
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2022-09-28 { reference CR-0191; }
   
-- 
GitLab


From 99cf9f9100bb062ccdeb000f2a3377a8376bbbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?=
 <jose.antonio.ordonez@ericsson.com>
Date: Fri, 17 May 2024 07:25:17 +0000
Subject: [PATCH 11/14] Update _3gpp-common-files.yang with the CR number

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

diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang
index 99252d115..0a3c04363 100644
--- a/yang-models/_3gpp-common-files.yang
+++ b/yang-models/_3gpp-common-files.yang
@@ -25,7 +25,7 @@ module _3gpp-common-files {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
-  revision 2024-05-11 { reference CR-0xxx ; }
+  revision 2024-05-11 { reference CR-0361 ; }
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2022-09-28 { reference CR-0191; }
   
-- 
GitLab


From c95f2b21ea70a6aa6750a381faa4c504d657da70 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 13 May 2024 20:37:51 +0000
Subject: [PATCH 12/14] 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 049e55c95..e82ae6a2b 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -433,7 +433,7 @@ module _3gpp-common-trace {
       when '../jobType = "TRACE_ONLY"'
         +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type string;
-      description "Specifies the messages to be reported.";
+      description "Specifies the metrics to be reported.";
       reference "Clause 10 of 3GPP TS 32.422";
     }
 
-- 
GitLab


From 695680125a95557fb04e4750682e14a5d541c139 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 13 May 2024 20:40:53 +0000
Subject: [PATCH 13/14] 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 e82ae6a2b..f3fc68a9f 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -26,6 +26,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-05-13 { reference "CR-xxxx" ; }
   revision 2024-04-05 { reference "CR-0341" ; }
   revision 2023-11-05 { reference "CR-0293 CR-0301" ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
-- 
GitLab


From a88ec2deffb6ffe95b275a3a7cbd27ea3ed477d7 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 13 May 2024 20:47:22 +0000
Subject: [PATCH 14/14] 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 f3fc68a9f..c9b799140 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -26,7 +26,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
-  revision 2024-05-13 { reference "CR-xxxx" ; }
+  revision 2024-05-13 { reference "CR-0360" ; }
   revision 2024-04-05 { reference "CR-0341" ; }
   revision 2023-11-05 { reference "CR-0293 CR-0301" ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
-- 
GitLab