From 9819a92633b81c4cdb6762b59a4df0b58925d001 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Wed, 7 Aug 2024 11:11:13 +0200
Subject: [PATCH 01/85] add MeContext; the file is the same in R17,18,19

---
 yang-models/_3gpp-common-mecontext.yang | 82 +++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 yang-models/_3gpp-common-mecontext.yang

diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang
new file mode 100644
index 000000000..ed183f1a7
--- /dev/null
+++ b/yang-models/_3gpp-common-mecontext.yang
@@ -0,0 +1,82 @@
+module _3gpp-common-mecontext {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-mecontext";
+  prefix "mectx3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import ietf-yang-schema-mount { prefix yangmnt; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
+  description "Defines basic MeContext which will be augmented by other IOCs
+    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.622
+    Generic Network Resource Model (NRM)
+    Integration Reference Point (IRP);
+    Information Service (IS)";
+
+  revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; }
+
+  grouping MeContextGrp {
+    description "Represents the MeContext IOC.";
+
+    leaf dnPrefix {
+      type types3gpp:DistinguishedName;
+      description "It carries the DN Prefix information or no information.
+        The instance of MeContext is the local root instance of the MIB.
+        Otherwise the attribute shall be absent or carry no information.";
+      reference "Annex C of 32.300 ";
+    }
+  }
+
+  augment "/subnet3gpp:SubNetwork" {
+    list Mecontext {
+      description "This IOC is introduced for naming purposes. It may support
+        creation of unique DNs in scenarios when some MEs have the same RDNs due
+        to the fact that they have been manufacturer pre-configured.
+
+        If some MEs have the same RDNs (for the above mentioned reason) and they
+        are contained in the same SubNetwork instance, some measure shall be
+        taken in order to assure the global uniqueness of DNs for all IOC
+        instances under those MEs. One way could be to set different dnPrefix
+        for those NEs, but that would require either that:
+
+        a)  all LDNs or DNs are locally modified using the new dnPrefix for the
+        upper portion of the DNs, or
+        b)  a mapping (translation) of the old LDNs or DNs to the new DNs every
+        time they are used externally, e.g. in alarm notifications.
+
+        As both the two alternatives above may involve unacceptable drawbacks
+        (as the old RDNs for the MEs then would have to be changed or mapped to
+        new values), using MeContext offers a new alternative to resolve the DN
+        creation. Using MeContext as part of the naming tree (and thus the DN)
+        means that the dnPrefix, including a unique MeContext for each ME, may
+        be directly concatenated with the LDNs, without any need to change or
+        map the existing ME RDNs to new values.
+
+        MeContext have 0..N instances. It may exist even if no SubNetwork exists.
+        Every instance of MeContext contains exactly one ManagedElement during
+        steady-state operations.";
+
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MeContextGrp;
+      }
+
+      yangmnt:mount-point children-of-MeContext {
+        description "Mountpoint for ManagedElement";
+        reference "RFC8528 YANG Schema Mount";
+      }
+    }
+  }
+}
\ No newline at end of file
-- 
GitLab


From 2ecf059928f873a88a09aa9902144daf6fc4225c Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Mon, 29 Jul 2024 13:31:26 +0200
Subject: [PATCH 02/85] Update description in ConditionMonitor

---
 yang-models/_3gpp-common-util.yang | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang
index 6e58aa14f..e5892c61a 100644
--- a/yang-models/_3gpp-common-util.yang
+++ b/yang-models/_3gpp-common-util.yang
@@ -3,6 +3,7 @@ module _3gpp-common-util {
   namespace urn:3gpp:sa5:_3gpp-common-util;
   prefix "util3gpp";
   
+  import ietf-yang-types { prefix yang ; }
   import _3gpp-common-top { prefix top3gpp; }  
   import _3gpp-common-yang-types { prefix types3gpp ; }
   import _3gpp-common-managed-element { prefix me3gpp ; }
@@ -16,6 +17,7 @@ module _3gpp-common-util {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2024-07-30 { reference CR-xxxx; }
   revision 2024-05-06 { reference CR-0359; }
 
   feature SchedulerUnderManagedElement {
@@ -157,14 +159,22 @@ module _3gpp-common-util {
     description "Represents the Scheduler IOC.";
     
     leaf condition {
-      type string {
+      type yang:xpath1.0 {
         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.
+      description "A logical condition containing an XPath expression. 
+        The leaf contains an XPath 1.0 string with the following restrictions 
+        - The accessible tree is the full Network Resource Model 
+        - The root node is the list representing the top level MOI 
+        (E.g. ManagedElement)
+        - In the accessible tree, all leafs and leaf-lists with default values
+        in use exist
+        - The data tree has no concept of document order except when 'ordered-by 
+        user' is declared.
+        - The set of variable bindings is empty.
+        - The function library is the core function library defined in XPATH
+        - Namespaces should be ignored when evaluating the expression 
 
         An empty string is not allowed.";
     }
@@ -173,7 +183,8 @@ module _3gpp-common-util {
       type boolean;
       mandatory true;
       config false;
-      description "Switches between TRUE and FALSE depending upon whether the 
+      description "The boolean result of the condition.
+        Switches between TRUE and FALSE depending upon whether the 
         configured constraints are fulfilled or not.";
     }
   }
-- 
GitLab


From c29625d33d5cb12d70ded574cf4a4cd5e2922aee Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Thu, 8 Aug 2024 18:42:55 +0200
Subject: [PATCH 03/85] Update revision statement

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

diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang
index e5892c61a..389f5db6e 100644
--- a/yang-models/_3gpp-common-util.yang
+++ b/yang-models/_3gpp-common-util.yang
@@ -17,7 +17,7 @@ module _3gpp-common-util {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
-  revision 2024-07-30 { reference CR-xxxx; }
+  revision 2024-07-30 { reference "CR-0392 CR-0393"; }
   revision 2024-05-06 { reference CR-0359; }
 
   feature SchedulerUnderManagedElement {
-- 
GitLab


From 0bb025208714211266b8c653896697a8ff6d4e3f Mon Sep 17 00:00:00 2001
From: Zu Qiang <zu.qiang@ericsson.com>
Date: Mon, 8 Jul 2024 16:00:29 +0000
Subject: [PATCH 04/85] Update UE core level measurement

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index af5327945..d245ae25f 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -25,6 +25,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2024-08-05 { reference "CR-xxxx"; }
   revision 2024-05-12 { reference "CR-0401"; }
   revision 2024-05-06 { reference CR-0359; }
   revision 2024-04-06 { reference "CR-0342"; }
@@ -1521,20 +1522,20 @@ module _3gpp-common-trace {
     }    
   }
 
-  grouping UEMeasConfigGrp {
-    description "Represents the UEMeasConfig dataType.
+  grouping UECoreMeasConfigGrp {
+    description "Represents the UECoreMeasConfig dataType.
       This <<dataType>> defines the aconfiguration parameters of IOC TraceJob
-        which are specific for UE level measurements collection.";
+        which are specific for 5GC UE level measurements collection.";
     
-    leaf-list ueMeasurements {
+    leaf-list ueCoreMeasurements {
       type string;
-      description "It specifies the List of UE level measurements.";
+      description "It specifies the List of 5GC UE level measurements.";
     }
 
-    leaf ueMeasGranularityPeriod {
+    leaf ueCoreMeasGranularityPeriod {
       type uint32;
-      description "It specifies the Granularity period used to produce UE level 
-        measurements. The period is defined in milliseconds (ms).";
+      description "It specifies the Granularity period used to produce 5GC UE 
+        level measurements. The period is defined in milliseconds (ms).";
     }
 
     leaf nfTypeToMeasure {
@@ -1752,7 +1753,7 @@ module _3gpp-common-trace {
       leaf idx { type string; }    
     }
 
-    list ueMeasConfig { 
+    list ueCoreMeasConfig { 
       when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"'
          + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"'
          + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
@@ -1761,7 +1762,7 @@ module _3gpp-common-trace {
       key idx;
       description "5GC UE level measurements config";
       max-elements 1;       
-      uses UEMeasConfigGrp;
+      uses UECoreMeasConfigGrp;
       leaf idx { type string; }    
     }
    
@@ -1839,10 +1840,10 @@ module _3gpp-common-trace {
         only, RCEF reports only and Logged MBSFN MDT, the configuration 
         parameters of attribute mdtConfig or a subset of these shall be 
         applied. In case of UE measurements only, the configuration parameters 
-        of attribute ueMeasConfig shall be applied. In case of any combination 
+        of attribute ueCoreMeasConfig shall be applied. In case of any combination 
         of Trace, Immediate MDT, Trace and UE measurements, the configuration
         parameters of the corresponding attributes traceConfig, mdtConfig and 
-        ueMeasConfig are applicable. 
+        ueCoreMeasConfig are applicable. 
 
         Creation and deletion of TraceJob instances by MnS consumers is 
         optional; when not supported, the TraceJob instances may be created 
-- 
GitLab


From bb442ccfbab1dce5cfd264316052548adb80070e Mon Sep 17 00:00:00 2001
From: Zu Qiang <zu.qiang@ericsson.com>
Date: Mon, 8 Jul 2024 16:10:34 +0000
Subject: [PATCH 05/85] Update file _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index d245ae25f..16ef43cee 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1835,15 +1835,15 @@ module _3gpp-common-trace {
         when several PLMNs are supported in the RAN.
 
         The attribute jobType specifies the kind of data to collect. In case of
-        Trace only, the configuration parameters of attribute traceConfig shall 
-        be applied. In case of Immediate MDT only, Logged MDT only, RLF reports 
+        Trace only, the configuration parameters of attribute traceConfig shall
+        be applied. In case of Immediate MDT only, Logged MDT only, RLF reports
         only, RCEF reports only and Logged MBSFN MDT, the configuration 
         parameters of attribute mdtConfig or a subset of these shall be 
-        applied. In case of UE measurements only, the configuration parameters 
-        of attribute ueCoreMeasConfig shall be applied. In case of any combination 
-        of Trace, Immediate MDT, Trace and UE measurements, the configuration
-        parameters of the corresponding attributes traceConfig, mdtConfig and 
-        ueCoreMeasConfig are applicable. 
+        applied. In case of UE measurements only, the configuration parameters
+        of attribute ueCoreMeasConfig shall be applied. In case of any
+        combination of Trace, Immediate MDT, Trace and UE measurements, the
+        configuration parameters of the corresponding attributes traceConfig,
+        mdtConfig and ueCoreMeasConfig are applicable. 
 
         Creation and deletion of TraceJob instances by MnS consumers is 
         optional; when not supported, the TraceJob instances may be created 
-- 
GitLab


From 10d26571de7174394c47f84be387007369a9d0c3 Mon Sep 17 00:00:00 2001
From: Zu Qiang <zu.qiang@ericsson.com>
Date: Mon, 5 Aug 2024 14:43:52 +0000
Subject: [PATCH 06/85] CR0376

---
 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 16ef43cee..bd011b17f 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 2024-08-05 { reference "CR-xxxx"; }
+  revision 2024-08-05 { reference "CR-0376"; }
   revision 2024-05-12 { reference "CR-0401"; }
   revision 2024-05-06 { reference CR-0359; }
   revision 2024-04-06 { reference "CR-0342"; }
-- 
GitLab


From a4503acb66643680c281318cdb7f71455592b5c8 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Mon, 16 Sep 2024 19:37:41 +0200
Subject: [PATCH 07/85] Local rebase and commit of MR1225 Rel18 28.623 CR 0378
 correction on mdt configuration in mrdc

---
 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 bd011b17f..bdc0528d9 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 2024-08-05 { reference "CR-0376"; }
+  revision 2024-08-06 { reference "CR-0376 CR-0378"; }
   revision 2024-05-12 { reference "CR-0401"; }
   revision 2024-05-06 { reference CR-0359; }
   revision 2024-04-06 { reference "CR-0342"; }
@@ -1520,6 +1520,15 @@ module _3gpp-common-trace {
       leaf idx { type string; }
       uses LoggedMdtConfigGrp;
     }    
+
+    leaf mNOnly {
+      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 
+        both MN and SN. The value TRUE means the MDT configuration is  
+        for MN only.";
+    }   
   }
 
   grouping UECoreMeasConfigGrp {
-- 
GitLab


From dccee35e8839ce8ed7c2019f25be6dfcf730ef0b Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Mon, 16 Sep 2024 19:46:00 +0200
Subject: [PATCH 08/85] Local rebase and commit of MR1279
 Rel18_CR0420_TS_28.623_Correction_to_AreaScope_stage3

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index bdc0528d9..bf194a6ea 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 2024-08-06 { reference "CR-0376 CR-0378"; }
+  revision 2024-08-06 { reference "CR-0376 CR-0378 CR-0420"; }
   revision 2024-05-12 { reference "CR-0401"; }
   revision 2024-05-06 { reference CR-0359; }
   revision 2024-04-06 { reference "CR-0342"; }
@@ -106,20 +106,9 @@ module _3gpp-common-trace {
   
   grouping AreaScopeGrp {
     description "Represents the AreaScope dataType.
-      This <<dataType>> defines the area scope of MDT.
-      The Area Scope parameter in LTE and NR is either:
-      - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. 
-      Maximum 32 CGI can be defined.
-      - list of Tracking Area, identified by TAC. 
-      Maximum of 8 TAC can be defined. 
-      - list of Tracking Area Identity, identified by TAC with 
-      associated plmn-Identity perTAC-List containing the 
-      PLMN identity for each TAC. Maximum of 8 TAI can be defined.
-      The Area Scope parameter in NR can also contain:
-      - list of NPN-IDs in NR. It is either a list of PNI-NPNs 
-      identified by CAG ID with associated plmn-Identity or a  
-      list of SNPNs identified by Network ID with associated 
-      plmn-Identity .";    
+      This <<dataType>> defines the area scope of MDT and QoE.
+      The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422.
+      The Area Scope for QoE is specified in clause 5.4 of TS 28.405";    
 
     choice AreaScopeChoice {
       leaf-list eutraCellIdList {
@@ -129,11 +118,11 @@ module _3gpp-common-trace {
         description "List of E-UTRAN cells identified by E-UTRAN-CGI";
       }
       
-      leaf-list utraCellIdList {
+      leaf-list nrCellIdList {
         type string;
         min-elements 1;
         max-elements 32;
-        description "List of UTRAN cells identified by UTRAN CGI";
+        description "List of NR cells identified by NG-RAN CGI";
       }
       
       leaf-list tacList {
-- 
GitLab


From ce5d5eb2510894ab9ca528c9611fb4f0029a491d Mon Sep 17 00:00:00 2001
From: qiwen <qiw@chinatelecom.cn>
Date: Fri, 9 Aug 2024 13:40:55 +0000
Subject: [PATCH 09/85] Update file
 _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang

---
 ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
index b649d0bb0..d1672c707 100755
--- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
@@ -126,6 +126,28 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
         delay for GTP-U path QoS monitoring.";
       type uint32;
     }
+    
+    list qFMonitoredSatelliteBackhaulCategories {
+      description "The satellite backhaul categories for which the QoS monitoring
+       per QoS flow per UE is to be performed.";
+      key satellitebackhaulcat;
+
+      leaf satellitebackhaulcat{
+        description "Specifies the satellite backhaul.";
+        reference "3GPP TS 23.501";
+        type enumeration {
+        enum GEO;
+        enum MEO;
+        enum LEO;
+        enum OTHER_SAT;
+        enum DYNAMIC_GEO;
+        enum DYNAMIC_MEO;
+        enum DYNAMIC_LEO;
+        enum DYNAMIC_OTHER_SAT;
+        enum NON_SATELLITE;
+        }
+      }
+    }
   }    
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
-- 
GitLab


From ab8899d4d6b4827440e03839d4ea83b22d1e683b Mon Sep 17 00:00:00 2001
From: qiwen <qiw@chinatelecom.cn>
Date: Fri, 9 Aug 2024 16:50:21 +0000
Subject: [PATCH 10/85] Update 2 files

- /yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
- /yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
---
 ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 23 -------------------
 .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 23 +++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
index d1672c707..de4714662 100755
--- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
@@ -126,29 +126,6 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
         delay for GTP-U path QoS monitoring.";
       type uint32;
     }
-    
-    list qFMonitoredSatelliteBackhaulCategories {
-      description "The satellite backhaul categories for which the QoS monitoring
-       per QoS flow per UE is to be performed.";
-      key satellitebackhaulcat;
-
-      leaf satellitebackhaulcat{
-        description "Specifies the satellite backhaul.";
-        reference "3GPP TS 23.501";
-        type enumeration {
-        enum GEO;
-        enum MEO;
-        enum LEO;
-        enum OTHER_SAT;
-        enum DYNAMIC_GEO;
-        enum DYNAMIC_MEO;
-        enum DYNAMIC_LEO;
-        enum DYNAMIC_OTHER_SAT;
-        enum NON_SATELLITE;
-        }
-      }
-    }
-  }    
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
 
diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
index 3294c01f8..0fce7d456 100755
--- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
@@ -122,6 +122,29 @@ in 3GPP TS 23.501.
         packet delay for QoS monitoring per QoS flow per UE.";
       type uint32;
     }
+    
+    list qFMonitoredSatelliteBackhaulCategories {
+      description "The satellite backhaul categories for which the QoS monitoring
+       per QoS flow per UE is to be performed.";
+      key satellitebackhaulcat;
+
+      leaf satellitebackhaulcat{
+        description "Specifies the satellite backhaul.";
+        reference "3GPP TS 23.501";
+        type enumeration {
+        enum GEO;
+        enum MEO;
+        enum LEO;
+        enum OTHER_SAT;
+        enum DYNAMIC_GEO;
+        enum DYNAMIC_MEO;
+        enum DYNAMIC_LEO;
+        enum DYNAMIC_OTHER_SAT;
+        enum NON_SATELLITE;
+        }
+      }
+    }
+  }    
   }    
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
-- 
GitLab


From 5447a79f584df10d899777553591b4c4e0a7a999 Mon Sep 17 00:00:00 2001
From: qiwen <qiw@chinatelecom.cn>
Date: Fri, 9 Aug 2024 16:51:28 +0000
Subject: [PATCH 11/85] Update file
 _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang

---
 yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
index de4714662..58ece735b 100755
--- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
@@ -126,6 +126,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
         delay for GTP-U path QoS monitoring.";
       type uint32;
     }
+  }
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
 
-- 
GitLab


From 95a750458c4ed50e7408ee44372929267b492afe Mon Sep 17 00:00:00 2001
From: qiwen <qiw@chinatelecom.cn>
Date: Fri, 9 Aug 2024 16:55:21 +0000
Subject: [PATCH 12/85] Update 2 files

- /yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
- /yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
---
 yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 -
 yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
index 58ece735b..de4714662 100755
--- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
@@ -126,7 +126,6 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
         delay for GTP-U path QoS monitoring.";
       type uint32;
     }
-  }
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
 
diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
index 0fce7d456..002cdede3 100755
--- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
@@ -145,7 +145,7 @@ in 3GPP TS 23.501.
       }
     }
   }    
-  }    
+      
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
 
-- 
GitLab


From 6eb830984b8f9bf06d45b6a4359716793f17c283 Mon Sep 17 00:00:00 2001
From: qiwen <qiw@chinatelecom.cn>
Date: Fri, 9 Aug 2024 16:58:13 +0000
Subject: [PATCH 13/85] Update file
 _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang

---
 yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
index de4714662..58ece735b 100755
--- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
@@ -126,6 +126,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
         delay for GTP-U path QoS monitoring.";
       type uint32;
     }
+  }
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
 
-- 
GitLab


From eb3d0044901defe5fc6f1f334a56c58c1ee5698b Mon Sep 17 00:00:00 2001
From: qiwen <qiw@chinatelecom.cn>
Date: Wed, 21 Aug 2024 11:22:35 +0000
Subject: [PATCH 14/85] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang

---
 yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
index 002cdede3..a4724bf4e 100755
--- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
@@ -124,23 +124,18 @@ in 3GPP TS 23.501.
     }
     
     list qFMonitoredSatelliteBackhaulCategories {
-      description "The satellite backhaul categories for which the QoS monitoring
-       per QoS flow per UE is to be performed.";
+      description "The satellite backhaul categories for which the QoS 
+      monitoring per QoS flow per UE is to be performed.";
       key satellitebackhaulcat;
 
       leaf satellitebackhaulcat{
         description "Specifies the satellite backhaul.";
         reference "3GPP TS 23.501";
         type enumeration {
-        enum GEO;
-        enum MEO;
-        enum LEO;
-        enum OTHER_SAT;
         enum DYNAMIC_GEO;
         enum DYNAMIC_MEO;
         enum DYNAMIC_LEO;
         enum DYNAMIC_OTHER_SAT;
-        enum NON_SATELLITE;
         }
       }
     }
-- 
GitLab


From 9341b03751b4dad6fe62a0fb9e082e9583e85342 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 19:46:44 +0000
Subject: [PATCH 15/85] Add new file

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 95 ++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 yang-models/_3gpp-nr-nrm-ecimappingrule.yang

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
new file mode 100644
index 000000000..cd7c67765
--- /dev/null
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -0,0 +1,95 @@
+module _3gpp-5gc-nrm-ecimappingrule {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule;
+  prefix ecimapping3gpp;
+  
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-externalgnbcucpfunction {prefix gnbcucp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the unified mapping rule input to support
+    Energy Cost Index Mapping when Energy Cost Reporting.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2024-08-12 { reference CR-1336 ; } 
+  
+  grouping ECIMappingRuleInput {
+    description 
+    "Input to the unified mapping rule to support ECI.";
+    reference "3GPP TS 28.541";
+  
+    leaf eciMRInputMinimumValue {
+      type uint8;
+      description "The minimum value of to be applied 
+      for mapping from this attribute to the energy cost.";
+    }
+    
+    leaf eciMRInputMaximumValue {
+      type uint8;
+      description "The maximum value of to be applied 
+      for mapping from this attribute to the energy cost.";  
+    }
+
+    leaf eciTimeInterval {
+      type uint8;
+      description "Time interval (in seconds) that 
+      should be applied for collecting values of mapping 
+      rule attribute to be used for computing the energy cost.";
+    }
+  }
+
+  grouping NGRANECIMappingRuleGrp {
+    description "Represents the NGRANECIMappingRule IOC.";
+    list dynamic5QIs {
+      description "This IOC represents a unified mapping rule.";
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses ECIMappingRuleInput;
+      }
+    }
+  }    
+
+  grouping NGRANECIMappingRuleSetGrp {
+    description "Represents the NGRANECIMappingRuleSet IOC.";
+    list dynamic5QIs {
+      description "This IOC represents a group of mapping rules.";
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses NGRANECIMappingRuleGrp;
+      }
+    }
+  }    
+
+  grouping NGRANECIMappingRuleSetSubtree {
+    description "Helps augmenting NGRANECIMappingRuleSet into multiple places.";
+    list NGRANECIMappingRuleSet {
+      description "Specifies the ECI mapping rules, see 3GPP TS 28.541.";
+      key "id";
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NGRANECIMappingRuleSetGrp;
+      }
+      uses NGRANECIMappingRuleGrp;
+    }  
+  }
+  
+  augment "/subnet3gpp:SubNetwork" {
+    uses NGRANECIMappingRuleSetSubtree;
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    uses NGRANECIMappingRuleSetSubtree;
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    uses gnbcucp3gpp:NGRANECIMappingRuleSetSubtree;
+  }
+
+}
-- 
GitLab


From ab2c4cb44a8070d00e853cc81850ea97f4e5a1c9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 19:52:01 +0000
Subject: [PATCH 16/85] Update _3gpp-nr-nrm-externalgnbcuupfunction.yang

---
 yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
index 2445a1e99..b770fe84b 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
@@ -7,6 +7,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; }
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalGNBCUUPFunction
@@ -16,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-12 { reference CR-1336 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -41,6 +43,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
       mandatory true;
       type int32 { range "22..32"; }
     }
+    
+    leaf nGRANECIMappingRuleRef {
+      description "DN of ECIMappingRuleSet.";
+      type types3gpp:DistinguishedName;
+    }
+
   }
 
   grouping ExternalGNBCUUPFunctionWrapper {
@@ -66,4 +74,4 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     if-feature nrnet3gpp:ExternalsUnderNRNetwork;
     uses ExternalGNBCUUPFunctionWrapper;
   }	
-}
\ No newline at end of file
+}
-- 
GitLab


From f6fef8110f4abe0c5f5d3a16bf9ba0734ee4555e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 19:54:17 +0000
Subject: [PATCH 17/85] Update _3gpp-nr-nrm-gnbcucpfunction.yang

---
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 7d8eabeec..a8213313a 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-12 { reference CR-1336 ; } 
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2024-04-04 { reference CR-1139; }
   revision 2024-02-24 { reference CR-1218; } 
@@ -180,6 +181,11 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       type types3gpp:DistinguishedName;
       description "This is the DN of EphemerisInfoSet.";
     }
+
+    leaf nGRANECIMappingRuleRef {
+      type types3gpp:DistinguishedName;
+      description "This is the DN of ECIMappingRuleSet.";
+    }
   }
 
   grouping QceIdMappingInfoGrp {
@@ -223,4 +229,4 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       }
     }
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From 6f49b9673fa27504054e11f018e113c380179057 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 19:56:38 +0000
Subject: [PATCH 18/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index cd7c67765..c78b0e45d 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -1,4 +1,4 @@
-module _3gpp-5gc-nrm-ecimappingrule {
+module _3gpp-nr-nrm-ecimappingrule {
   yang-version 1.1;
   namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule;
   prefix ecimapping3gpp;
@@ -89,7 +89,7 @@ module _3gpp-5gc-nrm-ecimappingrule {
   }
 
   augment "/me3gpp:ManagedElement" {
-    uses gnbcucp3gpp:NGRANECIMappingRuleSetSubtree;
+    uses NGRANECIMappingRuleSetSubtree;
   }
 
 }
-- 
GitLab


From 1cb8c3a2322523946a92df1fffbb6612fdea92d9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 19:59:35 +0000
Subject: [PATCH 19/85] Update _3gpp-nr-nrm-externalgnbcuupfunction.yang

---
 yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
index b770fe84b..56a5fbe8b 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
@@ -7,7 +7,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; }
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalGNBCUUPFunction
@@ -17,7 +16,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
-  revision 2024-08-12 { reference CR-1336 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -43,12 +41,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
       mandatory true;
       type int32 { range "22..32"; }
     }
-    
-    leaf nGRANECIMappingRuleRef {
-      description "DN of ECIMappingRuleSet.";
-      type types3gpp:DistinguishedName;
-    }
-
   }
 
   grouping ExternalGNBCUUPFunctionWrapper {
-- 
GitLab


From 1ad3cd6eaf4fd6f7a2905afa59a8a9cdc3b8f803 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:00:29 +0000
Subject: [PATCH 20/85] Update _3gpp-nr-nrm-externalgnbcucpfunction.yang

---
 yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
index cbe2baff3..f1b1e9ad3 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
@@ -17,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-12 { reference CR-1336; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -51,6 +52,11 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
       max-elements 1;
       uses types3gpp:PLMNId;
     }
+    
+    leaf nGRANECIMappingRuleRef {
+      description "DN of ECIMappingRuleSet.";
+      type types3gpp:DistinguishedName;
+    }
   }
 
   grouping ExternalGNBCUCPFunctionWrapper {
@@ -76,4 +82,4 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
     if-feature nrnet3gpp:ExternalsUnderNRNetwork;
     uses ExternalGNBCUCPFunctionWrapper;
   }		
-}
\ No newline at end of file
+}
-- 
GitLab


From 67f99d0daeb67a5c33872e9d78a58ff393fddb92 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:04:08 +0000
Subject: [PATCH 21/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index c78b0e45d..e4c599de5 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -1,6 +1,6 @@
 module _3gpp-nr-nrm-ecimappingrule {
   yang-version 1.1;
-  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule;
+  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule;
   prefix ecimapping3gpp;
   
   import _3gpp-common-top { prefix top3gpp; }
@@ -89,7 +89,7 @@ module _3gpp-nr-nrm-ecimappingrule {
   }
 
   augment "/me3gpp:ManagedElement" {
-    uses NGRANECIMappingRuleSetSubtree;
+    uses gnbcucp3gpp:ExternalGNBCUCPFunctionGrp;
   }
 
 }
-- 
GitLab


From a9ceba647e2aaa7985adf934a2a638237f00bbc8 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:09:32 +0000
Subject: [PATCH 22/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index e4c599de5..bc1df61c1 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -1,6 +1,6 @@
 module _3gpp-nr-nrm-ecimappingrule {
   yang-version 1.1;
-  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule;
+  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimaprule;
   prefix ecimapping3gpp;
   
   import _3gpp-common-top { prefix top3gpp; }
-- 
GitLab


From dda521b3e518616c7cfed05be7fec67e92176479 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:15:13 +0000
Subject: [PATCH 23/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index bc1df61c1..08861e60b 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -1,7 +1,7 @@
 module _3gpp-nr-nrm-ecimappingrule {
   yang-version 1.1;
-  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimaprule;
-  prefix ecimapping3gpp;
+  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule;
+  prefix ecimap3gpp;
   
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
-- 
GitLab


From ca48d746b0b57797861f342d14ce33dc6c32a5ff Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:19:51 +0000
Subject: [PATCH 24/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index 08861e60b..9648185a1 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -88,8 +88,4 @@ module _3gpp-nr-nrm-ecimappingrule {
     uses NGRANECIMappingRuleSetSubtree;
   }
 
-  augment "/me3gpp:ManagedElement" {
-    uses gnbcucp3gpp:ExternalGNBCUCPFunctionGrp;
-  }
-
 }
-- 
GitLab


From 3f29eba1ae0572864543d332e27ee06e568cfd77 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:38:13 +0000
Subject: [PATCH 25/85] Update _3gpp-common-managed-element.yang

---
 yang-models/_3gpp-common-managed-element.yang | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index 233aa6f4a..ab421ebe0 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -33,6 +33,7 @@ module _3gpp-common-managed-element {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
       
+  revision 2024-08-12 { reference CR-1336 ; }
   revision 2024-01-30 { reference CR-0328 ; } 
   revision 2023-11-14 { reference CR-0305 ; }
   revision 2023-09-18 { reference CR-0271 ; } 
@@ -182,6 +183,10 @@ module _3gpp-common-managed-element {
       min-elements 1;
       type string;
     }    
+    leaf nGRANECIMappingRuleRef {
+      description "DN of ECIMappingRuleSet.";
+      type types3gpp:DistinguishedName;
+    }
   }
   
   grouping ManagedElementGrp {
-- 
GitLab


From c2e5f83e057baebfc5ad779bf1773da48e07d2aa Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:46:58 +0000
Subject: [PATCH 26/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index 9648185a1..b939ab27d 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -6,7 +6,7 @@ module _3gpp-nr-nrm-ecimappingrule {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
-  import _3gpp-nr-nrm-externalgnbcucpfunction {prefix gnbcucp3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; }
 
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -88,4 +88,8 @@ module _3gpp-nr-nrm-ecimappingrule {
     uses NGRANECIMappingRuleSetSubtree;
   }
 
+  augment "/me3gpp:GNBCUCPFunction" {
+    uses gnbcucp3gpp:;
+  }
+
 }
-- 
GitLab


From 7da9129908f66b16a6d701712dcdc7bd11c46101 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:51:09 +0000
Subject: [PATCH 27/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index b939ab27d..99338e187 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -88,8 +88,8 @@ module _3gpp-nr-nrm-ecimappingrule {
     uses NGRANECIMappingRuleSetSubtree;
   }
 
-  augment "/me3gpp:GNBCUCPFunction" {
-    uses gnbcucp3gpp:;
+  augment "/gnbcucp3gpp:GNBCUCPFunction" {
+    uses NGRANECIMappingRuleSetSubtree:;
   }
 
 }
-- 
GitLab


From 8f4b4f986760b357c18ba16b4438052bf5102a77 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 20:55:27 +0000
Subject: [PATCH 28/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index 99338e187..e0e948ee0 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -88,7 +88,7 @@ module _3gpp-nr-nrm-ecimappingrule {
     uses NGRANECIMappingRuleSetSubtree;
   }
 
-  augment "/gnbcucp3gpp:GNBCUCPFunction" {
+  augment "/gnbcucp3gpp:GNBCUCPFunctionGrp" {
     uses NGRANECIMappingRuleSetSubtree:;
   }
 
-- 
GitLab


From 979fbd2b0fc674a12659a3ecabb39323e27ac544 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 21:00:23 +0000
Subject: [PATCH 29/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index e0e948ee0..99338e187 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -88,7 +88,7 @@ module _3gpp-nr-nrm-ecimappingrule {
     uses NGRANECIMappingRuleSetSubtree;
   }
 
-  augment "/gnbcucp3gpp:GNBCUCPFunctionGrp" {
+  augment "/gnbcucp3gpp:GNBCUCPFunction" {
     uses NGRANECIMappingRuleSetSubtree:;
   }
 
-- 
GitLab


From a3f790c565e02b73eec1d919f5e00321f6ad756f Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 14 Aug 2024 21:03:25 +0000
Subject: [PATCH 30/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index 99338e187..2b18ecc51 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -88,8 +88,4 @@ module _3gpp-nr-nrm-ecimappingrule {
     uses NGRANECIMappingRuleSetSubtree;
   }
 
-  augment "/gnbcucp3gpp:GNBCUCPFunction" {
-    uses NGRANECIMappingRuleSetSubtree:;
-  }
-
 }
-- 
GitLab


From 72f9fd025c1edca70b26bb36e7e5338a55873651 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 15:32:32 +0000
Subject: [PATCH 31/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 52 ++++++++------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index 2b18ecc51..2c9e67c3b 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -1,7 +1,7 @@
-module _3gpp-nr-nrm-ecimappingrule {
+module _3gpp-nr-nrm-ecmappingrule {
   yang-version 1.1;
-  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule;
-  prefix ecimap3gpp;
+  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule;
+  prefix ecmap3gpp;
   
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
@@ -18,24 +18,23 @@ module _3gpp-nr-nrm-ecimappingrule {
 
   revision 2024-08-12 { reference CR-1336 ; } 
   
-  grouping ECIMappingRuleInput {
+  grouping ecMappingRuleInput {
     description 
-    "Input to the unified mapping rule to support ECI.";
-    reference "3GPP TS 28.541";
+    "Input to the unified mapping rule to support energy cost reporting.";
   
-    leaf eciMRInputMinimumValue {
+    leaf ecMRInputMinimumValue {
       type uint8;
       description "The minimum value of to be applied 
       for mapping from this attribute to the energy cost.";
     }
     
-    leaf eciMRInputMaximumValue {
+    leaf ecMRInputMaximumValue {
       type uint8;
       description "The maximum value of to be applied 
       for mapping from this attribute to the energy cost.";  
     }
 
-    leaf eciTimeInterval {
+    leaf ecTimeInterval {
       type uint8;
       description "Time interval (in seconds) that 
       should be applied for collecting values of mapping 
@@ -43,49 +42,38 @@ module _3gpp-nr-nrm-ecimappingrule {
     }
   }
 
-  grouping NGRANECIMappingRuleGrp {
-    description "Represents the NGRANECIMappingRule IOC.";
-    list dynamic5QIs {
+  grouping NGRANECMappingRuleGrp {
+    description "Represents the NGRANECMappingRule IOC.";
+    list rules {
       description "This IOC represents a unified mapping rule.";
     key id;
     uses top3gpp:Top_Grp;
     container attributes {
-      uses ECIMappingRuleInput;
+      uses ECMappingRuleInput;
       }
     }
   }    
-
-  grouping NGRANECIMappingRuleSetGrp {
-    description "Represents the NGRANECIMappingRuleSet IOC.";
-    list dynamic5QIs {
-      description "This IOC represents a group of mapping rules.";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses NGRANECIMappingRuleGrp;
-      }
-    }
   }    
 
-  grouping NGRANECIMappingRuleSetSubtree {
-    description "Helps augmenting NGRANECIMappingRuleSet into multiple places.";
-    list NGRANECIMappingRuleSet {
-      description "Specifies the ECI mapping rules, see 3GPP TS 28.541.";
+  grouping NGRANECMappingRuleSubtree {
+    description "Helps augmenting NGRANECMappingRule into multiple places.";
+    list NGRANECMappingRule {
+      description "Specifies the energy cost mapping rules.";
       key "id";
       uses top3gpp:Top_Grp;
       container attributes {
-        uses NGRANECIMappingRuleSetGrp;
+        uses NGRANECMappingRuleGrp;
       }
-      uses NGRANECIMappingRuleGrp;
+      uses NGRANECMappingRuleGrp;
     }  
   }
   
   augment "/subnet3gpp:SubNetwork" {
-    uses NGRANECIMappingRuleSetSubtree;
+    uses NGRANECMappingRuleSubtree;
   }
 
   augment "/me3gpp:ManagedElement" {
-    uses NGRANECIMappingRuleSetSubtree;
+    uses NGRANECMappingRuleSubtree;
   }
 
 }
-- 
GitLab


From 03bee1eb40f8f046e6874415e202904a23f4f819 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 15:38:01 +0000
Subject: [PATCH 32/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index 2c9e67c3b..62394428f 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -18,23 +18,23 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   revision 2024-08-12 { reference CR-1336 ; } 
   
-  grouping ecMappingRuleInput {
+  grouping ECMappingRuleInput {
     description 
     "Input to the unified mapping rule to support energy cost reporting.";
   
-    leaf ecMRInputMinimumValue {
+    leaf eCMRInputMinValue {
       type uint8;
       description "The minimum value of to be applied 
       for mapping from this attribute to the energy cost.";
     }
     
-    leaf ecMRInputMaximumValue {
+    leaf eCMRInputMaxValue {
       type uint8;
       description "The maximum value of to be applied 
       for mapping from this attribute to the energy cost.";  
     }
 
-    leaf ecTimeInterval {
+    leaf eCTimeInterval {
       type uint8;
       description "Time interval (in seconds) that 
       should be applied for collecting values of mapping 
-- 
GitLab


From 3b4bb3c79d6ddc7e17d8577dc6bfde516520afaf Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 15:38:49 +0000
Subject: [PATCH 33/85] Update _3gpp-nr-nrm-externalgnbcucpfunction.yang

---
 yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
index f1b1e9ad3..6c295a404 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
@@ -17,7 +17,6 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
-  revision 2024-08-12 { reference CR-1336; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -52,11 +51,6 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
       max-elements 1;
       uses types3gpp:PLMNId;
     }
-    
-    leaf nGRANECIMappingRuleRef {
-      description "DN of ECIMappingRuleSet.";
-      type types3gpp:DistinguishedName;
-    }
   }
 
   grouping ExternalGNBCUCPFunctionWrapper {
-- 
GitLab


From 8ea0c9923ecf24a4819d1face16003ec993caed5 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 15:52:38 +0000
Subject: [PATCH 34/85] Update _3gpp-nr-nrm-gnbcucpfunction.yang

---
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index a8213313a..7b168c437 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -182,9 +182,9 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       description "This is the DN of EphemerisInfoSet.";
     }
 
-    leaf nGRANECIMappingRuleRef {
+    leaf nRECMappingRuleRef {
       type types3gpp:DistinguishedName;
-      description "This is the DN of ECIMappingRuleSet.";
+      description "DN of a NRECMappingRule.";
     }
   }
 
-- 
GitLab


From f9f1c59b9384677307455c0699e04c26d6278ca8 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 15:57:40 +0000
Subject: [PATCH 35/85] Update _3gpp-common-managed-element.yang

---
 yang-models/_3gpp-common-managed-element.yang | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index ab421ebe0..570791a14 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -143,6 +143,7 @@ module _3gpp-common-managed-element {
       type string;
     }
     
+    
     leaf locationName {
       description "The physical location (e.g. an address) of an entity 
         represented by a (derivative of) ManagedElement_. It may contain no 
@@ -183,10 +184,12 @@ module _3gpp-common-managed-element {
       min-elements 1;
       type string;
     }    
-    leaf nGRANECIMappingRuleRef {
-      description "DN of ECIMappingRuleSet.";
+    
+    leaf nRECMappingRuleRef {
       type types3gpp:DistinguishedName;
+      description "DN of a NRECMappingRule.";
     }
+
   }
   
   grouping ManagedElementGrp {
-- 
GitLab


From cbc54b1aa55681104be4b9b9f0798003afb48702 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 16:02:17 +0000
Subject: [PATCH 36/85] Update _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
index 62394428f..fea406f9a 100644
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
@@ -52,8 +52,7 @@ module _3gpp-nr-nrm-ecmappingrule {
       uses ECMappingRuleInput;
       }
     }
-  }    
-  }    
+  }
 
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
-- 
GitLab


From 12199001d311bd3cad96a356b64bfb6a5abae38c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 16:07:31 +0000
Subject: [PATCH 37/85] Add new file

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 yang-models/_3gpp-nr-nrm-ecmappingrule.yang

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -0,0 +1 @@
+
-- 
GitLab


From 11a62a59b69e080730c81f29799f89714c0d1ee2 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 16:08:33 +0000
Subject: [PATCH 38/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 77 +++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 8b1378917..fea406f9a 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -1 +1,78 @@
+module _3gpp-nr-nrm-ecmappingrule {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule;
+  prefix ecmap3gpp;
+  
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; }
 
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the unified mapping rule input to support
+    Energy Cost Index Mapping when Energy Cost Reporting.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2024-08-12 { reference CR-1336 ; } 
+  
+  grouping ECMappingRuleInput {
+    description 
+    "Input to the unified mapping rule to support energy cost reporting.";
+  
+    leaf eCMRInputMinValue {
+      type uint8;
+      description "The minimum value of to be applied 
+      for mapping from this attribute to the energy cost.";
+    }
+    
+    leaf eCMRInputMaxValue {
+      type uint8;
+      description "The maximum value of to be applied 
+      for mapping from this attribute to the energy cost.";  
+    }
+
+    leaf eCTimeInterval {
+      type uint8;
+      description "Time interval (in seconds) that 
+      should be applied for collecting values of mapping 
+      rule attribute to be used for computing the energy cost.";
+    }
+  }
+
+  grouping NGRANECMappingRuleGrp {
+    description "Represents the NGRANECMappingRule IOC.";
+    list rules {
+      description "This IOC represents a unified mapping rule.";
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses ECMappingRuleInput;
+      }
+    }
+  }
+
+  grouping NGRANECMappingRuleSubtree {
+    description "Helps augmenting NGRANECMappingRule into multiple places.";
+    list NGRANECMappingRule {
+      description "Specifies the energy cost mapping rules.";
+      key "id";
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NGRANECMappingRuleGrp;
+      }
+      uses NGRANECMappingRuleGrp;
+    }  
+  }
+  
+  augment "/subnet3gpp:SubNetwork" {
+    uses NGRANECMappingRuleSubtree;
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    uses NGRANECMappingRuleSubtree;
+  }
+
+}
-- 
GitLab


From 764a8c66d720690e6a27483ec8e594d59a1ff1d5 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 20 Aug 2024 16:08:51 +0000
Subject: [PATCH 39/85] Delete _3gpp-nr-nrm-ecimappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 78 --------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 yang-models/_3gpp-nr-nrm-ecimappingrule.yang

diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
deleted file mode 100644
index fea406f9a..000000000
--- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang
+++ /dev/null
@@ -1,78 +0,0 @@
-module _3gpp-nr-nrm-ecmappingrule {
-  yang-version 1.1;
-  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule;
-  prefix ecmap3gpp;
-  
-  import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
-  import _3gpp-common-managed-element { prefix me3gpp; }
-  import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; }
-
-  organization "3gpp SA5";
-  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "This IOC represents the unified mapping rule input to support
-    Energy Cost Index Mapping when Energy Cost Reporting.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
-    TTA, TTC). All rights reserved.";
-  reference "3GPP TS 28.541";
-
-  revision 2024-08-12 { reference CR-1336 ; } 
-  
-  grouping ECMappingRuleInput {
-    description 
-    "Input to the unified mapping rule to support energy cost reporting.";
-  
-    leaf eCMRInputMinValue {
-      type uint8;
-      description "The minimum value of to be applied 
-      for mapping from this attribute to the energy cost.";
-    }
-    
-    leaf eCMRInputMaxValue {
-      type uint8;
-      description "The maximum value of to be applied 
-      for mapping from this attribute to the energy cost.";  
-    }
-
-    leaf eCTimeInterval {
-      type uint8;
-      description "Time interval (in seconds) that 
-      should be applied for collecting values of mapping 
-      rule attribute to be used for computing the energy cost.";
-    }
-  }
-
-  grouping NGRANECMappingRuleGrp {
-    description "Represents the NGRANECMappingRule IOC.";
-    list rules {
-      description "This IOC represents a unified mapping rule.";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses ECMappingRuleInput;
-      }
-    }
-  }
-
-  grouping NGRANECMappingRuleSubtree {
-    description "Helps augmenting NGRANECMappingRule into multiple places.";
-    list NGRANECMappingRule {
-      description "Specifies the energy cost mapping rules.";
-      key "id";
-      uses top3gpp:Top_Grp;
-      container attributes {
-        uses NGRANECMappingRuleGrp;
-      }
-      uses NGRANECMappingRuleGrp;
-    }  
-  }
-  
-  augment "/subnet3gpp:SubNetwork" {
-    uses NGRANECMappingRuleSubtree;
-  }
-
-  augment "/me3gpp:ManagedElement" {
-    uses NGRANECMappingRuleSubtree;
-  }
-
-}
-- 
GitLab


From 19561e3a232eaf2a53eee01addaa2e56591bf99e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 09:23:57 +0000
Subject: [PATCH 40/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index fea406f9a..07d10a213 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -12,7 +12,7 @@ module _3gpp-nr-nrm-ecmappingrule {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the unified mapping rule input to support
     Energy Cost Index Mapping when Energy Cost Reporting.
-    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";
 
-- 
GitLab


From 0d2c18f1078298bdc5a681a7ead1f00d93dd5737 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 14:22:16 +0000
Subject: [PATCH 41/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 07d10a213..dbce8e314 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -18,6 +18,11 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   revision 2024-08-12 { reference CR-1336 ; } 
   
+  feature EnergyCostMappingRule {
+    description "Indicates whether alarm acknowledgement by the consumer is 
+      supported.";
+  }
+
   grouping ECMappingRuleInput {
     description 
     "Input to the unified mapping rule to support energy cost reporting.";
@@ -37,8 +42,9 @@ module _3gpp-nr-nrm-ecmappingrule {
     leaf eCTimeInterval {
       type uint8;
       description "Time interval (in seconds) that 
-      should be applied for collecting values of mapping 
-      rule attribute to be used for computing the energy cost.";
+        should be applied for collecting values of mapping 
+        rule attribute to be used for computing the energy cost.";
+      units seconds;
     }
   }
 
@@ -63,16 +69,16 @@ module _3gpp-nr-nrm-ecmappingrule {
       container attributes {
         uses NGRANECMappingRuleGrp;
       }
-      uses NGRANECMappingRuleGrp;
     }  
   }
   
   augment "/subnet3gpp:SubNetwork" {
+    if-feature EnergyCostMappingRule;
     uses NGRANECMappingRuleSubtree;
   }
 
   augment "/me3gpp:ManagedElement" {
+    if-feature EnergyCostMappingRule;
     uses NGRANECMappingRuleSubtree;
   }
-
 }
-- 
GitLab


From 510235d9e89463f53585cac09adad6057d667204 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 14:24:46 +0000
Subject: [PATCH 42/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 25 ++++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index dbce8e314..5295e7d2f 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -22,12 +22,15 @@ module _3gpp-nr-nrm-ecmappingrule {
     description "Indicates whether alarm acknowledgement by the consumer is 
       supported.";
   }
-
-  grouping ECMappingRuleInput {
-    description 
-    "Input to the unified mapping rule to support energy cost reporting.";
   
-    leaf eCMRInputMinValue {
+  grouping NGRANECMappingRuleGrp {
+    description "Represents the NGRANECMappingRule IOC.";
+    list rules {
+      description "This IOC represents a unified mapping rule.";
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      leaf eCMRInputMinValue {
       type uint8;
       description "The minimum value of to be applied 
       for mapping from this attribute to the energy cost.";
@@ -46,19 +49,9 @@ module _3gpp-nr-nrm-ecmappingrule {
         rule attribute to be used for computing the energy cost.";
       units seconds;
     }
-  }
-
-  grouping NGRANECMappingRuleGrp {
-    description "Represents the NGRANECMappingRule IOC.";
-    list rules {
-      description "This IOC represents a unified mapping rule.";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses ECMappingRuleInput;
-      }
     }
   }
+  }
 
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
-- 
GitLab


From 81a30050f186bf3f63467d7b4428397df57b6721 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 15:05:31 +0000
Subject: [PATCH 43/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 39 +++++++++++++--------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 5295e7d2f..7a18db3db 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -18,19 +18,16 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   revision 2024-08-12 { reference CR-1336 ; } 
   
-  feature EnergyCostMappingRule {
-    description "Indicates whether alarm acknowledgement by the consumer is 
-      supported.";
+  feature ECMappingRuleUnderSubNetwork {
+    description "ECMappingRule shall be contained under SubNetwork.";
+  }  
+
+  feature ECMappingRuleUnderManagedElement {
+    description "ECMappingRule shall be contained under ManagedElement.";
   }
   
-  grouping NGRANECMappingRuleGrp {
-    description "Represents the NGRANECMappingRule IOC.";
-    list rules {
-      description "This IOC represents a unified mapping rule.";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      leaf eCMRInputMinValue {
+  grouping ECMappingRuleInputGrp {
+    leaf eCMRInputMinValue {
       type uint8;
       description "The minimum value of to be applied 
       for mapping from this attribute to the energy cost.";
@@ -49,15 +46,27 @@ module _3gpp-nr-nrm-ecmappingrule {
         rule attribute to be used for computing the energy cost.";
       units seconds;
     }
+  }
+
+  grouping NGRANECMappingRuleGrp {
+    description "Represents the NGRANECMappingRule IOC.";
+    list rules {
+      description "This IOC represents a unified mapping rule.";
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses ECMappingRuleInputGrp;
     }
   }
   }
 
   grouping NGRANECMappingRuleSubtree {
+    key "idx";
+    min-elements 1;
+    max-elements 1;
     description "Helps augmenting NGRANECMappingRule into multiple places.";
-    list NGRANECMappingRule {
+    list idx {
       description "Specifies the energy cost mapping rules.";
-      key "id";
       uses top3gpp:Top_Grp;
       container attributes {
         uses NGRANECMappingRuleGrp;
@@ -66,12 +75,12 @@ module _3gpp-nr-nrm-ecmappingrule {
   }
   
   augment "/subnet3gpp:SubNetwork" {
-    if-feature EnergyCostMappingRule;
+    if-feature EnergyCostMapECMappingRuleUnderSubNetwork;
     uses NGRANECMappingRuleSubtree;
   }
 
   augment "/me3gpp:ManagedElement" {
-    if-feature EnergyCostMappingRule;
+    if-feature ECMappingRuleUnderManagedElement;
     uses NGRANECMappingRuleSubtree;
   }
 }
-- 
GitLab


From 58dae69ddcd302f0f07faa91eec63346feca0d07 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 15:15:10 +0000
Subject: [PATCH 44/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 7a18db3db..ef094c5e7 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -6,8 +6,7 @@ module _3gpp-nr-nrm-ecmappingrule {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
-  import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; }
-
+  
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the unified mapping rule input to support
@@ -75,7 +74,7 @@ module _3gpp-nr-nrm-ecmappingrule {
   }
   
   augment "/subnet3gpp:SubNetwork" {
-    if-feature EnergyCostMapECMappingRuleUnderSubNetwork;
+    if-feature ECMappingRuleUnderSubNetwork;
     uses NGRANECMappingRuleSubtree;
   }
 
-- 
GitLab


From d0d948eec68e68b780f11abc6d56481660382616 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 15:17:22 +0000
Subject: [PATCH 45/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index ef094c5e7..2afbb8421 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -57,7 +57,6 @@ module _3gpp-nr-nrm-ecmappingrule {
       uses ECMappingRuleInputGrp;
     }
   }
-  }
 
   grouping NGRANECMappingRuleSubtree {
     key "idx";
-- 
GitLab


From 2cd03bdcd16726bda0ad8dfaa467a6f97a87b2b1 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 15:24:11 +0000
Subject: [PATCH 46/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 2afbb8421..ef094c5e7 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -57,6 +57,7 @@ module _3gpp-nr-nrm-ecmappingrule {
       uses ECMappingRuleInputGrp;
     }
   }
+  }
 
   grouping NGRANECMappingRuleSubtree {
     key "idx";
-- 
GitLab


From 1b5040458b3419dcdcb1d0d74a3d63017f01376e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 15:57:08 +0000
Subject: [PATCH 47/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index ef094c5e7..ad125aac2 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -60,7 +60,7 @@ module _3gpp-nr-nrm-ecmappingrule {
   }
 
   grouping NGRANECMappingRuleSubtree {
-    key "idx";
+    key idx;
     min-elements 1;
     max-elements 1;
     description "Helps augmenting NGRANECMappingRule into multiple places.";
-- 
GitLab


From 75e4a046cfc6d27375b34e0f63cfb101f1de1de4 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 16:17:08 +0000
Subject: [PATCH 48/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index ad125aac2..24397bd00 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -60,19 +60,19 @@ module _3gpp-nr-nrm-ecmappingrule {
   }
 
   grouping NGRANECMappingRuleSubtree {
-    key idx;
+    description "Helps augmenting NGRANECMappingRule into multiple places.";
+    key "idx";
     min-elements 1;
     max-elements 1;
-    description "Helps augmenting NGRANECMappingRule into multiple places.";
-    list idx {
-      description "Specifies the energy cost mapping rules.";
+    list rules {
+      key "idx";
       uses top3gpp:Top_Grp;
-      container attributes {
+      container idx {
         uses NGRANECMappingRuleGrp;
       }
     }  
   }
-  
+
   augment "/subnet3gpp:SubNetwork" {
     if-feature ECMappingRuleUnderSubNetwork;
     uses NGRANECMappingRuleSubtree;
-- 
GitLab


From 48f5e37503a19fe24b48a7b62a8a4002b2ec38de Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 16:36:49 +0000
Subject: [PATCH 49/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 24397bd00..cb12d1894 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -61,12 +61,10 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
-    key "idx";
-    min-elements 1;
-    max-elements 1;
     list rules {
       key "idx";
-      uses top3gpp:Top_Grp;
+      min-elements 1;
+      max-elements 1;
       container idx {
         uses NGRANECMappingRuleGrp;
       }
-- 
GitLab


From 2360a3a6eee0d289e497c172f3bfcd798f6e14d3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 16:42:43 +0000
Subject: [PATCH 50/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index cb12d1894..640046d81 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -50,7 +50,6 @@ module _3gpp-nr-nrm-ecmappingrule {
   grouping NGRANECMappingRuleGrp {
     description "Represents the NGRANECMappingRule IOC.";
     list rules {
-      description "This IOC represents a unified mapping rule.";
     key id;
     uses top3gpp:Top_Grp;
     container attributes {
@@ -61,13 +60,11 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
-    list rules {
-      key "idx";
-      min-elements 1;
-      max-elements 1;
-      container idx {
+    key "idx";
+    min-elements 1;
+    max-elements 1;
+    list idx {  
         uses NGRANECMappingRuleGrp;
-      }
     }  
   }
 
-- 
GitLab


From 24570eb10c17f85d50198f722bfb05019cf6e59b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 16:55:29 +0000
Subject: [PATCH 51/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 640046d81..c0ffec40b 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -60,13 +60,15 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
+    list mappingrule {
     key "idx";
     min-elements 1;
     max-elements 1;
-    list idx {  
+    container idx {  
         uses NGRANECMappingRuleGrp;
     }  
   }
+  }
 
   augment "/subnet3gpp:SubNetwork" {
     if-feature ECMappingRuleUnderSubNetwork;
-- 
GitLab


From ca7fe0b47d9617a1e59db0c7b91b753ca552ab90 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 17:00:38 +0000
Subject: [PATCH 52/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index c0ffec40b..1e5de11a7 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -64,9 +64,7 @@ module _3gpp-nr-nrm-ecmappingrule {
     key "idx";
     min-elements 1;
     max-elements 1;
-    container idx {  
-        uses NGRANECMappingRuleGrp;
-    }  
+        uses NGRANECMappingRuleGrp;  
   }
   }
 
-- 
GitLab


From fbe9ceb9cd30beb0710ed360fe7b811828da5335 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 17:06:11 +0000
Subject: [PATCH 53/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 1e5de11a7..b29038034 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -61,11 +61,11 @@ module _3gpp-nr-nrm-ecmappingrule {
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
     list mappingrule {
-    key "idx";
-    min-elements 1;
-    max-elements 1;
-        uses NGRANECMappingRuleGrp;  
-  }
+      key idx;
+      min-elements 1;
+      max-elements 1;
+      uses NGRANECMappingRuleGrp;  
+    }
   }
 
   augment "/subnet3gpp:SubNetwork" {
-- 
GitLab


From 352dfaf4453acfc3cae959766295b8de347552e8 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 20:42:49 +0000
Subject: [PATCH 54/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 31 +++++++++------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index b29038034..5a0c3854f 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -25,17 +25,18 @@ module _3gpp-nr-nrm-ecmappingrule {
     description "ECMappingRule shall be contained under ManagedElement.";
   }
   
-  grouping ECMappingRuleInputGrp {
+  grouping NGRANECMappingRuleGrp {
+    description "Represents the NGRANECMappingRule IOC.";
     leaf eCMRInputMinValue {
       type uint8;
       description "The minimum value of to be applied 
-      for mapping from this attribute to the energy cost.";
+        for mapping from this attribute to the energy cost.";
     }
     
     leaf eCMRInputMaxValue {
       type uint8;
       description "The maximum value of to be applied 
-      for mapping from this attribute to the energy cost.";  
+        for mapping from this attribute to the energy cost.";  
     }
 
     leaf eCTimeInterval {
@@ -44,27 +45,21 @@ module _3gpp-nr-nrm-ecmappingrule {
         should be applied for collecting values of mapping 
         rule attribute to be used for computing the energy cost.";
       units seconds;
-    }
-  }
-
-  grouping NGRANECMappingRuleGrp {
-    description "Represents the NGRANECMappingRule IOC.";
-    list rules {
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses ECMappingRuleInputGrp;
-    }
-  }
+    };
   }
 
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
-    list mappingrule {
-      key idx;
+    list NGRANECMappingRule {
+      key id;
+      use top3gpp:Top_Grp;
       min-elements 1;
       max-elements 1;
-      uses NGRANECMappingRuleGrp;  
+      leaf idx { type unit32; }
+      container attributes {
+        uses NGRANECMappingRuleGrp;  
+      }
+    }
     }
   }
 
-- 
GitLab


From 54ba360c500b7f67993c729505d9492a354d14b3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 20:47:21 +0000
Subject: [PATCH 55/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 5a0c3854f..f9ae083f4 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -45,7 +45,7 @@ module _3gpp-nr-nrm-ecmappingrule {
         should be applied for collecting values of mapping 
         rule attribute to be used for computing the energy cost.";
       units seconds;
-    };
+    }
   }
 
   grouping NGRANECMappingRuleSubtree {
@@ -60,7 +60,6 @@ module _3gpp-nr-nrm-ecmappingrule {
         uses NGRANECMappingRuleGrp;  
       }
     }
-    }
   }
 
   augment "/subnet3gpp:SubNetwork" {
-- 
GitLab


From 888b1afe174276518c53b46e17753756bc7aa3f8 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 20:55:09 +0000
Subject: [PATCH 56/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index f9ae083f4..ed7db374a 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -52,10 +52,10 @@ module _3gpp-nr-nrm-ecmappingrule {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
     list NGRANECMappingRule {
       key id;
-      use top3gpp:Top_Grp;
+      uses top3gpp:Top_Grp;
       min-elements 1;
       max-elements 1;
-      leaf idx { type unit32; }
+      leaf idx { type uit32; }
       container attributes {
         uses NGRANECMappingRuleGrp;  
       }
@@ -64,11 +64,11 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   augment "/subnet3gpp:SubNetwork" {
     if-feature ECMappingRuleUnderSubNetwork;
-    uses NGRANECMappingRuleSubtree;
+      uses NGRANECMappingRuleSubtree;
   }
 
   augment "/me3gpp:ManagedElement" {
     if-feature ECMappingRuleUnderManagedElement;
-    uses NGRANECMappingRuleSubtree;
+      uses NGRANECMappingRuleSubtree;
   }
 }
-- 
GitLab


From 98998adadf50457ba7b07795f8e7cdb2ac0ec4e4 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 20:58:51 +0000
Subject: [PATCH 57/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index ed7db374a..c0331bc89 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -55,7 +55,7 @@ module _3gpp-nr-nrm-ecmappingrule {
       uses top3gpp:Top_Grp;
       min-elements 1;
       max-elements 1;
-      leaf idx { type uit32; }
+      leaf idx { type uint32; }
       container attributes {
         uses NGRANECMappingRuleGrp;  
       }
-- 
GitLab


From 05e739681864a3d8f53a0cb76e085c39fd521978 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 21:03:10 +0000
Subject: [PATCH 58/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index c0331bc89..0e796831c 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -64,7 +64,10 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   augment "/subnet3gpp:SubNetwork" {
     if-feature ECMappingRuleUnderSubNetwork;
-      uses NGRANECMappingRuleSubtree;
+      when '"1" = "1"'{
+        uses NGRANECMappingRuleSubtree;
+      }
+      }
   }
 
   augment "/me3gpp:ManagedElement" {
-- 
GitLab


From cf9c92c6f6e54d46de8c293390e4c20b7473ca42 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 21:05:38 +0000
Subject: [PATCH 59/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 0e796831c..6cbf8cbff 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -64,10 +64,9 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   augment "/subnet3gpp:SubNetwork" {
     if-feature ECMappingRuleUnderSubNetwork;
-      when '"1" = "1"'{
+      when '"1" = "1"';
         uses NGRANECMappingRuleSubtree;
       }
-      }
   }
 
   augment "/me3gpp:ManagedElement" {
-- 
GitLab


From f4ff027d6ba6266eb05cd66720a87ceccfbaff5b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 21 Aug 2024 21:12:39 +0000
Subject: [PATCH 60/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 6cbf8cbff..0d26806a5 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -66,7 +66,6 @@ module _3gpp-nr-nrm-ecmappingrule {
     if-feature ECMappingRuleUnderSubNetwork;
       when '"1" = "1"';
         uses NGRANECMappingRuleSubtree;
-      }
   }
 
   augment "/me3gpp:ManagedElement" {
-- 
GitLab


From f4ae3bda1c3fccc333143587505cb65afe6bb165 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Wed, 21 Aug 2024 23:24:44 +0200
Subject: [PATCH 61/85] update x

---
 yang-models/_3gpp-common-managed-element.yang |  9 ++++++++
 yang-models/_3gpp-common-subnetwork.yang      | 10 +++++++++
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang   | 21 -------------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index 570791a14..c9645cec4 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -12,6 +12,7 @@ module _3gpp-common-managed-element {
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
   import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
+  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -50,6 +51,10 @@ module _3gpp-common-managed-element {
   revision 2019-06-17 { reference " S5-203316"; }
   revision 2019-05-08 { reference "Initial revision"; }
   
+  feature ECMappingRuleUnderManagedElement {
+    description "ECMappingRule shall be contained under ManagedElement.";
+  }
+  
   feature EcmConnectionInfoUnderManagedElement  {
     description "The EcmConnectionInfo shall be contained under
     ManagedElement";
@@ -312,5 +317,9 @@ module _3gpp-common-managed-element {
     uses econn3gpp:EcmConnectionInfoSubtree {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
+
+    uses ecmap3gpp:NGRANECMappingRuleSubtree {
+      if-feature EcmConnectionInfoUnderManagedElement;
+    }
   }    
 }
diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang
index d6d5f7010..85676b8b8 100755
--- a/yang-models/_3gpp-common-subnetwork.yang
+++ b/yang-models/_3gpp-common-subnetwork.yang
@@ -13,6 +13,7 @@ module _3gpp-common-subnetwork {
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
   import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
+  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -33,6 +34,7 @@ module _3gpp-common-subnetwork {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
   
+  revision 2024-08-18 { reference CR-1336 ; } 
   revision 2024-01-30 { reference CR-0328 ; } 
   revision 2023-11-14 { reference CR-0305 ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
@@ -61,6 +63,10 @@ module _3gpp-common-subnetwork {
     reference "Initial revision";
   }
 
+  feature ECMappingRuleUnderSubNetwork {
+    description "ECMappingRule shall be contained under SubNetwork.";
+  }
+  
   feature EcmConnectionInfoUnderSubNetwork {
     description "The EcmConnectionInfo shall be contained under
     Subnetwork";
@@ -269,6 +275,10 @@ module _3gpp-common-subnetwork {
       reference "RFC8528 YANG Schema Mount";
     }
     
+    uses ecmap3gpp:NGRANECMappingRuleSubtree {
+      if-feature EcmConnectionInfoUnderSubNetwork;
+    }
+    
     // augment external parts here
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 0d26806a5..fa1fa3a62 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -4,8 +4,6 @@ module _3gpp-nr-nrm-ecmappingrule {
   prefix ecmap3gpp;
   
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
-  import _3gpp-common-managed-element { prefix me3gpp; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -17,14 +15,6 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   revision 2024-08-12 { reference CR-1336 ; } 
   
-  feature ECMappingRuleUnderSubNetwork {
-    description "ECMappingRule shall be contained under SubNetwork.";
-  }  
-
-  feature ECMappingRuleUnderManagedElement {
-    description "ECMappingRule shall be contained under ManagedElement.";
-  }
-  
   grouping NGRANECMappingRuleGrp {
     description "Represents the NGRANECMappingRule IOC.";
     leaf eCMRInputMinValue {
@@ -61,15 +51,4 @@ module _3gpp-nr-nrm-ecmappingrule {
       }
     }
   }
-
-  augment "/subnet3gpp:SubNetwork" {
-    if-feature ECMappingRuleUnderSubNetwork;
-      when '"1" = "1"';
-        uses NGRANECMappingRuleSubtree;
-  }
-
-  augment "/me3gpp:ManagedElement" {
-    if-feature ECMappingRuleUnderManagedElement;
-      uses NGRANECMappingRuleSubtree;
-  }
 }
-- 
GitLab


From 2c90a46a3dd7c25a251393a93e1c3c4ea3ffc973 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 22 Aug 2024 07:40:46 +0000
Subject: [PATCH 62/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index fa1fa3a62..d35070c4d 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -41,6 +41,7 @@ module _3gpp-nr-nrm-ecmappingrule {
   grouping NGRANECMappingRuleSubtree {
     description "Helps augmenting NGRANECMappingRule into multiple places.";
     list NGRANECMappingRule {
+      description "The mapping rule.";
       key id;
       uses top3gpp:Top_Grp;
       min-elements 1;
-- 
GitLab


From e6d73d5f8a1aeaf011a0b48d80dc0563e0045f44 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 22 Aug 2024 10:22:12 +0000
Subject: [PATCH 63/85] Revert "Update
 _3gpp-nr-nrm-externalgnbcuupfunction.yang"

This reverts commit a967c4640554698c7a3abdce07d3a5fd4d0edd0f
---
 yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
index 56a5fbe8b..b770fe84b 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
@@ -7,6 +7,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; }
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalGNBCUUPFunction
@@ -16,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-12 { reference CR-1336 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -41,6 +43,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
       mandatory true;
       type int32 { range "22..32"; }
     }
+    
+    leaf nGRANECIMappingRuleRef {
+      description "DN of ECIMappingRuleSet.";
+      type types3gpp:DistinguishedName;
+    }
+
   }
 
   grouping ExternalGNBCUUPFunctionWrapper {
-- 
GitLab


From b7657827f26bc088651404ddbcebcd0cc9960e9f Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 22 Aug 2024 11:07:12 +0000
Subject: [PATCH 64/85] Revert "Update
 _3gpp-nr-nrm-externalgnbcuupfunction.yang"

This reverts commit cb70be13f8622db163aa403a6d968aa2279747a8
---
 yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
index b770fe84b..2445a1e99 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
@@ -7,7 +7,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; }
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalGNBCUUPFunction
@@ -17,7 +16,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
-  revision 2024-08-12 { reference CR-1336 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -43,12 +41,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
       mandatory true;
       type int32 { range "22..32"; }
     }
-    
-    leaf nGRANECIMappingRuleRef {
-      description "DN of ECIMappingRuleSet.";
-      type types3gpp:DistinguishedName;
-    }
-
   }
 
   grouping ExternalGNBCUUPFunctionWrapper {
@@ -74,4 +66,4 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     if-feature nrnet3gpp:ExternalsUnderNRNetwork;
     uses ExternalGNBCUUPFunctionWrapper;
   }	
-}
+}
\ No newline at end of file
-- 
GitLab


From a3c72170e7440d98ded710ee62b8a2482bec1ef5 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 22 Aug 2024 14:28:28 +0000
Subject: [PATCH 65/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index d35070c4d..949f21289 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -15,8 +15,8 @@ module _3gpp-nr-nrm-ecmappingrule {
 
   revision 2024-08-12 { reference CR-1336 ; } 
   
-  grouping NGRANECMappingRuleGrp {
-    description "Represents the NGRANECMappingRule IOC.";
+  grouping NRECMappingRuleGrp {
+    description "Represents the NRECMappingRule IOC.";
     leaf eCMRInputMinValue {
       type uint8;
       description "The minimum value of to be applied 
@@ -38,9 +38,9 @@ module _3gpp-nr-nrm-ecmappingrule {
     }
   }
 
-  grouping NGRANECMappingRuleSubtree {
-    description "Helps augmenting NGRANECMappingRule into multiple places.";
-    list NGRANECMappingRule {
+  grouping NRECMappingRuleSubtree {
+    description "Helps augmenting NRECMappingRule into multiple places.";
+    list NRECMappingRule {
       description "The mapping rule.";
       key id;
       uses top3gpp:Top_Grp;
@@ -48,7 +48,7 @@ module _3gpp-nr-nrm-ecmappingrule {
       max-elements 1;
       leaf idx { type uint32; }
       container attributes {
-        uses NGRANECMappingRuleGrp;  
+        uses NRECMappingRuleGrp;  
       }
     }
   }
-- 
GitLab


From 9df9348222abc3ef484306e30469561963037b2f Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 22 Aug 2024 14:29:02 +0000
Subject: [PATCH 66/85] Update _3gpp-common-subnetwork.yang

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

diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang
index 85676b8b8..23362b81d 100755
--- a/yang-models/_3gpp-common-subnetwork.yang
+++ b/yang-models/_3gpp-common-subnetwork.yang
@@ -275,10 +275,10 @@ module _3gpp-common-subnetwork {
       reference "RFC8528 YANG Schema Mount";
     }
     
-    uses ecmap3gpp:NGRANECMappingRuleSubtree {
+    uses ecmap3gpp:NRECMappingRuleSubtree {
       if-feature EcmConnectionInfoUnderSubNetwork;
     }
     
     // augment external parts here
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From b8a50ff1cf82edeee6fe0e52612ee5b001ee47eb Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 22 Aug 2024 14:39:59 +0000
Subject: [PATCH 67/85] Update _3gpp-common-managed-element.yang

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

diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index c9645cec4..bf3d07317 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -318,7 +318,7 @@ module _3gpp-common-managed-element {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
 
-    uses ecmap3gpp:NGRANECMappingRuleSubtree {
+    uses ecmap3gpp:NRECMappingRuleSubtree {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
   }    
-- 
GitLab


From 5201b312b9b4d486d78edf15bbe1b58077bf999a Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 23 Aug 2024 06:09:05 +0000
Subject: [PATCH 68/85] Revert "Update _3gpp-common-managed-element.yang"

This reverts commit 51cc70b82b520025091ec976401d5430ea0c8cb0
---
 yang-models/_3gpp-common-managed-element.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index bf3d07317..c9645cec4 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -318,7 +318,7 @@ module _3gpp-common-managed-element {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
 
-    uses ecmap3gpp:NRECMappingRuleSubtree {
+    uses ecmap3gpp:NGRANECMappingRuleSubtree {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
   }    
-- 
GitLab


From a96b700798fc909ee2fb4a54fb7647fa96618ed7 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 23 Aug 2024 06:14:06 +0000
Subject: [PATCH 69/85] Update _3gpp-common-managed-element.yang

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

diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index c9645cec4..eb77b6cf3 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -318,8 +318,8 @@ module _3gpp-common-managed-element {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
 
-    uses ecmap3gpp:NGRANECMappingRuleSubtree {
-      if-feature EcmConnectionInfoUnderManagedElement;
+    uses ecmap3gpp:NRECMappingRuleSubtree {
+      if-feature ECMappingRuleUnderManagedElement;
     }
   }    
 }
-- 
GitLab


From 693c6f5caeee4f39a848b473b16033a083d23eb7 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 23 Aug 2024 08:59:17 +0000
Subject: [PATCH 70/85] Update _3gpp-nr-nrm-ecmappingrule.yang

---
 yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 949f21289..81519e61c 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -16,7 +16,9 @@ module _3gpp-nr-nrm-ecmappingrule {
   revision 2024-08-12 { reference CR-1336 ; } 
   
   grouping NRECMappingRuleGrp {
-    description "Represents the NRECMappingRule IOC.";
+    description "Represents the unified mapping rule to support Energy Cost Mapping 
+      when Energy Cost Reporting is supported.  Can be name-contained by SubNetwork 
+      or ManagedElement.  It applies to all ManagedEntity contained by the parent.";
     leaf eCMRInputMinValue {
       type uint8;
       description "The minimum value of to be applied 
-- 
GitLab


From 26e7f629b4180825a9bef1fdb97ee763046afb15 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 23 Aug 2024 09:00:41 +0000
Subject: [PATCH 71/85] Update _3gpp-nr-nrm-gnbcucpfunction.yang

---
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 7b168c437..7cae7b624 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -184,7 +184,8 @@ module _3gpp-nr-nrm-gnbcucpfunction {
 
     leaf nRECMappingRuleRef {
       type types3gpp:DistinguishedName;
-      description "DN of a NRECMappingRule.";
+      description "DN of a NRECMappingRule.  An empty value indicates the 
+        NRECMappingRule contained by parent, e.g. ManagedElement, applies.";
     }
   }
 
-- 
GitLab


From 089dc6e12c793cc2015905cdceb4c3271a3e81b2 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 23 Aug 2024 09:48:34 +0000
Subject: [PATCH 72/85] Update _3gpp-common-managed-element.yang

---
 yang-models/_3gpp-common-managed-element.yang | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index eb77b6cf3..b9c7fa51c 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -189,12 +189,6 @@ module _3gpp-common-managed-element {
       min-elements 1;
       type string;
     }    
-    
-    leaf nRECMappingRuleRef {
-      type types3gpp:DistinguishedName;
-      description "DN of a NRECMappingRule.";
-    }
-
   }
   
   grouping ManagedElementGrp {
-- 
GitLab


From 99efbf50a6b60dbb6d0849d0e345298870f9b33e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 23 Aug 2024 10:00:06 +0000
Subject: [PATCH 73/85] Update _3gpp-nr-nrm-gnbcucpfunction.yang

---
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 7cae7b624..e8ce1c9f8 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -185,7 +185,8 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     leaf nRECMappingRuleRef {
       type types3gpp:DistinguishedName;
       description "DN of a NRECMappingRule.  An empty value indicates the 
-        NRECMappingRule contained by parent, e.g. ManagedElement, applies.";
+        NRECMappingRule contained by parent, e.g. ManagedElement or
+        SubNetwork, applies.";
     }
   }
 
-- 
GitLab


From c921ce0958c7e0cecdd69773f06861a0feca8f05 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 11:18:37 +0000
Subject: [PATCH 74/85] Update _3gpp-5gc-nrm-nwdaffunction.yang correct rev

---
 yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
index 5fe7eb7ae..9cd8747e8 100755
--- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
@@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2024-08-06 { reference CR-1130; } 
   revision 2024-04-12 { reference CR-1218; } 
   revision 2023-09-18 { reference CR-1043; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -393,4 +394,4 @@ module _3gpp-5gc-nrm-nwdaffunction {
       uses mf3gpp:ManagedFunctionContainedClasses;
     }
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From 59e4898c38cdc0be51a5ea9e5b61f1454853eeb8 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 17:04:46 +0000
Subject: [PATCH 75/85] Update _3gpp-5gc-nrm-nwdaffunction.yang

---
 yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
index 9cd8747e8..a5256f4c7 100755
--- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
@@ -280,7 +280,8 @@ module _3gpp-5gc-nrm-nwdaffunction {
   }
   
   grouping NWDAFFunctionGrp {
-    description "Represents the NWDAFFunction IOC";
+    description "The NWDAFFunction IOC includes attributes inherited from 
+      ManagedFunction IOC (defined in TS 28.622)";
     uses mf3gpp:ManagedFunctionGrp;
     
     list pLMNInfoList {
@@ -320,8 +321,9 @@ module _3gpp-5gc-nrm-nwdaffunction {
       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.";
+        is defined as a datatype (see clause 5.3.95). It is used by an 
+        authorized consumer, e.g. NWDAF to facilitate the data collection 
+        from OAM.";
       leaf idx {
         type string;
       }
-- 
GitLab


From b15e36adcef48ea102e52a1847a6831cf5021994 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 14:16:26 +0000
Subject: [PATCH 76/85] Update _3gpp-5gc-nrm-anlffunction.yang include
 references to mLModelRefList and aIMLInferenceFunctionRefList

---
 yang-models/_3gpp-5gc-nrm-anlffunction.yang | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
index 85673a4c7..be58e7e07 100644
--- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
@@ -15,7 +15,8 @@ module _3gpp-5gc-nrm-anlffunction {
     Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
-  
+
+  revision 2024-08-06 { reference CR-1332; }  
   revision 2023-11-03 { reference "initial revision"; }
   
   grouping AnLFFunctionGrp {
@@ -29,6 +30,17 @@ module _3gpp-5gc-nrm-anlffunction {
       config false;
       description "It indicates the activation status of the AnLF";
     }
+    leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+      (See TS 28.105 [105]).";
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+      (See TS 28.105 [105]) .";
+    }
+
   }
     
   augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" {
-- 
GitLab


From 4e94547a7fbda99891087edd7fe7cc1c1887cdff Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 14:26:11 +0000
Subject: [PATCH 77/85] Update _3gpp-5gc-nrm-anlffunction.yang import types3gpp

---
 yang-models/_3gpp-5gc-nrm-anlffunction.yang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
index be58e7e07..cb9e94e00 100644
--- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
@@ -6,7 +6,8 @@ module _3gpp-5gc-nrm-anlffunction {
   
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; }
+  import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; 
+  import _3gpp-common-yang-types { prefix types3gpp; }}
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-- 
GitLab


From 8b43ea3b8dcc243ab72d88f0c1f6592b41926c7f Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 14:29:44 +0000
Subject: [PATCH 78/85] Update _3gpp-5gc-nrm-anlffunction.yang typo

---
 yang-models/_3gpp-5gc-nrm-anlffunction.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
index cb9e94e00..96fa4239c 100644
--- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
@@ -6,8 +6,8 @@ module _3gpp-5gc-nrm-anlffunction {
   
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; 
-  import _3gpp-common-yang-types { prefix types3gpp; }}
+  import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp;} 
+  import _3gpp-common-yang-types { prefix types3gpp; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-- 
GitLab


From 4b3c553b233057c767f6f280b53db8ff373d10c1 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 14:42:02 +0000
Subject: [PATCH 79/85] Update _3gpp-nr-nrm-desmanagementfunction.yang add
 support for mLModelRefList and AIMLInferenceFunction

---
 .../_3gpp-nr-nrm-desmanagementfunction.yang      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
index c1201b7fb..f7a673239 100755
--- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
@@ -9,6 +9,7 @@ module _3gpp-nr-nrm-desmanagementfunction {
   import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-5g-common-yang-types { prefix type5g3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -19,6 +20,7 @@ module _3gpp-nr-nrm-desmanagementfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-06 { reference CR-1332 ; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-05-08 { reference S5-203316; }
@@ -139,7 +141,17 @@ module _3gpp-nr-nrm-desmanagementfunction {
         enum yes;
         enum no;
       }  
-    }  
+    }
+    leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+      (See TS 28.105 [105]).";
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+      (See TS 28.105 [105]) .";
+    }
   }
 
   grouping EsNotAllowedTimePeriodGrp {
@@ -200,4 +212,4 @@ module _3gpp-nr-nrm-desmanagementfunction {
     if-feature subnet3gpp:DESManagementFunction;
     uses DESManagementFunctionSubtree;
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From f6005b8571b99b6bc3dfb70988b6673c396b1c7b Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 14:47:19 +0000
Subject: [PATCH 80/85] Update _3gpp-nr-nrm-dlbofunction.yang add support for
 mLModelRefList and aIMLInferenceFunctionRefList

---
 yang-models/_3gpp-nr-nrm-dlbofunction.yang | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
index 6ae29fa50..e19be89a7 100644
--- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
@@ -8,6 +8,7 @@ module _3gpp-nr-nrm-dlbofunction {
   import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -18,6 +19,7 @@ module _3gpp-nr-nrm-dlbofunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-06 { reference CR-1332 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-03-25 { reference "CR-0683"; }
   revision 2021-10-22 { reference "CR-0577"; }  
@@ -60,7 +62,6 @@ module _3gpp-nr-nrm-dlbofunction {
         type int32 { range "-20..20"; }
         units "0.5 dB";
     }
-
     leaf minimumTimeBetweenHoTriggerChange {
       description "This parameter defines the minimum allowed time interval 
         between two Handover Trigger change performed by MRO. This is used 
@@ -68,7 +69,16 @@ module _3gpp-nr-nrm-dlbofunction {
         type int32 { range "0..604800"; }
         units "1";
     }
-
+    leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+      (See TS 28.105 [105]).";
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+      (See TS 28.105 [105]) .";
+    }
   }
 
   grouping DLBOFunctionSubtree {
@@ -101,4 +111,4 @@ module _3gpp-nr-nrm-dlbofunction {
     if-feature DLBOUnderSubNetwork;
     uses DLBOFunctionSubtree;
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From 052148388f20a5a894ee4456cc240d6f3da41ee8 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 14:52:35 +0000
Subject: [PATCH 81/85] Update _3gpp-nr-nrm-dmrofunction.yang add support for
 mLModelRefList  and aIMLInferenceFunctionRefList

---
 yang-models/_3gpp-nr-nrm-dmrofunction.yang | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
index ea6ef52b7..3dbdd585b 100755
--- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
@@ -8,6 +8,7 @@ module _3gpp-nr-nrm-dmrofunction {
   import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -18,6 +19,7 @@ module _3gpp-nr-nrm-dmrofunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-06 { reference CR-1332 ; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0633; }
   revision 2021-08-05 { reference S5-214053/CR-0518; }
@@ -65,6 +67,16 @@ module _3gpp-nr-nrm-dmrofunction {
         enabled or disabled.";
       type boolean;
     }
+    leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+      (See TS 28.105 [105]).";
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+      (See TS 28.105 [105]) .";
+    }
   }
 
   grouping DMROFunctionSubtree {
@@ -101,4 +113,4 @@ module _3gpp-nr-nrm-dmrofunction {
     if-feature subnet3gpp:DMROFunction;
     uses DMROFunctionSubtree;
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From b0fcbc518f1ea9f8b666e951c250aac94eae39df Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 16:29:55 +0000
Subject: [PATCH 82/85] Update _3gpp-5gc-nrm-anlffunction.yang

---
 yang-models/_3gpp-5gc-nrm-anlffunction.yang | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
index 96fa4239c..c516a54c2 100644
--- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
@@ -13,12 +13,12 @@ module _3gpp-5gc-nrm-anlffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AnLF function in 5GC.
                For more information about the AnLF, see 3GPP TS 23.288.
-    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-08-06 { reference CR-1332; }  
-  revision 2023-11-03 { reference "initial revision"; }
+
   
   grouping AnLFFunctionGrp {
     description "Represents the AnLFFunction IOC";
@@ -34,12 +34,14 @@ module _3gpp-5gc-nrm-anlffunction {
     leaf-list mLModelRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of MLModel ¨
-      (See TS 28.105 [105]).";
+        (See TS 28.105).";
+      config false;
     }
     leaf-list aIMLInferenceFunctionRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of AIMLInferenceFunction
-      (See TS 28.105 [105]) .";
+        (See TS 28.105).";
+      config false;
     }
 
   }
-- 
GitLab


From 084001a696595a0a5547c23b10485fad18f6a4f1 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 16:30:44 +0000
Subject: [PATCH 83/85] Update _3gpp-nr-nrm-desmanagementfunction.yang

---
 yang-models/_3gpp-nr-nrm-desmanagementfunction.yang | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
index f7a673239..6256edbac 100755
--- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
@@ -16,7 +16,7 @@ module _3gpp-nr-nrm-desmanagementfunction {
   description "Defines the YANG mapping of the DESManagementFunction 
     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)";
 
@@ -145,12 +145,14 @@ module _3gpp-nr-nrm-desmanagementfunction {
     leaf-list mLModelRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of MLModel ¨
-      (See TS 28.105 [105]).";
+        (See TS 28.105).";
+      config false;
     }
     leaf-list aIMLInferenceFunctionRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of AIMLInferenceFunction
-      (See TS 28.105 [105]) .";
+        (See TS 28.105) .";
+      config false;
     }
   }
 
-- 
GitLab


From 102a6a6f57a034fa88bcaa864d0543b2a1388528 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 16:31:34 +0000
Subject: [PATCH 84/85] Update _3gpp-nr-nrm-dlbofunction.yang

---
 yang-models/_3gpp-nr-nrm-dlbofunction.yang | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
index e19be89a7..ecf970ba4 100644
--- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
@@ -15,7 +15,7 @@ module _3gpp-nr-nrm-dlbofunction {
   description "Defines the YANG mapping of the DLBOFunction 
     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)";
 
@@ -72,12 +72,14 @@ module _3gpp-nr-nrm-dlbofunction {
     leaf-list mLModelRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of MLModel ¨
-      (See TS 28.105 [105]).";
+        (See TS 28.105).";
+      config false;
     }
     leaf-list aIMLInferenceFunctionRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of AIMLInferenceFunction
-      (See TS 28.105 [105]) .";
+        (See TS 28.105) .";
+      config false;
     }
   }
 
-- 
GitLab


From c61e586039f22f91dded0618dcf1f9293a787ef3 Mon Sep 17 00:00:00 2001
From: rosabolzek <cintia.rosa@ericsson.com>
Date: Fri, 9 Aug 2024 16:32:44 +0000
Subject: [PATCH 85/85] Update _3gpp-nr-nrm-dmrofunction.yang

---
 yang-models/_3gpp-nr-nrm-dmrofunction.yang | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
index 3dbdd585b..74fe98c73 100755
--- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
@@ -15,7 +15,7 @@ module _3gpp-nr-nrm-dmrofunction {
   description "Defines the YANG mapping of the DMROFunction 
     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)";
 
@@ -70,12 +70,14 @@ module _3gpp-nr-nrm-dmrofunction {
     leaf-list mLModelRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of MLModel ¨
-      (See TS 28.105 [105]).";
+        (See TS 28.105).";
+      config false;
     }
     leaf-list aIMLInferenceFunctionRefList {
       type types3gpp:DistinguishedName;
       description "This attribute holds a DN list of AIMLInferenceFunction
-      (See TS 28.105 [105]) .";
+        (See TS 28.105) .";
+      config false;
     }
   }
 
-- 
GitLab