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 {

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-0361 ; }
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2022-09-28 { reference CR-0191; }
   
@@ -208,9 +209,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.
 

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,8 @@ module _3gpp-common-fm {
       Integration Reference Point (IRP);
       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;   }
@@ -445,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
@@ -496,6 +498,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

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";
     }

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,6 +57,7 @@ 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; } 
@@ -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.";
     }
 

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,8 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  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 ; } 
   revision 2023-07-25 { reference CR00252; }
@@ -428,6 +430,14 @@ module _3gpp-common-trace {
       uses types3gpp:PLMNId;
     }
 
+    leaf-list listOfTraceMetrics {
+      when '../jobType = "TRACE_ONLY"'
+        +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
+      type string;
+      description "Specifies the metrics to be reported.";
+      reference "Clause 10 of 3GPP TS 32.422";
+    }
+
     leaf traceReportingConsumerUri {
       when '../traceReportingFormat  = "STREAMING"';
       type inet:uri;

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 
+       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.
+       
+       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 

yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang

@@ -13,10 +13,11 @@ 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" ; }
@@ -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.";
     }