From 54fc3bcf68e60b042942472efcbabcbba625c9e6 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 14 Aug 2025 18:08:01 +0000
Subject: [PATCH 01/12] Update 4 files

- /yang-models/_3gpp-common-antennafunction.yang
- /yang-models/_3gpp-common-sectorequipmentfunction.yang
- /yang-models/_3gpp-nr-nrm-antennafunction.yang
- /yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
---
 ...mon-antennafunction.yang => _3gpp-nr-nrm-antennafunction.yang} | 0
 ...entfunction.yang => _3gpp-nr-nrm-sectorequipmentfunction.yang} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename yang-models/{_3gpp-common-antennafunction.yang => _3gpp-nr-nrm-antennafunction.yang} (100%)
 rename yang-models/{_3gpp-common-sectorequipmentfunction.yang => _3gpp-nr-nrm-sectorequipmentfunction.yang} (100%)

diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-nr-nrm-antennafunction.yang
similarity index 100%
rename from yang-models/_3gpp-common-antennafunction.yang
rename to yang-models/_3gpp-nr-nrm-antennafunction.yang
diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
similarity index 100%
rename from yang-models/_3gpp-common-sectorequipmentfunction.yang
rename to yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
-- 
GitLab


From 0ab298f6d4c25ef7c68a8b84264b11c1a1f5f9a3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 14 Aug 2025 18:13:00 +0000
Subject: [PATCH 02/12] Update 2 files

- /yang-models/_3gpp-nr-nrm-antennafunction.yang
- /yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
---
 yang-models/_3gpp-nr-nrm-antennafunction.yang         | 10 +++++-----
 yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-antennafunction.yang b/yang-models/_3gpp-nr-nrm-antennafunction.yang
index feaa0ed2d..aedb0b6fc 100644
--- a/yang-models/_3gpp-nr-nrm-antennafunction.yang
+++ b/yang-models/_3gpp-nr-nrm-antennafunction.yang
@@ -1,6 +1,6 @@
-module _3gpp-common-antennafunction {
+module _3gpp-nr-nrm-antennafunction {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-common-antennafunction";
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-antennafunction";
   prefix "antfunc3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
@@ -14,10 +14,10 @@ module _3gpp-common-antennafunction {
     Object Class (IOC) that is part of the Generic Network Resource Model (NRM).
     Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
-  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
-  revision 2025-05-04 { description "Initial revision"; 
-  }
+  revision 2025-08-18 { reference "CR1578"; }
+  revision 2025-05-04 { reference "Initial revision"; }
 
   typedef TenthOfDegrees { 
     type uint16 { 
diff --git a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
index 6839769ef..77318b5fb 100644
--- a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
@@ -1,6 +1,6 @@
 module _3gpp-common-sectorequipmentfunction {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction";
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-sectorequipmentfunction";
   prefix "scteqpfun3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
@@ -15,8 +15,9 @@ module _3gpp-common-sectorequipmentfunction {
     Model (NRM).
     Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
-    reference "3GPP TS 28.662 Generic Network Resource Model (NRM)";
+    reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-08-18 { reference "CR1578"; }
   revision 2025-05-04 { description "Initial revision"; }
 
   grouping SectorEquipmentFunctionGrp {
-- 
GitLab


From 51f157de876cacc5a0912590222afc2c027b9351 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 14 Aug 2025 18:20:25 +0000
Subject: [PATCH 03/12] Update file _3gpp-nr-nrm-sectorequipmentfunction.yang

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

diff --git a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
index 77318b5fb..3b5f03527 100644
--- a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
@@ -18,7 +18,7 @@ module _3gpp-common-sectorequipmentfunction {
     reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
   revision 2025-08-18 { reference "CR1578"; }
-  revision 2025-05-04 { description "Initial revision"; }
+  revision 2025-05-04 { reference "Initial revision"; }
 
   grouping SectorEquipmentFunctionGrp {
     description "Represents the SectorEquipmentFunction.";
-- 
GitLab


From a0dc8bec5f7c6e4bad1533f3202e9d12fe94cec8 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 14 Aug 2025 18:21:21 +0000
Subject: [PATCH 04/12] Update 2 files

- /yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
- /yang-models/_3gpp-nr-nrm-antennafunction.yang
---
 yang-models/_3gpp-nr-nrm-antennafunction.yang | 440 +++++++++---------
 .../_3gpp-nr-nrm-sectorequipmentfunction.yang | 176 +++----
 2 files changed, 308 insertions(+), 308 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-antennafunction.yang b/yang-models/_3gpp-nr-nrm-antennafunction.yang
index aedb0b6fc..e1e1de786 100644
--- a/yang-models/_3gpp-nr-nrm-antennafunction.yang
+++ b/yang-models/_3gpp-nr-nrm-antennafunction.yang
@@ -1,220 +1,220 @@
-module _3gpp-nr-nrm-antennafunction {
-  yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-antennafunction";
-  prefix "antfunc3gpp";
-
-  import _3gpp-common-yang-types { prefix types3gpp; }
-  import _3gpp-common-managed-function { prefix mf3gpp; }
-  import _3gpp-common-managed-element { prefix me3gpp; }
-  import _3gpp-common-top { prefix top3gpp; }
-
-  organization "3GPP SA5";
-  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "Defines the YANG mapping of the Antenna Function Information
-    Object Class (IOC) that is part of the Generic Network Resource Model (NRM).
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
-    TTA, TTC). All rights reserved.";
-  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
-
-  revision 2025-08-18 { reference "CR1578"; }
-  revision 2025-05-04 { reference "Initial revision"; }
-
-  typedef TenthOfDegrees { 
-    type uint16 { 
-      range 0..3600; 
-    }
-    units "0.1 degrees";
-    description "A single integral value corresponding to an angle in degrees 
-      between 0 and 360 with a resolution of 0.1 degrees.";
-  }
-
-  typedef Latitude {
-    type decimal64 {
-      fraction-digits 4;
-      range "-90.0000..+90.0000"; 
-    }
-    description "Latitude values";
-  }
-
-  typedef Longitude {
-    type decimal64 {
-      fraction-digits 4;
-      range "-180.0000..+180.0000"; 
-    }
-    description "Longitude values";
-  }
-  
-   typedef Altitude  {
-    type decimal64 {
-      fraction-digits 6;
-    }
-    units "meters";
-    description
-      "Height from a reference 0 value.";  
-  }
-
-  grouping AntennaFunctionGrp {
-    description "Represents the AntennaFunction.";
-    uses mf3gpp:ManagedFunctionGrp;
-
-    leaf beamTilt {
-      description "The beam tilt of the wanted antenna beam 
-        in the vertical plane. A positive value on the 
-        beamtilt indicates an antenna beam direction below the 
-        vertical plane.";
-      units degree;
-      type TenthOfDegrees;
-    }
-
-    leaf bearing {
-      description "The bearing in degrees that the antenna is pointing in.
-        AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463.";
-      reference "3GPP TS 25.463, UTRAN Iuant interface: 
-        Remote Electrical Tilting (RET)
-        antennas Application Part (RETAP) signalling";
-      type TenthOfDegrees;
-    }
-
-    leaf elevation {
-      description "The elevation the antenna function should have, 
-         based on World Geodetic System (1984 version) global 
-         reference frame (WGS 84). Positive values correspond to 
-         meters above sea level, negative values correspond to meters 
-         below sea level. If empty, value is not defined.";
-      type Altitude;
-    }
-    
-    leaf horizBeamWidth {
-      description "The 3 dB power beamwidth of the antenna pattern 
-        in the horizontal plane. 
-        A value of 360 indicates an omnidirectional antenna.
-        Note: The value of this attribute has no operational impact 
-        on the network, e.g. the NE behaviour is not affected by the 
-        value setting of this attribute. 
-        Note as well that this attribute is not supported over the 
-        Iuant interface according to 3GPP TS37.466.
-        A single integral value corresponding to an angle in degrees 
-        between 0 and 360.";
-      reference "3GPP TS 37.466, Iuant interface: Application part";
-      type TenthOfDegrees;
-    }
-
-    leaf latitude {
-      description "Latitude of transmitter antenna position.
-        Positive value means north, negative value means south.
-        
-        Specification: WGS 84
-        Allowed Values: { -90.000000..90.000000 }";
-      units degree;
-      type Latitude;
-    }
-
-    leaf longititude {
-      description "Longitude of transmitter antenna position.
-        Positive value means east, negative value means west.
-        Specification: WGS 84
-        Allowed Values: { -180.000000..180.000000 }";
-      units degree;
-      type Longitude;
-    } 
-
-    leaf maxAzimuthValue {
-      description "The maximum amount of change of azimuth the RET
-        system can support. This is the change in degrees clockwise 
-        from bearing.
-        Note: The value of this attribute has no operational impact 
-        on the network, e.g. the NE behaviour is not affected by the 
-        value setting of this attribute. 
-        Note as well that this attribute is not supported over the 
-        Iuant interface according to Ref. 3GPP TS 37.466.
-        A single decimal value corresponding to an angle in degrees 
-        between 0 and 360 with a resolution of 0.1 degrees.";
-      reference "3GPP TS 37.466, Iuant interface: Application part";
-      units degree;
-      type decimal64 {
-        range "0..360"; 
-        fraction-digits 1;
-      }
-    }
-    leaf minAzimuthValue {
-      description "The minimum amount of change of azimuth the RET
-        system can support. This is the change in degrees clockwise 
-        from bearing.
-        Note: The value of this attribute has no operational impact 
-        on the network, e.g. the NE behaviour is not affected by the 
-        value setting of this attribute. 
-        Note as well that this attribute is not supported over the 
-        Iuant interface according to Ref. 3GPP TS 37.466.
-        A single decimal value corresponding to an angle in degrees 
-        between 0 and 360 with a resolution of 0.1 degrees.";
-      reference "3GPP TS 37.466, Iuant interface: Application part";
-      units degree;
-      type decimal64 {
-        range "0..360"; 
-        fraction-digits 1;
-      }
-    }
-    
-    leaf-list referencedBy {
-      description "This attribute contains the DNs of one or more objects 
-        that refer to this object.
-        
-        In the case of  AntennaFunction,  these referring objects may 
-        include DNs of SectorEquipmentFunction instances if associations 
-        between them and the AntennaFunction exist.
-        
-        Note: referencedBy is a DN datatype and so can reference an MOI 
-        under a different ME";
-      config false;
-      type types3gpp:DistinguishedName;
-    }
-
-
-    leaf retGroupName {
-      description "The group name is a textual, alpha-numeric string to
-        define a logical grouping of antennas which may be in different cells.
-        
-        This attribute permits the definition of a logical grouping
-        of the antennas. This may be defined either at
-        installation time, or by management activity";
-      type string;
-    }
-
-    leaf retTiltValue {
-      description "The electrical tilt setting of the antenna, \"Tilt value\" in 
-        3GPP TS 37.466.";
-      reference "3GPP TS 37.466, Iuant interface: Application part";
-      type TenthOfDegrees;
-    }
-
-    leaf vertBeamWidth {
-      description "The 3 dB power beamwidth of the antenna pattern in 
-        the vertical plane.
-        The value of this attribute has no operational impact on
-        the network, e.g. the NE behaviour is not affected by the
-        value setting of this attribute.
-        This attribute is not supported over the Iuant interface
-        according to Ref. 3GPP TS 37.466.";
-      reference "3GPP TS 37.466, Iuant interface: Application part";
-      units degree;
-      type uint32 {
-        range "0..180";
-      }
-    }
-  }
-
-  augment "/me3gpp:ManagedElement" {
-
-    list AntennaFunction {
-      key id;
-      uses top3gpp:Top_Grp;
-      description "This MOI represents an array of radiating elements that
-         may be tilted to adjust the RF coverage of a cell(s).";
-      
-      container attributes {
-        uses AntennaFunctionGrp;
-      }
-      uses mf3gpp:ManagedFunctionContainedClasses;
-    }
-  }
-}
+module _3gpp-nr-nrm-antennafunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-antennafunction";
+  prefix "antfunc3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the Antenna Function Information
+    Object Class (IOC) that is part of the Generic Network Resource Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-08-18 { reference "CR1578"; }
+  revision 2025-05-04 { reference "Initial revision"; }
+
+  typedef TenthOfDegrees { 
+    type uint16 { 
+      range 0..3600; 
+    }
+    units "0.1 degrees";
+    description "A single integral value corresponding to an angle in degrees 
+      between 0 and 360 with a resolution of 0.1 degrees.";
+  }
+
+  typedef Latitude {
+    type decimal64 {
+      fraction-digits 4;
+      range "-90.0000..+90.0000"; 
+    }
+    description "Latitude values";
+  }
+
+  typedef Longitude {
+    type decimal64 {
+      fraction-digits 4;
+      range "-180.0000..+180.0000"; 
+    }
+    description "Longitude values";
+  }
+  
+   typedef Altitude  {
+    type decimal64 {
+      fraction-digits 6;
+    }
+    units "meters";
+    description
+      "Height from a reference 0 value.";  
+  }
+
+  grouping AntennaFunctionGrp {
+    description "Represents the AntennaFunction.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    leaf beamTilt {
+      description "The beam tilt of the wanted antenna beam 
+        in the vertical plane. A positive value on the 
+        beamtilt indicates an antenna beam direction below the 
+        vertical plane.";
+      units degree;
+      type TenthOfDegrees;
+    }
+
+    leaf bearing {
+      description "The bearing in degrees that the antenna is pointing in.
+        AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463.";
+      reference "3GPP TS 25.463, UTRAN Iuant interface: 
+        Remote Electrical Tilting (RET)
+        antennas Application Part (RETAP) signalling";
+      type TenthOfDegrees;
+    }
+
+    leaf elevation {
+      description "The elevation the antenna function should have, 
+         based on World Geodetic System (1984 version) global 
+         reference frame (WGS 84). Positive values correspond to 
+         meters above sea level, negative values correspond to meters 
+         below sea level. If empty, value is not defined.";
+      type Altitude;
+    }
+    
+    leaf horizBeamWidth {
+      description "The 3 dB power beamwidth of the antenna pattern 
+        in the horizontal plane. 
+        A value of 360 indicates an omnidirectional antenna.
+        Note: The value of this attribute has no operational impact 
+        on the network, e.g. the NE behaviour is not affected by the 
+        value setting of this attribute. 
+        Note as well that this attribute is not supported over the 
+        Iuant interface according to 3GPP TS37.466.
+        A single integral value corresponding to an angle in degrees 
+        between 0 and 360.";
+      reference "3GPP TS 37.466, Iuant interface: Application part";
+      type TenthOfDegrees;
+    }
+
+    leaf latitude {
+      description "Latitude of transmitter antenna position.
+        Positive value means north, negative value means south.
+        
+        Specification: WGS 84
+        Allowed Values: { -90.000000..90.000000 }";
+      units degree;
+      type Latitude;
+    }
+
+    leaf longititude {
+      description "Longitude of transmitter antenna position.
+        Positive value means east, negative value means west.
+        Specification: WGS 84
+        Allowed Values: { -180.000000..180.000000 }";
+      units degree;
+      type Longitude;
+    } 
+
+    leaf maxAzimuthValue {
+      description "The maximum amount of change of azimuth the RET
+        system can support. This is the change in degrees clockwise 
+        from bearing.
+        Note: The value of this attribute has no operational impact 
+        on the network, e.g. the NE behaviour is not affected by the 
+        value setting of this attribute. 
+        Note as well that this attribute is not supported over the 
+        Iuant interface according to Ref. 3GPP TS 37.466.
+        A single decimal value corresponding to an angle in degrees 
+        between 0 and 360 with a resolution of 0.1 degrees.";
+      reference "3GPP TS 37.466, Iuant interface: Application part";
+      units degree;
+      type decimal64 {
+        range "0..360"; 
+        fraction-digits 1;
+      }
+    }
+    leaf minAzimuthValue {
+      description "The minimum amount of change of azimuth the RET
+        system can support. This is the change in degrees clockwise 
+        from bearing.
+        Note: The value of this attribute has no operational impact 
+        on the network, e.g. the NE behaviour is not affected by the 
+        value setting of this attribute. 
+        Note as well that this attribute is not supported over the 
+        Iuant interface according to Ref. 3GPP TS 37.466.
+        A single decimal value corresponding to an angle in degrees 
+        between 0 and 360 with a resolution of 0.1 degrees.";
+      reference "3GPP TS 37.466, Iuant interface: Application part";
+      units degree;
+      type decimal64 {
+        range "0..360"; 
+        fraction-digits 1;
+      }
+    }
+    
+    leaf-list referencedBy {
+      description "This attribute contains the DNs of one or more objects 
+        that refer to this object.
+        
+        In the case of  AntennaFunction,  these referring objects may 
+        include DNs of SectorEquipmentFunction instances if associations 
+        between them and the AntennaFunction exist.
+        
+        Note: referencedBy is a DN datatype and so can reference an MOI 
+        under a different ME";
+      config false;
+      type types3gpp:DistinguishedName;
+    }
+
+
+    leaf retGroupName {
+      description "The group name is a textual, alpha-numeric string to
+        define a logical grouping of antennas which may be in different cells.
+        
+        This attribute permits the definition of a logical grouping
+        of the antennas. This may be defined either at
+        installation time, or by management activity";
+      type string;
+    }
+
+    leaf retTiltValue {
+      description "The electrical tilt setting of the antenna, \"Tilt value\" in 
+        3GPP TS 37.466.";
+      reference "3GPP TS 37.466, Iuant interface: Application part";
+      type TenthOfDegrees;
+    }
+
+    leaf vertBeamWidth {
+      description "The 3 dB power beamwidth of the antenna pattern in 
+        the vertical plane.
+        The value of this attribute has no operational impact on
+        the network, e.g. the NE behaviour is not affected by the
+        value setting of this attribute.
+        This attribute is not supported over the Iuant interface
+        according to Ref. 3GPP TS 37.466.";
+      reference "3GPP TS 37.466, Iuant interface: Application part";
+      units degree;
+      type uint32 {
+        range "0..180";
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+
+    list AntennaFunction {
+      key id;
+      uses top3gpp:Top_Grp;
+      description "This MOI represents an array of radiating elements that
+         may be tilted to adjust the RF coverage of a cell(s).";
+      
+      container attributes {
+        uses AntennaFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
index 3b5f03527..7f876b24f 100644
--- a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
@@ -1,89 +1,89 @@
-module _3gpp-common-sectorequipmentfunction {
-  yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-sectorequipmentfunction";
-  prefix "scteqpfun3gpp";
-
-  import _3gpp-common-yang-types { prefix types3gpp; }
-  import _3gpp-common-managed-function { prefix mf3gpp; }
-  import _3gpp-common-managed-element { prefix me3gpp; }
-  import _3gpp-common-top { prefix top3gpp; }
-
-  organization "3GPP SA5";
-  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "Defines the YANG mapping of the Sector Equipment Function 
-    Information Object Class (IOC) that is part of the Generic Network Resource
-    Model (NRM).
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
-    TTA, TTC). All rights reserved.";
-    reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
-
-  revision 2025-08-18 { reference "CR1578"; }
-  revision 2025-05-04 { reference "Initial revision"; }
-
-  grouping SectorEquipmentFunctionGrp {
-    description "Represents the SectorEquipmentFunction.";
-    uses mf3gpp:ManagedFunctionGrp;
-    
-    leaf confOutputPower {
-      description "It defines the allowed total power to use for all
-        cells together in this sector. 
-        It may be set by the operator and/or limited by HW limitation 
-        or licensed power, e.g.: 20, 40, 60, 80,120 watts";
-      type uint32;
-      }
-      
-    leaf-list fqBandList {
-      description "The list of frequency bands/ranges supported by the
-      hardware associated with the SectorEquipmentFunction. The 
-      earfcnDl and earfcnUl or earfcn of cells associated with the 
-      SectorEquipmentFunction must be assigned one of the specified
-      frequency range values within the supported range.
-      
-      Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), 
-      36.104 (E-UTRA) and 38.104 (NR).
-      
-      AllowedValues:
-      Operating band id or supported frequency tuple 
-      <UL,DL,mode> expressed as a string.
-      
-      Examples for NR:
-      Bands:  {'n1', 'n12'}
-      Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}";
-      config false;
-      type string;
-    }
-
-    leaf-list referencedBy {
-      description "This attribute contains the DNs of one or more objects 
-        that refer to this object.
-        
-        In the case of SectorEquipmentFunction , these referring objects
-        may include Cells, NRSectorCarriers if associations between them
-        and the SectorEquipmentFunction exist.
-        
-        Note: referencedBy is a DN datatype and so can reference an MOI
-        under a different ME";
-      config false;
-    type types3gpp:DistinguishedName;
-    }
-  }
-  
-  augment "/me3gpp:ManagedElement" {
-    list SectorEquipmentFunction {
-      key id;
-      uses top3gpp:Top_Grp;
-      description "This IOC represents a set of cells within a geographical
-        area that has common functions relating to AntennaFunction, TMAFunction
-        and supporting equipment, such as power amplifier.";
-        
-      must 'id != ""' {
-        error-message "Empty id value is not allowed.";
-      }
-      
-      container attributes {
-        uses SectorEquipmentFunctionGrp;
-        }
-      uses mf3gpp:ManagedFunctionContainedClasses;
-      }
-}
+module _3gpp-common-sectorequipmentfunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-sectorequipmentfunction";
+  prefix "scteqpfun3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the Sector Equipment Function 
+    Information Object Class (IOC) that is part of the Generic Network Resource
+    Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+    reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-08-18 { reference "CR1578"; }
+  revision 2025-05-04 { reference "Initial revision"; }
+
+  grouping SectorEquipmentFunctionGrp {
+    description "Represents the SectorEquipmentFunction.";
+    uses mf3gpp:ManagedFunctionGrp;
+    
+    leaf confOutputPower {
+      description "It defines the allowed total power to use for all
+        cells together in this sector. 
+        It may be set by the operator and/or limited by HW limitation 
+        or licensed power, e.g.: 20, 40, 60, 80,120 watts";
+      type uint32;
+      }
+      
+    leaf-list fqBandList {
+      description "The list of frequency bands/ranges supported by the
+      hardware associated with the SectorEquipmentFunction. The 
+      earfcnDl and earfcnUl or earfcn of cells associated with the 
+      SectorEquipmentFunction must be assigned one of the specified
+      frequency range values within the supported range.
+      
+      Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), 
+      36.104 (E-UTRA) and 38.104 (NR).
+      
+      AllowedValues:
+      Operating band id or supported frequency tuple 
+      <UL,DL,mode> expressed as a string.
+      
+      Examples for NR:
+      Bands:  {'n1', 'n12'}
+      Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}";
+      config false;
+      type string;
+    }
+
+    leaf-list referencedBy {
+      description "This attribute contains the DNs of one or more objects 
+        that refer to this object.
+        
+        In the case of SectorEquipmentFunction , these referring objects
+        may include Cells, NRSectorCarriers if associations between them
+        and the SectorEquipmentFunction exist.
+        
+        Note: referencedBy is a DN datatype and so can reference an MOI
+        under a different ME";
+      config false;
+    type types3gpp:DistinguishedName;
+    }
+  }
+  
+  augment "/me3gpp:ManagedElement" {
+    list SectorEquipmentFunction {
+      key id;
+      uses top3gpp:Top_Grp;
+      description "This IOC represents a set of cells within a geographical
+        area that has common functions relating to AntennaFunction, TMAFunction
+        and supporting equipment, such as power amplifier.";
+        
+      must 'id != ""' {
+        error-message "Empty id value is not allowed.";
+      }
+      
+      container attributes {
+        uses SectorEquipmentFunctionGrp;
+        }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+      }
+}
 }
\ No newline at end of file
-- 
GitLab


From 15a6284efed2d971c75fb0b964557121097fdcb4 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 14 Aug 2025 18:24:20 +0000
Subject: [PATCH 05/12] Update file _3gpp-nr-nrm-sectorequipmentfunction.yang

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

diff --git a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
index 7f876b24f..e71ac8c37 100644
--- a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
@@ -1,4 +1,4 @@
-module _3gpp-common-sectorequipmentfunction {
+module _3gpp-nr-nrm-sectorequipmentfunction {
   yang-version 1.1;
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-sectorequipmentfunction";
   prefix "scteqpfun3gpp";
-- 
GitLab


From 0bb9351288e867532d641a89966bb32f08d675f3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 15 Aug 2025 16:09:32 +0000
Subject: [PATCH 06/12] Edit _3gpp-nr-nrm-sectorequipmentfunction.yang

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

diff --git a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
index e71ac8c37..9f35f7529 100644
--- a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
@@ -1,7 +1,7 @@
 module _3gpp-nr-nrm-sectorequipmentfunction {
   yang-version 1.1;
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-sectorequipmentfunction";
-  prefix "scteqpfun3gpp";
+  prefix "scteqp3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
@@ -85,5 +85,5 @@ module _3gpp-nr-nrm-sectorequipmentfunction {
         }
       uses mf3gpp:ManagedFunctionContainedClasses;
       }
-}
+  }
 }
\ No newline at end of file
-- 
GitLab


From 2f93f09aff87773ede05ac53292ddbeef065c65c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 15 Aug 2025 16:10:20 +0000
Subject: [PATCH 07/12] Edit _3gpp-nr-nrm-antennafunction.yang

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

diff --git a/yang-models/_3gpp-nr-nrm-antennafunction.yang b/yang-models/_3gpp-nr-nrm-antennafunction.yang
index e1e1de786..c60f081d0 100644
--- a/yang-models/_3gpp-nr-nrm-antennafunction.yang
+++ b/yang-models/_3gpp-nr-nrm-antennafunction.yang
@@ -1,7 +1,7 @@
 module _3gpp-nr-nrm-antennafunction {
   yang-version 1.1;
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-antennafunction";
-  prefix "antfunc3gpp";
+  prefix "ant3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
-- 
GitLab


From 7bca2a2924cddd686af77c1cfac5dfc958c73c4e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 26 Aug 2025 09:08:26 +0000
Subject: [PATCH 08/12] Update 4 files

- /yang-models/_3gpp-nr-nrm-antennafunction.yang
- /yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
- /yang-models/_3gpp-common-antennafunction.yang
- /yang-models/_3gpp-common-sectorequipmentfunction.yang
---
 ...antennafunction.yang => _3gpp-common-antennafunction.yang} | 3 ++-
 ...unction.yang => _3gpp-common-sectorequipmentfunction.yang} | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename yang-models/{_3gpp-nr-nrm-antennafunction.yang => _3gpp-common-antennafunction.yang} (98%)
 rename yang-models/{_3gpp-nr-nrm-sectorequipmentfunction.yang => _3gpp-common-sectorequipmentfunction.yang} (96%)

diff --git a/yang-models/_3gpp-nr-nrm-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang
similarity index 98%
rename from yang-models/_3gpp-nr-nrm-antennafunction.yang
rename to yang-models/_3gpp-common-antennafunction.yang
index c60f081d0..80d3324e9 100644
--- a/yang-models/_3gpp-nr-nrm-antennafunction.yang
+++ b/yang-models/_3gpp-common-antennafunction.yang
@@ -1,6 +1,6 @@
 module _3gpp-nr-nrm-antennafunction {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-antennafunction";
+  namespace "urn:3gpp:sa5:_3gpp-common-antennafunction";
   prefix "ant3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
@@ -14,6 +14,7 @@ module _3gpp-nr-nrm-antennafunction {
     Object Class (IOC) that is part of the Generic Network Resource Model (NRM).
     Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
   revision 2025-08-18 { reference "CR1578"; }
diff --git a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang
similarity index 96%
rename from yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
rename to yang-models/_3gpp-common-sectorequipmentfunction.yang
index 9f35f7529..947d53069 100644
--- a/yang-models/_3gpp-nr-nrm-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang
@@ -15,7 +15,9 @@ module _3gpp-nr-nrm-sectorequipmentfunction {
     Model (NRM).
     Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
-    reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+  
+  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
   revision 2025-08-18 { reference "CR1578"; }
   revision 2025-05-04 { reference "Initial revision"; }
-- 
GitLab


From e1e29c07f7ff97a72614f1086e02d955018a80f9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 26 Aug 2025 09:10:33 +0000
Subject: [PATCH 09/12] Update file _3gpp-common-sectorequipmentfunction.yang

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

diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang
index 947d53069..6c10ca750 100644
--- a/yang-models/_3gpp-common-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang
@@ -1,6 +1,6 @@
 module _3gpp-nr-nrm-sectorequipmentfunction {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-sectorequipmentfunction";
+  namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction";
   prefix "scteqp3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
-- 
GitLab


From f0735b7d56bb5d7c99ef34109e3be809dc55087e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 26 Aug 2025 09:12:21 +0000
Subject: [PATCH 10/12] Update 2 files

- /yang-models/_3gpp-common-antennafunction.yang
- /yang-models/_3gpp-common-sectorequipmentfunction.yang
---
 yang-models/_3gpp-common-antennafunction.yang         | 2 +-
 yang-models/_3gpp-common-sectorequipmentfunction.yang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang
index 80d3324e9..f2cd51400 100644
--- a/yang-models/_3gpp-common-antennafunction.yang
+++ b/yang-models/_3gpp-common-antennafunction.yang
@@ -1,4 +1,4 @@
-module _3gpp-nr-nrm-antennafunction {
+module _3gpp-common-antennafunction {
   yang-version 1.1;
   namespace "urn:3gpp:sa5:_3gpp-common-antennafunction";
   prefix "ant3gpp";
diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang
index 6c10ca750..ac9d90b42 100644
--- a/yang-models/_3gpp-common-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang
@@ -1,4 +1,4 @@
-module _3gpp-nr-nrm-sectorequipmentfunction {
+module _3gpp-common-sectorequipmentfunction {
   yang-version 1.1;
   namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction";
   prefix "scteqp3gpp";
-- 
GitLab


From 1762e39bb2a794f3648c9714ae0ccd10adedb429 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 26 Aug 2025 09:13:53 +0000
Subject: [PATCH 11/12] Update 2 files

- /yang-models/_3gpp-common-antennafunction.yang
- /yang-models/_3gpp-common-sectorequipmentfunction.yang
---
 yang-models/_3gpp-common-antennafunction.yang         | 4 ++--
 yang-models/_3gpp-common-sectorequipmentfunction.yang | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang
index f2cd51400..6c407c363 100644
--- a/yang-models/_3gpp-common-antennafunction.yang
+++ b/yang-models/_3gpp-common-antennafunction.yang
@@ -14,8 +14,8 @@ module _3gpp-common-antennafunction {
     Object Class (IOC) that is part of the Generic Network Resource Model (NRM).
     Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
-  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)";
-  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)
+     3GPP TS 28.541 5G Network Resource Model (NRM)";
 
   revision 2025-08-18 { reference "CR1578"; }
   revision 2025-05-04 { reference "Initial revision"; }
diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang
index ac9d90b42..4ef7d2d05 100644
--- a/yang-models/_3gpp-common-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang
@@ -16,8 +16,9 @@ module _3gpp-common-sectorequipmentfunction {
     Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   
-  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)";
-  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)
+     3GPP TS 28.541 5G Network Resource Model (NRM)";
+
 
   revision 2025-08-18 { reference "CR1578"; }
   revision 2025-05-04 { reference "Initial revision"; }
-- 
GitLab


From 987f93cbc81a6fab7fb9b3ea49b8cc2bdc2c468b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 28 Aug 2025 09:35:06 +0000
Subject: [PATCH 12/12] Update 4 files

- /yang-models/_3gpp-common-antennafunction.yang
- /yang-models/_3gpp-common-sectorequipmentfunction.yang
- /yang-models/_3gpp-eqp-antennafunction.yang
- /yang-models/_3gpp-eqp-sectorequipmentfunction.yang
---
 ...on-antennafunction.yang => _3gpp-eqp-antennafunction.yang} | 4 ++--
 ...ntfunction.yang => _3gpp-eqp-sectorequipmentfunction.yang} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename yang-models/{_3gpp-common-antennafunction.yang => _3gpp-eqp-antennafunction.yang} (98%)
 rename yang-models/{_3gpp-common-sectorequipmentfunction.yang => _3gpp-eqp-sectorequipmentfunction.yang} (96%)

diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-eqp-antennafunction.yang
similarity index 98%
rename from yang-models/_3gpp-common-antennafunction.yang
rename to yang-models/_3gpp-eqp-antennafunction.yang
index 6c407c363..900034d18 100644
--- a/yang-models/_3gpp-common-antennafunction.yang
+++ b/yang-models/_3gpp-eqp-antennafunction.yang
@@ -1,6 +1,6 @@
-module _3gpp-common-antennafunction {
+module _3gpp-eqp-antennafunction {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-common-antennafunction";
+  namespace "urn:3gpp:sa5:_3gpp-eqp-antennafunction";
   prefix "ant3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-eqp-sectorequipmentfunction.yang
similarity index 96%
rename from yang-models/_3gpp-common-sectorequipmentfunction.yang
rename to yang-models/_3gpp-eqp-sectorequipmentfunction.yang
index 4ef7d2d05..1bc6d182e 100644
--- a/yang-models/_3gpp-common-sectorequipmentfunction.yang
+++ b/yang-models/_3gpp-eqp-sectorequipmentfunction.yang
@@ -1,6 +1,6 @@
-module _3gpp-common-sectorequipmentfunction {
+module _3gpp-eqp-sectorequipmentfunction {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction";
+  namespace "urn:3gpp:sa5:_3gpp-eqp-sectorequipmentfunction";
   prefix "scteqp3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
-- 
GitLab