yang-models/_3gpp-5g-common-yang-types.yang

@@ -11,16 +11,31 @@ module _3gpp-5g-common-yang-types {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The model defines common types for 5G networks and 
     network slicing.
-    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-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-05-10 { reference CR-0916; }
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-11-05 { reference CR-0412 ; }
   revision 2019-10-20 { reference "Initial version."; }
  
+  typedef NRTAC {
+    type string;
+    description "This holds the identity of the common Tracking Area Code 
+      for the PLMNs. 
+
+      allowedValues:
+      a) It is the TAC or Extended-TAC. 
+      b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300, 
+        subclause 10.1.7 (PLMNID and TAC relation).
+      c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003
+       and Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473.
+      d) For a 5G SA (Stand Alone), it has a non-null value.";
+  }
+  
   grouping SNssai {
     description 
       "Single Network Slice Selection Assistance Information(S-NSSAI)";

yang-models/_3gpp-5gc-nrm-amffunction.yang

@@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "AMFFunction derived from basic ManagedFunction.
-    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-04-04 { reference CR-1139; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
@@ -224,6 +225,24 @@ module _3gpp-5gc-nrm-amffunction {
       uses satelliteBackhaulInfo;
     }
 
+    leaf-list mdtUserConsentReqList {
+      type enumeration {
+        enum M1;
+        enum M2;
+        enum M3;
+        enum M4;
+        enum M5;
+        enum M6;
+        enum M7;
+        enum M8;
+        enum M9;
+        enum MDT_UE_LOCATION;
+      }
+      description "represents a list of MDT measurement names that are
+        subject to user consent at MDT activation.
+        Any MDT measurement, whose name is not specified in this list, is not 
+        subject to user consent at MDT activation.";
+    }
   }
   
   augment "/me3gpp:ManagedElement" {

yang-models/_3gpp-5gc-nrm-amfregion.yang

@@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amfregion {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AMF Region which consists one or
     multiple AMF Sets.
-    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-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
@@ -45,7 +46,7 @@ module _3gpp-5gc-nrm-amfregion {
                    reference "TS 38.413 clause 9.3.3.10";
       min-elements 1;
       config false;
-      type types3gpp:Tac;
+      type types5g3gpp:NRTAC;
     }
     
     list sNSSAIList {

yang-models/_3gpp-5gc-nrm-amfset.yang

@@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amfset {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AMF Set which consists of some AMFs 
     that serve a given area and Network Slice.
-    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-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
@@ -44,7 +45,7 @@ module _3gpp-5gc-nrm-amfset {
       reference "TS 38.413 clause 9.3.3.10";
       min-elements 1;
       config false;
-      type types3gpp:Tac;
+      type types5g3gpp:NRTAC;
     }
     
     list sNSSAIList {

yang-models/_3gpp-5gc-nrm-neffunction.yang

@@ -17,10 +17,12 @@ module _3gpp-5gc-nrm-neffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NEF function in 5GC. For more 
     information about the NEF, 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-05-18 { reference CR-1273 ; } 
+  revision 2024-04-12 { reference CR-1218 ; } 
   revision 2023-09-18 { reference CR-1103 ; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -161,7 +163,7 @@ module _3gpp-5gc-nrm-neffunction {
       yext3gpp:notNotifyable;
       key idx;
       leaf idx { type uint32 ; }
-      uses nfp3gpp:TaiRange;
+      uses nfp3gpp:TaiRangeGrp;
     }
              
     leaf nefId {
@@ -246,6 +248,30 @@ module _3gpp-5gc-nrm-neffunction {
         - True: UAS NF functionality is supported by the NEF.
         - False (default): UAS NF functionality is not supported by the NEF";
     }
+    
+    leaf multiMemAfSessQosInd {
+      type boolean;
+      default false;
+      description "This attribute indicates whether the NEF supports 
+        Multi-member AF session with required QoS functionality:
+
+        - TRUE: Multi-member AF session with required QoS functionality is 
+        supported by the NEF
+        - FALSE (default): Multi-member AF session with required QoS 
+        functionality is not supported by the NEF.";
+    }
+      
+    leaf memberUESelAssistInd {
+      type boolean;
+      default false;
+      description "This attribute indicates whether the NEF supports member 
+        UE selection assistance functionality:
+
+        - TRUE: member UE selection assistance functionality is supported by 
+        the NEF
+        - FALSE (default): member UE selection assistance functionality is 
+        not supported by the NEF.";
+    }
   }
   
   grouping NEFFunctionGrp {

yang-models/_3gpp-5gc-nrm-nfprofile.yang

@@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "NF profile class.
-    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 29.510";
   
+  revision 2024-04-12 { reference CR-1218 ; } 
   revision 2023-11-18 { reference CR-1103 ; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-02-14 { reference CR-0891; }
@@ -338,7 +339,7 @@ module _3gpp-5gc-nrm-nfprofile {
         min-elements 1;
         key idx; 
         leaf idx { type uint32; }
-        uses TaiRange;
+        uses TaiRangeGrp;
       }
       
       list backupInfoAmfFailure {
@@ -409,7 +410,7 @@ module _3gpp-5gc-nrm-nfprofile {
         min-elements 1;
         key idx; 
         leaf idx { type uint32; }
-        uses TaiRange;
+        uses TaiRangeGrp;
       }
       
       leaf pgwFqdn {
@@ -1055,7 +1056,7 @@ module _3gpp-5gc-nrm-nfprofile {
     }
   }
   
-  grouping TaiRange {
+  grouping TaiRangeGrp {
     list plmnId {
       description "PLMN ID related to the TacRange.";
       min-elements 1;

yang-models/_3gpp-5gc-nrm-nwdaffunction.yang

@@ -8,17 +8,20 @@ module _3gpp-5gc-nrm-nwdaffunction {
   import _3gpp-common-managed-element { prefix me3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
   
   organization "3gpp SA5";
   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-04-12 { reference CR-1218; } 
   revision 2023-09-18 { reference CR-1043; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412; }
@@ -26,20 +29,267 @@ module _3gpp-5gc-nrm-nwdaffunction {
   
   revision 2019-05-15 {reference "initial revision"; }
       
+  typedef NwdafEvent {
+    description "The detailed ENUM value for NwdafEvent see the 
+      Table 5.1.6.3.4-1 in TS 29.520";
+    type union {
+      type enumeration {
+        enum SLICE_LOAD_LEVEL;
+        enum NETWORK_PERFORMANCE;
+        enum NF_LOAD;
+        enum SERVICE_EXPERIENCE;
+        enum UE_MOBILITY;
+        enum UE_COMMUNICATION;
+        enum QOS_SUSTAINABILITY;
+        enum ABNORMAL_BEHAVIOUR;
+        enum USER_DATA_CONGESTION;
+        enum NSI_LOAD_LEVEL;
+        enum DN_PERFORMANCE;
+        enum DISPERSION;
+        enum RED_TRANS_EXP;
+        enum WLAN_PERFORMANCE;
+        enum SM_CONGESTION;  
+      }
+      type string;
+    }
+  }
+  
+  grouping NwdafCapabilityGrp {
+    description "This data type represents the capability supported by the 
+      NWDAF.";
+      reference "TS 29.510";
+      
+      leaf analyticsAggregation {
+        type boolean ;
+        default false;
+        description "It indicates whether the NWDAF supports analytics 
+          aggregation";
+      }
+      
+      leaf analyticsMetadataProvisioning {
+        type boolean ;
+        default false;
+        description "It indicate whether the NWDAF supports analytics metadata 
+          provisioning:";
+      }      
+  }
+
+  grouping MlAnalyticsInfoGrp {
+    description "This data type represents ML Analytics Filter information 
+      supported by the Nnwdaf_MLModelProvision service.";
+    reference "TS 29.510";
+      
+    leaf-list mlAnalyticsIds {
+      type NwdafEvent;
+      ordered-by user;
+      description "This attribute represents the Analytic functionalities 
+        (identified by nwdafEvent defined in TS 29.520 [85]) of the NWDAF 
+        instance. MnS consumer can configure this attribute to specify 
+        which Analytic functionalities (identified by nwdafEvent) can be 
+        performed the NWDAF instance. If the value of this attribute is not 
+        present, the NWDAF instance can perform any NWDAFEvents
+
+        Analytics Id(s) supported by the Nnwdaf_MLModelProvision service, 
+        if none are provided the NWDAF can serve any mlAnalyticsId.";
+    }
+    
+    list sNSSAIList {
+      min-elements 1;
+      description "List of S-NSSAIs the managed object is capable of 
+        supporting.";
+      reference "3GPP TS 23.003";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+    
+    list trackingAreaList {
+      description "This attribute represents area of Interest of the ML model, 
+        if none are provided the ML model for the analytics can apply to any 
+        TAIs.
+
+        If present, it represents the list of TAIs, it may contain one or 
+        more non-3GPP access TAIs.";
+      key idx ;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+    
+    leaf-list mlModelInterInfo {
+      type string {
+        pattern "[0-9]{6}";
+      }
+      description "This attribute defines the list of NWDAF vendors that are 
+        allowed to retrieve ML models from the NWDAF containing MTLF. The 
+        absence of this attribute indicates that none of the NWDAF vendors 
+        can retrieve the ML models. 
+
+        allowedValues: 6 decimal digits; if the SMI code has less than 
+        6 digits, it shall be padded with leading digits '0' to complete a 
+        6-digit string value.";
+    }
+    
+    leaf flCapabilityType {
+      type enumeration {
+        enum FL_SERVER {
+          description "NWDAF containing MTLF as Federated Learning Server";
+        }
+        enum FL_CLIENT {
+          description "NWDAF containing MTLF as Federated Learning Client";
+        }
+        enum FL_SERVER_AND_CLIENT {
+          description "NWDAF containing MTLF as Federated Learning Server and 
+            Client.";
+        }
+      }
+      description "This attribute defines the federated learning capability 
+        type supported by NWDAF containing MTLF.";
+    }
+    
+    list flTimeInterval {
+      key idx ;
+      leaf idx { type uint32; }
+      description "This attribute defines the time window at which the 
+        indicated flCapabilityType supported by NWDAF MTLF is available. 
+        This attribute shall be present only if flCapabilityType attribute 
+        is present.";
+      uses types3gpp:TimeWindowGrp;
+    }
+  }
+  
+  grouping NwdafInfoGrp {
+    description "This data type represents specific data for the NWDAF.";
+    reference "TS 29.510";
+
+    leaf-list nwdafEvents {
+      type NwdafEvent;
+      ordered-by user;
+      description "This attribute represents the Analytic functionalities 
+        (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. 
+        MnS consumer can configure this attribute to specify which Analytic 
+        functionalities (identified by nwdafEvent) can be performed the NWDAF 
+        instance. If the value of this attribute is not present, the NWDAF 
+        instance can perform any NWDAFEvents.
+        The detailed ENUM value for NwdafEvent see the Table 5.1.6.3.4-1 
+        in TS 29.520";
+    }
+      
+    leaf-list eventIds {
+      type string ;
+      min-elements 1;
+      description "It represents the EventId(s) supported by the 
+        Nnwdaf_AnalyticsInfo service, if none are provided the NWDAF can serve 
+        any eventId. (see clause TS 29.520)";
+    }
+      
+    list taiList {
+      description "The list of TAIs. ";
+      min-elements 1;
+      key idx ;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+      
+    list taiRangeList {
+      min-elements 1;
+      key idx ;
+      leaf idx { type uint32; }
+      description "The range of TAIs.";
+      uses nfp3gpp:TaiRangeGrp;
+    }
+      
+    list nwdafCapability {
+      max-elements 1;
+      key idx ;
+      leaf idx { type uint32; }
+      description "This attribute indicates the capability of the NWDAF.
+        If not present, the NWDAF shall be regarded with no capability.";
+      uses NwdafCapabilityGrp;
+    }
+      
+    leaf analyticsDelay {
+      type int32 ;
+      units seconds;
+      description "It represents the supported Analytics Delay related to the 
+        eventIds and nwdafEvents. 
+        It is an unsigned integer identifying a period of time in units of 
+        seconds.(see clause 5.2.2 TS 29.571).";
+    }
+      
+    leaf-list servingNfTypeList {
+      type types3gpp:NfType;
+      min-elements 1;
+      description "It contains the list of NF type(s) from which the NWDAF NF 
+        can collect data. The absence of this attribute indicates that the 
+        NWDAF can collect data from any NF type.";
+    }
+      
+    leaf-list servingNfSetIdList {
+      type string ;
+      min-elements 1;
+      description "It contains the list of NF type(s) from which the NWDAF NF 
+        can collect data. The absence of this attribute indicates that the 
+        NWDAF can collect data from any NF type. (see clause 5.4.2 NfSetId 
+        in TS 29.571)";
+    }
+      
+    list mlAnalyticsList {
+      min-elements 1;
+      key idx ;
+      leaf idx { type uint32; }
+      description "It represents ML Analytics Filter information supported by 
+        the Nnwdaf_MLModelProvision service.";
+      uses MlAnalyticsInfoGrp;
+    }
+  }
+  
+  grouping NetworkSliceInfoGrp {
+    description "Represents information of network slice when the NWDAF is 
+      authorized to collect the management data of the network slice. ";
+      
+    list sNSSAI {
+      description "It represents the S-NSSAI the NetworkSlice managed object 
+        is supporting. The S-NSSAI is defined in TS 23.003 ";
+      key idx;
+      min-elements 1;
+      max-elements 1;
+      
+      leaf idx {
+        type string;
+      }
+      uses types5g3gpp:SNssai;
+    }
+    
+    leaf-list cNSIId {
+      type string;
+      description "It represents NSI ID which is an identifier for identifying 
+        the Core Network part of a Network Slice instance when multiple 
+        Network Slice instances of the same Network Slice are deployed, 
+        and there is a need to differentiate between them in the 5GC. 
+        See NSI ID definition in clause 3.1 of TS 23.501 and 
+        subclause 6.1.6.2.7 of TS 29.531.";
+    }
+    
+    leaf networkSliceRef {
+      type types3gpp:DistinguishedName;
+      mandatory true;
+      description "This holds a DN of the NetworkSlice managed object relating 
+        to the NetworkSlice instance differentiated by sNSSAI and optional 
+        cNSIId.";
+    }
+  }
+  
   grouping NWDAFFunctionGrp {
     description "Represents the NWDAFFunction IOC";
     uses mf3gpp:ManagedFunctionGrp;
     
-    list pLMNIdList {
-      description "List of at most six entries of PLMN Identifiers, but at 
-        least one (the primary PLMN Id).
-        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a 
-        Mobile Network Code (MNC).";
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network Function.";
 
       min-elements 1; 
-      max-elements 6;
-      key "mcc mnc";
+      key "idx";
+      leaf idx { type uint32; }
       uses types3gpp:PLMNId;
+      uses types5g3gpp:SNssai;
     }
     
     leaf sBIFQDN {
@@ -48,17 +298,6 @@ module _3gpp-5gc-nrm-nwdaffunction {
       type inet:domain-name;
     }
        
-    list sNSSAIList {
-      description "List of S-NSSAIs the managed object is capable of supporting.
-                   (Single Network Slice Selection Assistance Information)
-                   An S-NSSAI has an SST (Slice/Service type) and an optional SD
-                   (Slice Differentiator) field.";
-      //optional support
-      reference "3GPP TS 23.003";
-      key "sd sst";
-      uses types5g3gpp:SNssai;
-    }
-    
     list managedNFProfile {
       key idx;
       min-elements 1;
@@ -75,12 +314,77 @@ module _3gpp-5gc-nrm-nwdaffunction {
       reference "3GPP TS 23.501";
       uses types5g3gpp:CommModel;
     }
+    
+    list networkSliceInfoList {
+      key idx;
+      min-elements 1;
+      description "The attribute specifies a list of NetworkSliceInfo which 
+        is defined as a datatype (see clause 5.3.95). It can be used by the 
+        NWDAF to facilitate the data collection from OAM.";
+      leaf idx {
+        type string;
+      }
+      uses NetworkSliceInfoGrp;    
+      yext3gpp:inVariant;
+    }
+
+    list nwdafInfo {
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      description "It represents specific data for the NWDAF.";
+      uses NwdafInfoGrp;
+    }
+    
+    leaf administrativeState {
+      type types3gpp:BasicAdministrativeState ;
+      mandatory true;
+      description "This attribute determines whether the NWDAF is enabled or 
+        disabled. MnS consumer can configure this attribute to activate or 
+        de-activate the analytic functionalities (identified by nwdafEvent 
+        defined in TS 29.520) of the NWDAF instance.";
+    }
+    
+    leaf nwdafLogicalFuncSupported {
+      type enumeration {
+        enum NWDAF_WITH_ANLF {
+          description "Indicates the NWDAF containing Analytics logical 
+            function (AnLF)";
+          }
+        enum NWDAF_WITH_MTLF {
+          description "Indicates the NWDAF containing Model Training logical 
+            function (MTLF).";
+          }
+        enum NWDAF_WITH_ANLF_MTLF {
+          description "Indicates the NWDAF containing both Analytics logical 
+            function (AnLF) and Model Training logical function (MTLF).";
+        }
+      }
+      config false;
+      description "It represents the logical functions supported by the NWDAF. 
+        If not present, the NWDAF shall be regarded with no logical 
+        decomposition, in that case the NWDAF only supports the analytics 
+        services.";
+    }
   }
   
   augment "/me3gpp:ManagedElement" {
     list NWDAFFunction {
-      description "5G Core NWDAF Function";
-      reference "3GPP TS 28.541";
+      description "5G Core NWDAF Function.
+        For more information about the NWDAF, see TS 23.501. Several 
+        attributes (including 'nwdafInfo', 'administrativeState' and 
+        'ManagedNFProfile.servingScope') are used to control the functionalities 
+        (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance.
+
+        The attribute 'ManagedNFProfile.servingScope' is used to represent 
+        specified certain geographical area(s) can be served by the NWDAF 
+        instance. 
+        
+        The attribute 'NwdafInfo.taiList' and 'NwdafInfo.taiRangeList' is used 
+        to represent specified certain tracking area(s) can be served by the 
+        NWDAF instance.";
+      reference "3GPP TS 28.541 3GPP TS 23.501";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {

yang-models/_3gpp-5gc-nrm-pcffunction.yang

@@ -15,10 +15,11 @@ module _3gpp-5gc-nrm-pcffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the PCF function in 5GC. For more 
     information about the PCF, 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-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -27,8 +28,8 @@ module _3gpp-5gc-nrm-pcffunction {
   revision 2019-10-25 { reference "S5-194457 S5-193518"; }
   revision 2019-05-22 { reference "initial revision"; }
   
-  grouping PCFFuntionGrp {
-    description "Represents the PCFFuntion IOC";
+  grouping PCFFunctionGrp {
+    description "Represents the PCFFunction IOC";
     uses mf3gpp:ManagedFunctionGrp;
     
     list pLMNIdList {
@@ -94,7 +95,7 @@ module _3gpp-5gc-nrm-pcffunction {
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
-        uses PCFFuntionGrp;
+        uses PCFFunctionGrp;
       }
       uses mf3gpp:ManagedFunctionContainedClasses;
     }

yang-models/_3gpp-5gc-nrm-smffunction.yang

@@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-smffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "SMFFunction derived from basic ManagedFunction.
-    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-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -44,7 +45,7 @@ module _3gpp-5gc-nrm-smffunction {
       reference "TS 38.413 clause 9.3.3.10";
       min-elements 1;
       config false;
-      type types3gpp:Tac;
+      type types5g3gpp:NRTAC;
     }
 
     leaf sBIFQDN {

yang-models/_3gpp-5gc-nrm-udmfunction.yang

@@ -15,10 +15,11 @@ module _3gpp-5gc-nrm-udmfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the UDM function in 5GC. For more 
     information about the UDM, 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-04-04 { reference CR-1139; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -74,6 +75,25 @@ module _3gpp-5gc-nrm-udmfunction {
       reference "3GPP TS 23.501";
       uses types5g3gpp:CommModel;
     }
+
+    leaf-list mdtUserConsentReqList {
+      type enumeration {
+        enum M1;
+        enum M2;
+        enum M3;
+        enum M4;
+        enum M5;
+        enum M6;
+        enum M7;
+        enum M8;
+        enum M9;
+        enum MDT_UE_LOCATION;
+      }
+      description "represents a list of MDT measurement names that are
+        subject to user consent at MDT activation.
+        Any MDT measurement, whose name is not specified in this list, is not 
+        subject to user consent at MDT activation.";
+    }
   }
   
   augment "/me3gpp:ManagedElement" {

yang-models/_3gpp-5gc-nrm-upffunction.yang

@@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-upffunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "UPFFunction derived from basic ManagedFunction.
-    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-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -41,7 +42,7 @@ module _3gpp-5gc-nrm-upffunction {
                    reference "TS 38.413 clause 9.3.3.10";
       min-elements 1;
       config false;
-      type types3gpp:Tac;
+      type types5g3gpp:NRTAC;
     }
 
     list sNSSAIList {

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-0362 ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2022-09-28 { reference CR-0191; }
   
@@ -207,10 +208,10 @@ module _3gpp-common-files {
         related to a job.
 
         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 targeted subscriptions for 'notifyFileReady'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,10 +12,16 @@ 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.111";
 
+  revision 2024-05-12 { 
+    description "The definition of the module was from TS 28.623 to TS 28.111";
+    reference CR-0008 ; 
+  } 
+  revision 2024-03-06 { reference CR-0333 ; } 
+  revision 2024-02-24 { reference CR-0346; } 
   revision 2024-01-18 {
     description "The specification of the file is moved from 28.623 to 28.532";
     reference "28.623 CR-0315"; 
@@ -92,6 +98,36 @@ module _3gpp-common-fm {
     description "The possible alarm severities";
   }
 
+  grouping AlarmCommentGrp {
+    leaf commentTime {
+      type yang:date-and-time;
+      config false;
+      mandatory true;
+      description "Date and Time the comment was created.";
+    }
+
+    leaf commentUserId {
+      type string;
+      mandatory true;
+      description "It carries the identification of the user who made the
+        comment.";
+    }
+
+    leaf commentSystemId {
+      type string;
+      mandatory true;
+      description "It carries the identification of the system (
+        Management System) from which the comment is made. That system
+        supports the user that made the comment.";
+    }
+
+    leaf commentText {
+      type string;
+      mandatory true;
+      description "It carries the textual comment.";
+    }
+  }
+
   grouping AlarmRecordGrp {
     description "Contains alarm information of an alarmed object instance.
       A new record is created in the alarm list when an alarmed object
@@ -345,6 +381,16 @@ module _3gpp-common-fm {
       yext3gpp:notNotifyable;
     }
 
+    list comments {
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      description "List of comments and data about the comments.";
+      key idx;
+      leaf idx { type uint32; }
+
+      uses AlarmCommentGrp;
+    }
+
     leaf ackTime  {
       if-feature AcknowledgeByConsumer;
       type yang:date-and-time ;
@@ -430,7 +476,7 @@ module _3gpp-common-fm {
         type types3gpp:DistinguishedName;
       }
       
-      leaf-list notificationId {
+      leaf-list notificationIds {
         type int32;
         min-elements 1;
       }
@@ -441,7 +487,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
@@ -478,6 +524,21 @@ module _3gpp-common-fm {
       yext3gpp:notNotifyable;
       uses AlarmRecordGrp;
     }
+
+    leaf-list unreliableAlarmScope {
+      type types3gpp:DistinguishedName;
+      config false;
+      yext3gpp:notNotifyable;
+      description "Identifies, the part of the alarm scope that may not be 
+        reliable.
+
+        If this parameter is equal to the instance carried in systemDN, 
+        then all AlarmRecord instances in the AlarmList may not be reliable.
+
+        If this parameter is equal to some instance represented by 
+        MonitoredEntity, then only AlarmRecord related to this instance and 
+        its descendants may not be reliable.";
+    }
   }
 
   grouping FmSubtree {
@@ -492,6 +553,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-24 { reference CR-0346; } 
   revision 2023-09-18 { reference CR-0271; } 
   revision 2023-04-26 { reference CR-0250; }
   revision 2023-02-14 { reference "CR-0234"; }
@@ -116,7 +117,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-managementdatacollection.yang

@@ -6,15 +6,13 @@ module _3gpp-common-managementdatacollection {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-yang-types {prefix types3gpp; }
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
-  //import ietf-inet-types { prefix inet; }
-  import ietf-yang-types { prefix yang; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  
   description "Handling management data collection
-    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)
@@ -26,6 +24,7 @@ module _3gpp-common-managementdatacollection {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-04-12 { reference CR-0346; } 
   revision 2023-11-18 { reference CR-0299 ; }
   revision 2023-11-06 { reference "CR-0305"; }
   revision 2023-09-18 { reference CR-0271 ; } 
@@ -168,18 +167,6 @@ module _3gpp-common-managementdatacollection {
     description "";
   }
 
-  grouping TimeWindowGrp {
-    leaf startTime {
-      type yang:date-and-time;
-      yext3gpp:inVariant;
-    }
-    leaf endTime {
-      type yang:date-and-time;
-      yext3gpp:inVariant;
-    }
-  }
-
-
   grouping ManagementDataCollectionGrp {
 
     choice managementData {
@@ -264,7 +251,7 @@ module _3gpp-common-managementdatacollection {
         max-elements 1;
         description "Collection time window for which the management data
           should be reported.";
-        uses TimeWindowGrp;
+        uses types3gpp:TimeWindowGrp;
    }
 
     list reportingCtrl {

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
       Generic Network Resource Model (NRM)
@@ -56,6 +56,8 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-05-06 { reference CR-0359; }
+  revision 2024-02-24 { reference CR-0346; } 
   revision 2023-11-18 { reference "CR-0299 CR-0305"; }
   revision 2023-09-18 { reference CR-0271; } 
   revision 2023-04-26 { reference CR-0250; }
@@ -249,7 +251,7 @@ module _3gpp-common-measurements {
 
     leaf administrativeState {
       default UNLOCKED;
-      type types3gpp:AdministrativeState ;
+      type types3gpp:BasicAdministrativeState ;
       description "Enable or disables production of the metrics";
     }
 
@@ -323,6 +325,17 @@ module _3gpp-common-measurements {
       description "Link to a 'Files' object.";
       yext3gpp:inVariant;
     }
+
+    choice conditiona-or-schedule {
+      leaf schedulerRef {
+        type types3gpp:DistinguishedName;
+        description "Pointer to a Scheduler object.";
+      }
+      leaf conditionMonitorRef {
+        type types3gpp:DistinguishedName;
+        description "Pointer to a ConditionMonitor object.";
+      }
+    }
   }
 
 
@@ -333,7 +346,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-subscription-control.yang

@@ -18,6 +18,7 @@ module _3gpp-common-subscription-control {
       Solution Set (SS) definitions
       3GPP TS 28.623";
   
+  revision 2024-05-18 { reference CR-0359 ; } 
   revision 2024-01-18 { reference "CR-0309 CR-0329" ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-10 { reference "CR0257 CR0260"; }
@@ -26,23 +27,22 @@ module _3gpp-common-subscription-control {
   revision 2020-08-26 { reference "CR-0106"; }
   revision 2019-11-29 { reference "S5-197648 S5-197647 S5-197829 S5-197828"; }
 
-  grouping NtfSubscriptionControlGrp {
-    description "Attributes of a specific notification subscription";
-    
-    leaf notificationRecipientAddress {
-      type string;
-      mandatory true;
-    }
-    
-    leaf-list notificationTypes {
-      type string;
-      description "Defines the types of notifications that are candidates 
-        for being forwarded to the notification recipient.
-        If the notificationTypes attribute is not supported or not present 
-        all candidate notifications types are forwarded to the notification; 
-        discriminated by notificationFilter attribute.";
-    }
-
+  grouping ScopeGrp {
+    description "This <<dataType>> allows to select data nodes in an object 
+      tree whose root is identified by the so called base managed object 
+      instance. The identification of the base object instance is not part of 
+      this <<dataType>> and needs to be specified by other means. The base 
+      managed object instance is typically a managed object instance in an 
+      object tree.
+      
+      The 'scopeType' and the 'scopeLevel' attributes allow to select managed 
+      object instances. Attributes, attribute fields and attribute elements 
+      cannot be selected.
+
+      The 'dataNodeSelector' attribute allows to select managed object 
+      instances, attributes, attribute fields, attribute elements, or 
+      attribute field elements. Its value contains a solution set specific 
+      expression for specifying the data nodes to be selected.";
     choice scope {
       description "Describes which object instances are selected with 
         respect to a base object instance.";
@@ -92,6 +92,32 @@ module _3gpp-common-subscription-control {
         }
       }
     }    
+  }
+  
+  grouping NtfSubscriptionControlGrp {
+    description "Attributes of a specific notification subscription";
+    
+    leaf notificationRecipientAddress {
+      type string;
+      mandatory true;
+    }
+    
+    leaf-list notificationTypes {
+      type string;
+      description "Defines the types of notifications that are candidates 
+        for being forwarded to the notification recipient.
+        If the notificationTypes attribute is not supported or not present 
+        all candidate notifications types are forwarded to the notification; 
+        discriminated by notificationFilter attribute.";
+    }
+
+    list scope {
+      description "Scopes (selects) data nodes in an object tree.";
+      key idx;
+      max-elements 8;
+      leaf idx { type string; }
+      uses ScopeGrp;
+    }
 
     leaf notificationFilter {
       type string;

yang-models/_3gpp-common-util.yang

+module _3gpp-common-util {
+  yang-version 1.1;  
+  namespace urn:3gpp:sa5:_3gpp-common-util;
+  prefix "util3gpp";
+  
+  import _3gpp-common-top { prefix top3gpp; }  
+  import _3gpp-common-yang-types { prefix types3gpp ; }
+  import _3gpp-common-managed-element { prefix me3gpp ; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp ; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
+  description "Defines Utility IOCs: ConditionMonitor, Scheduler
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623";
+
+  revision 2024-05-06 { reference CR-0359; }
+
+  feature SchedulerUnderManagedElement {
+    description "Scheduler shall be contained under ManagedElement.";
+  }  
+
+  feature SchedulerUnderSubNetwork {
+    description "Scheduler shall be contained under SubNetwork.";
+  }  
+  
+  grouping TimeIntervalGrp {
+    description "This data type defines a time interval within one day. 
+      If the whole day shall be selected, intervalStart shall be set to 
+      00:00:00 and intervalEnd shall be set to 23:59:59.";
+      
+      leaf intervalStart {
+        type types3gpp:FullTime;
+        mandatory true;
+        description "It indicates the time (in 'full-time' format) when the 
+          service shall be started.
+          Data type 'FullTime' defines the time as specified by 'full-time' 
+          in RFC3339.";
+      }
+      
+      leaf intervalEnd {
+        type types3gpp:FullTime;
+        mandatory true;
+        description "It indicates the time (in 'full-time' format) when the 
+          service shall be stopped.
+          'FullTime' defines the time as specified by 'full-time' in RFC3339.
+          intervalEnd should use the same timezone as intervalStart and shall 
+          be later then intervalStart";
+      }
+  }
+  
+  grouping SchedulingTimeGrp {
+    description "This <<choice>> defines the scheduling time and allows to 
+      configure one of four possible scheduling methods: 
+
+      - One time interval: The attribute timeWindow presents the active 
+      scheduling time. A duration more than one day may be configured.
+      - Daily periodicity: Several active intervals per day can be configured 
+      in attribute timeIntervals. The active scheduling times recur each day.
+      - Weekly periodicity: Several active intervals for one day can be 
+      configured in attribute timeIntervals. The active scheduling times recur 
+      on the days of the weeks configured by attribute daysOfWeek 
+      - Monthly periodicity: Several active intervals for one day can be 
+      configured in attribute timeIntervals. The active scheduling times 
+      recur on the days of the months configured by attribute daysOfMonth.";
+    choice SchedulingTime {
+      mandatory true;
+      case One-time-interval {
+        uses types3gpp:TimeWindowGrp;
+      }
+      case periodic {
+        list timeIntervals {
+          description "List of intervals within one day for which the service 
+            shall be active.";
+            key "intervalStart intervalEnd";
+            min-elements 1;
+          uses TimeIntervalGrp;
+        }
+        leaf daysOfWeek {
+          must 'not(../daysOfMonth)';
+          description "Shall be present in case of Weekly periodicity, 
+            otherwise not";
+          type types3gpp:DayOfWeek;
+        }
+        leaf daysOfMonth {
+          must 'not(../daysOfWeek)';
+          description "Shall be present in case of Monthly periodicity, 
+            otherwise not";
+          type types3gpp:DaysOfMonth;
+        }
+      }
+    }
+  }
+    
+  grouping SchedulerGrp {
+    description "Represents the Scheduler IOC.";
+    
+    list schedulingTimes {
+      description "It defines the active scheduling times.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses SchedulingTimeGrp;
+    }
+    
+    leaf schedulerStatus {
+      type boolean;
+      mandatory true;
+      config false;
+      description "Switches between TRUE and FALSE depending upon whether the 
+        configured time constraints are fulfilled or not.";
+    }
+  }
+  
+  grouping SchedulerSubtree {
+    list Scheduler {
+      description "This IOC defines a time scheduler. 
+        It can be name-contained by SubNetwork or ManagedElement.
+        
+        The attribute schedulingTimes allows to configure one or several 
+        active time intervals. The active intervals can be configured to occur 
+        once or recurring periodically.
+        
+        The boolean attribute schedulerStatus switches between TRUE and FALSE 
+        depending upon whether the configured time constraints are fulfilled 
+        or not. This attribute makes the internal Scheduler status observable.";
+      key id;   
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses SchedulerGrp;
+      }      
+    }
+  }
+  
+  augment /me3gpp:ManagedElement {
+    if-feature SchedulerUnderManagedElement;
+    uses SchedulerSubtree;
+  }
+  augment /subnet3gpp:SubNetwork {
+    if-feature SchedulerUnderSubNetwork;
+    uses SchedulerSubtree;
+  }
+  
+///////////////////////////////////////////////////////////////////////////////
+
+  feature ConditionMonitorUnderManagedElement {
+    description "ConditionMonitor shall be contained under ManagedElement.";
+  }  
+
+  feature ConditionMonitorUnderSubNetwork {
+    description "ConditionMonitor shall be contained under SubNetwork.";
+  }  
+
+  grouping ConditionMonitorGrp {
+    description "Represents the Scheduler IOC.";
+    
+    leaf condition {
+      type string {
+        length 1..max;
+      }
+      mandatory true;
+      description "Logical expression of one or several condition(s). 
+
+        A restricted XPath may be used. The definition of the exact syntax 
+        is not ready yet.
+
+        An empty string is not allowed.";
+    }
+    
+    leaf conditionStatus {
+      type boolean;
+      mandatory true;
+      config false;
+      description "Switches between TRUE and FALSE depending upon whether the 
+        configured constraints are fulfilled or not.";
+    }
+  }
+  
+  grouping ConditionMonitorSubtree {
+    list ConditionMonitor {
+      description "This IOC defines one or several conditions and monitors 
+        whether these conditions are satisfied. It can be name-contained by 
+        SubNetwork or ManagedElement.
+        
+        The attribute condition allows to configure one or several conditions. 
+        Possible conditions include but are not limited to scheduling 
+        requirements or parameter settings e.g. evaluation if a configuration 
+        parameter is above a certain threshold or has a certain values. 
+        
+        The boolean attribute conditionStatus switches between TRUE and FALSE 
+        depending upon whether the configured conditions are fulfilled or not. 
+        This attribute makes the internal ConditionMonitor status observable.";
+      key id;   
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ConditionMonitorGrp;
+      }      
+    }
+  }
+  
+  augment /me3gpp:ManagedElement {
+    if-feature ConditionMonitorUnderManagedElement;
+    uses ConditionMonitorSubtree;
+  }
+  augment /subnet3gpp:SubNetwork {
+    if-feature ConditionMonitorUnderSubNetwork;
+    uses ConditionMonitorSubtree;
+  }  
+}
\ No newline at end of file

yang-models/_3gpp-common-yang-extensions.yang

@@ -9,8 +9,6 @@ module _3gpp-common-yang-extensions {
   description "The module defines YANG extensions needed 
     3GPP YANG modeling.
 
-    Copyright (c) 2019 3GPP. All rights reserved.
-
     Extensions MUST be defined with the following structure in the
     description statement:
         - What is this statement.
@@ -40,7 +38,7 @@ 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.
-    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)
@@ -48,10 +46,28 @@ module _3gpp-common-yang-extensions {
       Solution Set (SS) definitions
       3GPP TS 28.623";
 
-  revision 2023-09-18 { reference CR-0271 ; } 
-  revision 2022-10-20 { reference CR-0196;   }
+  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