From fad7122fdd0d7769fe510c47c328f8cef7d43958 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 25 Mar 2025 23:37:04 +0100 Subject: [PATCH 001/100] removed invariant from attribute comments --- yang-models/_3gpp-common-fm.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 223ea0033..7b0159238 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-03-24 { reference CR-0025; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; reference CR-0008 ; @@ -103,12 +104,14 @@ module _3gpp-common-fm { type yang:date-and-time; config false; mandatory true; + yext3gpp:inVariant; description "Date and Time the comment was created."; } leaf commentUserId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the user who made the comment."; } @@ -116,6 +119,7 @@ module _3gpp-common-fm { leaf commentSystemId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the system ( Management System) from which the comment is made. That system supports the user that made the comment."; @@ -124,6 +128,7 @@ module _3gpp-common-fm { leaf commentText { type string; mandatory true; + yext3gpp:inVariant; description "It carries the textual comment."; } } @@ -382,7 +387,6 @@ module _3gpp-common-fm { } list comments { - yext3gpp:inVariant; yext3gpp:notNotifyable; description "List of comments and data about the comments."; key idx; -- GitLab From 5e9592156a154037929ecf1cd7ce24bcbe6235f8 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Mar 2025 00:06:47 +0100 Subject: [PATCH 002/100] corrected spelling of MeContext --- yang-models/_3gpp-common-mecontext.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index ed183f1a7..b1a261872 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -24,6 +24,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { @@ -39,7 +40,7 @@ module _3gpp-common-mecontext { } augment "/subnet3gpp:SubNetwork" { - list Mecontext { + 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. -- GitLab From 5d27b33558fb66c5051957abb0a181ac3a5ac5d9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Mar 2025 02:26:42 +0100 Subject: [PATCH 003/100] corrected containment of dynamic5qiset --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 12ef3c65c..4eaa13bfd 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -6,6 +6,9 @@ module _3gpp-5gc-nrm-dynamic5qiset { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; } organization "3gpp SA5"; @@ -16,6 +19,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-24 { reference CR-1488 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-01-07 { reference CR-0643; } @@ -52,11 +56,41 @@ module _3gpp-5gc-nrm-dynamic5qiset { } } + feature Dynamic5QISetUnderSubNetwork { + description "Dynamic5QISet shall be contained under SubNetwork."; + } augment "/subnet3gpp:SubNetwork" { + if-feature Dynamic5QISetUnderSubNetwork; uses Dynamic5QISetSubtree; } + feature Dynamic5QISetUnderManagedElement { + description "Dynamic5QISet shall be contained under ManagedElement."; + } augment "/me3gpp:ManagedElement" { + if-feature Dynamic5QISetUnderManagedElement; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBDUFunction { + description "Dynamic5QISet shall be contained under GNBDUFunction."; + } + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { + if-feature Dynamic5QISetUnderGNBDUFunction; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUCPFunction { + description "Dynamic5QISet shall be contained under GNBCUCPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUUPFunction { + description "Dynamic5QISet shall be contained under GNBCUUPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { uses Dynamic5QISetSubtree; } } \ No newline at end of file -- GitLab From 11f25a915d7538e3d4b1ef6ffd3c628d0b909edd Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 20:52:02 +0100 Subject: [PATCH 004/100] added invarin for dnprefix --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 ++ yang-models/_3gpp-common-managed-element.yang | 5 ++++- yang-models/_3gpp-common-mecontext.yang | 5 ++++- yang-models/_3gpp-common-subnetwork.yang | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 4eaa13bfd..a92687b76 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -84,6 +84,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { description "Dynamic5QISet shall be contained under GNBCUCPFunction."; } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + if-feature Dynamic5QISetUnderGNBCUCPFunction; uses Dynamic5QISetSubtree; } @@ -91,6 +92,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { description "Dynamic5QISet shall be contained under GNBCUUPFunction."; } augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { + if-feature Dynamic5QISetUnderGNBCUUPFunction; uses Dynamic5QISetSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index eaa8dbdb7..74c55b00e 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -4,6 +4,7 @@ module _3gpp-common-managed-element { prefix "me3gpp"; import _3gpp-common-yang-types { prefix types3gpp ; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -19,7 +20,7 @@ module _3gpp-common-managed-element { description "Defines ManagedElement which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -34,6 +35,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-03-24 { reference "CR-0517"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -141,6 +143,7 @@ module _3gpp-common-managed-element { A Distingushed Name(DN) is defined by 3GPP TS 32.300, which splits the DN into a DN Prefix and Local DN"; type types3gpp:DistinguishedName; + yext3gpp:inVariant; } leaf userLabel { diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index b1a261872..0f4adc741 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -4,6 +4,7 @@ module _3gpp-common-mecontext { prefix "mectx3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import ietf-yang-schema-mount { prefix yangmnt; } @@ -12,7 +13,7 @@ module _3gpp-common-mecontext { 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, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,6 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-24 { reference "CR-0517"; } revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } @@ -32,6 +34,7 @@ module _3gpp-common-mecontext { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; 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."; diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 23362b81d..e28091cf6 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -4,6 +4,7 @@ module _3gpp-common-subnetwork { prefix "subnet3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -19,7 +20,7 @@ module _3gpp-common-subnetwork { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -34,6 +35,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-03-24 { reference "CR-0517"; } revision 2024-08-18 { reference CR-1336 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -152,6 +154,7 @@ module _3gpp-common-subnetwork { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; reference "Annex C of 32.300 "; } -- GitLab From eb53a9e708831ae709fdf67eeb121bacf113b160 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 23:33:47 +0100 Subject: [PATCH 005/100] small updates --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 +- yang-models/_3gpp-common-mecontext.yang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index a92687b76..0f2d0222b 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -15,7 +15,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the dynamic 5QIs including their QoS characteristics. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 0f4adc741..531eab227 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -25,7 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-03-24 { reference "CR-0517"; } + revision 2025-03-24 { reference "CR-0524"; } revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } -- GitLab From eff655e3cd4e80f44dc9fce9054cebba0f681039 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 28 Mar 2025 21:17:23 +0100 Subject: [PATCH 006/100] updated subsriptioncontrol --- yang-models/_3gpp-common-fm.yang | 2 +- yang-models/_3gpp-common-mecontext.yang | 2 +- .../_3gpp-common-subscription-control.yang | 29 +++++++++++++++---- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 7b0159238..54fda08ed 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,7 +12,7 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 531eab227..df9b7ef0d 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -26,7 +26,7 @@ module _3gpp-common-mecontext { Information Service (IS)"; revision 2025-03-24 { reference "CR-0524"; } - revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } + revision 2025-03-24 { reference "CR-0517 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index b637e1ff5..29ffa4c8f 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -5,12 +5,13 @@ module _3gpp-common-subscription-control { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - + import ietf-yang-types { prefix yang; } + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -18,6 +19,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-03-24 { reference CR-0517 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } @@ -84,11 +86,26 @@ module _3gpp-common-subscription-control { } } case dataNodeSelector { - leaf dataNodeSelector { - type string; + container dataNodeSelector { description "The value shall follow the rules of RFC 8641 filter-spec"; - reference "RFC 8641 section 5."; + reference "RFC 8641 section 5. and ietf-yang-push.yang"; + choice dataNodeSelector { + anydata datastore-subtree-filter { + description "Subtree filter"; + reference + "RFC 6241: Network Configuration Protocol (NETCONF), Section 6"; + } + leaf datastore-xpath-filter { + type yang:xpath1.0; + description "XPath-filter"; + reference + "XML Path Language (XPath) Version 1.0 + (https://www.w3.org/TR/1999/REC-xpath-19991116) + RFC 7950: The YANG 1.1 Data Modeling Language, + Section 10"; + } + } } } } @@ -114,7 +131,7 @@ module _3gpp-common-subscription-control { list scope { description "Scopes (selects) data nodes in an object tree."; key idx; - max-elements 8; + max-elements 1; leaf idx { type string; } uses ScopeGrp; } -- GitLab From d26d42a7ea73390333546833650ac7d042db6b5a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 11 Apr 2025 00:47:11 +0200 Subject: [PATCH 007/100] Update thresholdinfo --- yang-models/_3gpp-common-fm.yang | 180 +++++++++++++++++++++++-------- 1 file changed, 138 insertions(+), 42 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 54fda08ed..16b3a4898 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -133,6 +133,141 @@ module _3gpp-common-fm { } } + grouping ThresholdHysteresisGrp { + description "The ThresholdHysteresis defines the threshold boundaries to + control the hysteresis mechanism. + + The high attribute of ThresholdHysteresis identifies the higher value of + a threshold with hysteris, the integer type is used for counter + thresholds and the float type for gauge thresholds. The low attribute + of ThresholdHysteresis identifies the lower value of a threshold with + hysteresis, applicable only to gauge thresholds."; + + leaf high { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "Higher value of a threshold with hysteris, the integer type + is used for counter thresholds and the float type for gauge + thresholds."; + } + + leaf low { + type decimal64 { + fraction-digits 7; + } + description "Lower value of a threshold with hysteresis, applicable + only to gauge thresholds."; + } + } + + grouping ThresholdLevelIndGrp { + description "The up attribute indicates for counter and gauge thresholds + that the threshold crossing occurred when going up. The down attribute + only indicates for gauge thresholds that the threshold crossing occurred + when going down, applicable only to gauge thresholds."; + + list up { + description "Indicates for counter and gauge thresholds that the + threshold crossing occurred when going up."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + + list down { + description "Indicates for gauge thresholds that the threshold crossing + occurred when going down, applicable only to gauge thresholds."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + } + + grouping ThresholdCrossingGrp { + description "The datatype indicates the crossed threshold + information regardless of the gauge threshold, which represents an + instantaneous value that changes over time, or the counter threshold, + which represents monotonically increasing cumulative quantity. + + The observedMeasurement attribute of TheresholdInfo specifies the name + of the monitored measurement that crossed the threshold and that + caused the notification (Rec. ITU-T X. 733[8]). The observedValue + attribute indicates the value of the gauge or counter which crossed + the threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. Integer values + are used for counters and float values for gauges (Rec. ITU-T X. 733). + Note that a 'number' type property can contain both integers and + floating point numbers. + + For the thresholdLevel attribute, in the case of a gauge, it specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case of + a counter, it specifies only the threshold value (Rec. ITU-T X. 733). + + For the armTime attribute, for a gauge threshold, it specifies the + time at which the threshold was last re-armed, namely the time after + the previous threshold crossing at which the hysteresis value of the + threshold was exceeded thus again permitting generation of + notifications when the threshold is crossed; for a counter threshold, + the later of the time at which the threshold offset was last applied, + or the time at which the counter was last initialized (for resettable + counters) (Rec. ITU-T X. 733)."; + + leaf observedMeasurement { + type string; + mandatory true; + description "The name of the monitored measurement that crossed the + threshold and that caused the notification (Rec. ITU-T X. 733 "; + } + + leaf observedValue { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "The value of the gauge or counter which crossed the + threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. + Integer values are used for counters and float values for gauges + (Rec. ITU-T X. 733). Note that a 'number' type property can contain + both integers and floating point numbers."; + } + + list thresholdLevel { + description "In the case of a gauge the threshold level specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case + of a counter the threshold level specifies only the threshold value + (Rec. ITU-T X. 733)."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdLevelIndGrp; + } + + leaf armTime { + type yang:date-and-time; + description "For a gauge threshold, the time at which the threshold + was last re-armed, namely the time after the previous threshold + crossing at which the hysteresis value of the threshold was + exceeded thus again permitting generation of notifications when the + threshold is crossed. For a counter threshold, the later of the time + at which the threshold offset was last applied, or the time at + which the counter was last initialized (for resettable counters) + (Rec. ITU-T X. 733)"; + } + } + grouping AlarmRecordGrp { description "Contains alarm information of an alarmed object instance. A new record is created in the alarm list when an alarmed object @@ -260,52 +395,13 @@ module _3gpp-common-fm { yext3gpp:notNotifyable; } - grouping ThresholdInfoGrp { - leaf measurementType { - type string; - mandatory true; - } - - leaf direction { - type enumeration { - enum INCREASING; - enum DECREASING; - } - mandatory true; - description " - If it is 'Increasing', the threshold crossing notification is - triggered when the measurement value equals or exceeds a - thresholdValue. - - If it is 'Decreasing', the threshold crossing notification is - triggered when the measurement value equals or below a - thresholdValue."; - } - - leaf thresholdLevel { - type string; - } - - leaf thresholdValue { - type string; - } - - leaf hysteresis { - type string; - description "The hysteresis has a threshold high and a threshold - low value that are different from the threshold value. - A hysteresis, therefore, defines the threshold-high and - threshold-low levels within which the measurementType value is - allowed to oscillate without triggering the threshold crossing - notification."; - } - } - list thresholdInfo { config false ; yext3gpp:notNotifyable; description "Indicates the crossed threshold"; - uses ThresholdInfoGrp; + key idx; + leaf idx { type int32; } + uses ThresholdCrossingGrp; } list stateChangeDefinition { -- GitLab From 68b45f313a530cebe7c6d16abff5047cc64acca6 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 11 Apr 2025 01:11:34 +0200 Subject: [PATCH 008/100] Updated CR numbers as file is same in R18 and R19 --- yang-models/_3gpp-common-fm.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 16b3a4898..308f0dfd6 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,7 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; - revision 2025-03-24 { reference CR-0025; } + revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; reference CR-0008 ; -- GitLab From fe9af48a191f0472fdd75b875a262c25dc2414a9 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 26 Mar 2025 18:55:46 +0000 Subject: [PATCH 009/100] Update _3gpp-nr-nrm-drachoptimizationfunction.yang --- .../_3gpp-nr-nrm-drachoptimizationfunction.yang | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 399bd2bfd..e0eda2492 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-drachoptimizationfunction { description "Defines the YANG mapping of the DRACHOptimizationFunction 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 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-03-28 { reference CR-xxxx ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } @@ -52,7 +53,13 @@ module _3gpp-nr-nrm-drachoptimizationfunction { type TargetProbabilityT; } leaf numberofpreamblessent { - description "This attribute determines the number of preambles sent."; + description "This attribute indicates the number of preambles sent + used to configure a wanted distribution of RACH preambles in a + vendor implemented DRACH optimisation function. + Note: The DRACH optimization function may configure preambleTransMax + as defined in TS 38.331 [54]. The allowed values for preambleTransMax + are 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200 (see 38.331 [54], + subclause 6.3.2)."; mandatory true; type NumberofpreamblessentT; } -- GitLab From 35e2a89ed2f3dac8b92fe5e93b67de500d344ee1 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 20:14:04 +0000 Subject: [PATCH 010/100] Update _3gpp-nr-nrm-drachoptimizationfunction.yang --- yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index e0eda2492..08cb89d88 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-drachoptimizationfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-28 { reference CR-xxxx ; } + revision 2025-03-28 { reference CR-1503 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From 9416d36fa0f5127ebacba432c8b892250ee4e131 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 14 Apr 2025 14:48:38 +0000 Subject: [PATCH 011/100] Edit _3gpp-nr-nrm-drachoptimizationfunction.yang Updated revision date to conform to the rule in 32.160 clause 6.2.1.13 In order to avoid reusing the same revision date in multiple releases, when a new YANG module revision is needed the revision date should be set as follows. Instead of setting the exact revision date when the module was last edited, the date nearest to that day that is not in the future and that follows the rule below should be used. When divided by 6, the day in the date should have the same remainder as the release number: (DAY modulo 6 == releaseNumber modulo 6). --- yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 08cb89d88..cd55b40c5 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-drachoptimizationfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-28 { reference CR-1503 ; } + revision 2025-03-30 { reference CR-1503 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From 411f394e657dc4f66f130317bb8d9ff84f48168a Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 14 Apr 2025 14:56:52 +0000 Subject: [PATCH 012/100] Edit _3gpp-common-subnetwork.yang Adding changes from https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1685 --- yang-models/_3gpp-common-subnetwork.yang | 31 ++++-------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index e28091cf6..e454361ba 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -35,7 +35,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2025-03-24 { reference "CR-0517"; } + revision 2025-03-24 { reference "CR-0517 CR0526"; } revision 2024-08-18 { reference CR-1336 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -211,34 +211,13 @@ module _3gpp-common-subnetwork { list SubNetwork { key id; - description "Represents a set of managed entities"; + description "Represents a set of managed entities + Contained ManagedElements and SubNetworks shall be connected via + YANG Schema-mount."; uses top3gpp:Top_Grp; container attributes { uses SubNetworkGrp; - leaf-list parents { - description "Reference to all containg SubNetwork instances - in strict order from the root subnetwork down to the immediate - parent subnetwork. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetworks. - This reference MUST NOT be present for the top level SubNetwork and - MUST be present for other SubNetworks."; - type leafref { - path "../../../SubNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained SubNetwork instances. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetwork."; - type leafref { - path "../../../SubNetwork/id"; - } - } } uses meas3gpp:MeasurementSubtree { @@ -274,7 +253,7 @@ module _3gpp-common-subnetwork { } yangmnt:mount-point children-of-SubNetwork { - description "Mountpoint for ManagedElement"; + description "Mountpoint for contained ManagedElements and SubNetworks"; reference "RFC8528 YANG Schema Mount"; } -- GitLab From 7b00cc3791ec8b2dfb1325ae674c966500ac3d0a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Apr 2025 19:22:18 +0200 Subject: [PATCH 013/100] Modified some file dates as duplicate dates were used which violates RFC 7950. No functional change. --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 3 +-- yang-models/_3gpp-common-filemanagement.yang | 2 +- yang-models/_3gpp-common-files.yang | 2 +- yang-models/_3gpp-common-subscription-control.yang | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index a4724bf4e..e951d0cf2 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -19,8 +19,7 @@ in 3GPP TS 23.501. TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2023-09-18 { reference CR-1043 ; } - revision 2023-04-26 { reference CR-0916; } + revision 2023-09-24 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-04-10 { reference "S5-202101"; } diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index d9b5afa66..0a78825ae 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -18,7 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2024-11-07 { reference CR-0473 ; } + revision 2024-11-12 { reference CR-0473 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 9317e769f..3a4ba43dc 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -25,7 +25,7 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-05-11 { reference CR-0362 ; } + revision 2024-05-12 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 29ffa4c8f..784cba09c 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -19,7 +19,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-03-24 { reference CR-0517 ; } + revision 2025-03-30 { reference CR-0517 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } -- GitLab From 7085501783803b9373b9c4571fdf52b38673551a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 17:32:49 +0200 Subject: [PATCH 014/100] removed duplicate yext3gpp:inVariant --- 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 b19385705..edb7e7632 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 2025-05-06 { reference "0531" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } revision 2024-11-05 { reference "CR-0470" ; } @@ -1761,7 +1762,6 @@ module _3gpp-common-trace { type string; yext3gpp:inVariant; description "Identifier of a TraceJob"; - yext3gpp:inVariant; } leaf traceReportingFormat { -- GitLab From 72311e221f6491fc8fbd5eb88df55c13bd47288b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 22:56:08 +0200 Subject: [PATCH 015/100] corrected operatorDU and EP_F1C/U containment except externals --- yang-models/_3gpp-nr-nrm-ep.yang | 77 +++++++++--------------- yang-models/_3gpp-nr-nrm-operatordu.yang | 13 +++- 2 files changed, 41 insertions(+), 49 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 927bc49b1..1bad0c7ff 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-ep { description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } @@ -46,16 +47,30 @@ module _3gpp-nr-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_F1CGrp { - description "Represents the EP_F1C IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1CSubtree { + list EP_F1C { + description "Represents the local end point of the control plane + interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } - grouping EP_F1UGrp { - description "Represents the EP_F1U IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1USubtree { + list EP_F1U { + description "Represents the local end point of the user plane + interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } grouping EP_XnCGrp { @@ -114,16 +129,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; - } - } + uses EP_F1CSubtree; list EP_NgC { description "Represents the local end point of the control plane @@ -176,16 +182,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; list EP_NgU { description "Represents the local end point of the NG user plane @@ -236,26 +233,12 @@ module _3gpp-nr-nrm-ep { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { if-feature EPClassesUnderGNBDUFunction; - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the DU and CU or CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; + uses EP_F1CSubtree { + refine EP_F1C { + max-elements 1; } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the DU and CU or CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 98a702b77..f50f7873a 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -7,15 +7,17 @@ module _3gpp-nr-nrm-operatordu { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-nr-nrm-ep { prefix ep3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } @@ -76,7 +78,14 @@ module _3gpp-nr-nrm-operatordu { container attributes { uses OperatorDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; + + uses ep3gpp:EP_F1CSubtree { + refine EP_F1C { + max-elements 1; + } + } + + uses ep3gpp:EP_F1USubtree; } } } \ No newline at end of file -- GitLab From c999fd64ef6a527125c90c124518a62a159f74f7 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:19:46 +0200 Subject: [PATCH 016/100] Remove unneeded nroperatorcelldu --- yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 42afcf248..b4d490fbb 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nroperatorcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } @@ -79,7 +80,6 @@ module _3gpp-nr-nrm-nroperatorcelldu { container attributes { uses NROperatorCellDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; } } } \ No newline at end of file -- GitLab From 5ccba2eb46b0d71695207a11da5bda72855c8f50 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:43:16 +0200 Subject: [PATCH 017/100] removed unneeded idx leaf from NRECMappingRule --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 81519e61c..f971ade81 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -9,11 +9,12 @@ 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 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 ; } + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-12 { reference "CR-1336 CR-1337"; } grouping NRECMappingRuleGrp { description "Represents the unified mapping rule to support Energy Cost Mapping @@ -43,12 +44,16 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NRECMappingRuleSubtree { description "Helps augmenting NRECMappingRule into multiple places."; list NRECMappingRule { - description "The mapping rule."; + description "Represents the unified mapping rule, applicable for the + group of gNBs (within a certain area), for the calculation of the + energy cost (see TS 34.423). + + NRECMappingRule can be name-contained by SubNetwork or ManagedElement. + It applies to all ManagedEntity contained by the parent."; key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type uint32; } container attributes { uses NRECMappingRuleGrp; } -- GitLab From 8fbff1a5abd96c97fe04109060ae8c7aedd92269 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:58:07 +0200 Subject: [PATCH 018/100] corrected DANRManagementFunction --- .../_3gpp-nr-nrm-danrmanagementfunction.yang | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index d0afa896a..884fcadfa 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -3,45 +3,49 @@ module _3gpp-nr-nrm-danrmanagementfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction"; prefix "danrmanagementfunction3gpp"; - import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the DANRManagementFunction IOC + that is part of the NR 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } - grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR function is activated or deactivated."; + description "This attribute determines whether the intra-system ANR + function is activated or deactivated."; type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR function is activated or deactivated."; + description "This attribute determines whether the inter-system ANR + function is activated or deactivated."; type boolean; } - - } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature gnbcucp3gpp:DANRManagementFunction; + list DANRManagementFunction { + description "This IOC contains attributes to support the D-SON function + of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { uses DANRManagementFunctionGrp; + } + } } } \ No newline at end of file -- GitLab From aa48cd8627a967f986f3d93ceeefe21195648a69 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 May 2025 01:41:05 +0900 Subject: [PATCH 019/100] Corrected containments --- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 55 ++++------------ yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 28 +++++--- .../_3gpp-nr-nrm-externalamffunction.yang | 16 ++--- .../_3gpp-nr-nrm-externalenbfunction.yang | 32 +++++++--- .../_3gpp-nr-nrm-externaleutrancell.yang | 35 ++-------- .../_3gpp-nr-nrm-externalgnbcucpfunction.yang | 50 ++++++++++----- .../_3gpp-nr-nrm-externalgnbcuupfunction.yang | 46 ++++++++----- .../_3gpp-nr-nrm-externalgnbdufunction.yang | 58 +++++++++-------- .../_3gpp-nr-nrm-externalnrcellcu.yang | 64 ++++++++++--------- ...3gpp-nr-nrm-externalservinggwfunction.yang | 8 +-- .../_3gpp-nr-nrm-externalupffunction.yang | 12 ++-- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 46 +++++++------ yang-models/_3gpp-nr-nrm-nrnetwork.yang | 39 ++++++----- 13 files changed, 250 insertions(+), 239 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3958b9c1a..2448d72f5 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,61 +3,34 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } 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 EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2023, 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderEUtraNetwork { - description "Classes representing external entities like EUtranFrequency, - ExternalENBFunction are contained under a EUtraNetwork list/class."; - } + revision 2019-06-17 {reference "Initial revision"; } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the EUtraNetwork IOC. + Contains no additiona attributes."; } - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; - leaf-list parents { - description "Reference to all containg EUtraNetwork instances - in strict order from the root EUtraNetwork down to the immediate - parent EUtraNetwork. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetworks. - This reference MUST NOT be present for the top level EUtraNetwork and - MUST be present for other EUtraNetworks."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained EUtraNetwork instances. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetwork."; - type leafref { - path "../../../EUtraNetwork/id"; - } + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; } } } diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 0698485b4..eebe52d4a 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -3,29 +3,29 @@ module _3gpp-nr-nrm-eutranfrequency { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfrequency"; prefix "eutraneteutranfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 EUtranFrequency 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping EUtranFrequencyGrp { description "Represents the EUtranFrequency IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf earfcnDL { description "Specifies the channel number for the central DL frequency."; @@ -51,17 +51,25 @@ module _3gpp-nr-nrm-eutranfrequency { container attributes { uses EUtranFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } + feature ExternalENBFunctionUnderSubNetwork { + description "The ExternalENBFunction shall be contained under SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + if-feature ExternalENBFunctionUnderSubNetwork ; uses EUtranFrequencyWrapper ; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + feature ExternalENBFunctionUnderEUtraNetwork { + description "The ExternalENBFunction shall be contained under EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature ExternalENBFunctionUnderEUtraNetwork; uses EUtranFrequencyWrapper ; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index eb0547390..f74c5d3a0 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -5,26 +5,24 @@ module _3gpp-nr-nrm-externalamffunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalAMFFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalAMFFunctionGrp { description "Represents the ExternalAMFFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { @@ -61,12 +59,6 @@ module _3gpp-nr-nrm-externalamffunction { } augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalAMFFunctionWrapper; - } - - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalAMFFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index cdb1611c4..ed8cb6683 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -4,24 +4,27 @@ module _3gpp-nr-nrm-externalenbfunction { prefix "extenb3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + import _3gpp-nr-nrm-externaleutrancell { prefix exteutrancell3gpp; } 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 ExternalENBFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalENBFunctionGrp { description "Represets the ExternalENBFunction IOC."; @@ -48,16 +51,29 @@ module _3gpp-nr-nrm-externalenbfunction { uses ExternalENBFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree; + uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree; } } + feature ExternalENBFunctionUnderSubNetwork { + description "The ExternalENBFunction shall be contained under + SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + if-feature ExternalENBFunctionUnderSubNetwork ; uses ExternalENBFunctionWrapper; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + feature ExternalENBFunctionUnderEUtraNetwork { + description "The ExternalENBFunction shall be contained under + EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature ExternalENBFunctionUnderEUtraNetwork; uses ExternalENBFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index d3306bc8c..2a5ff1f39 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -5,25 +5,22 @@ module _3gpp-nr-nrm-externaleutrancell { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } - import _3gpp-nr-nrm-externalenbfunction { prefix extenb3gpp; } 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 ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalEUtranGenericCellGrp { description "Represents the ExternalEUtranGenericCell IOC."; @@ -106,7 +103,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellFDDWrapper { + grouping ExternalEUtranCellFDDSubtree { list ExternalEUtranCellFDD { description "Represents the common properties of external E-UTRAN FDD cell provided by eNB or NG-RAN FDD cell provided by ng-eNB."; @@ -120,7 +117,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellTDDWrapper { + grouping ExternalEUtranCellTDDSubtree { list ExternalEUtranCellTDD { description "Represents the common properties of external E-UTRAN cell TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB."; @@ -133,24 +130,4 @@ module _3gpp-nr-nrm-externaleutrancell { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellTDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellTDDWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index 6c295a404..b32301bde 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -5,40 +5,44 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; } 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 ExternalGNBCUCPFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUCPFunctionGrp { description "Represets the ExternalGNBCUCPFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } @@ -57,23 +61,35 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { list ExternalGNBCUCPFunction { description "Represents the properties, known by the management function, of a GNBCUCPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses ExternalGNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses extnrcellcu3gpp:ExternalNRCellCUSubtree; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUCPFunctionWrapper; + feature ExternalGNBCUCPFunctionUnderNRNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + NRNetwork"; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUCPFunctionUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } -} + + feature ExternalGNBCUCPFunctionUnderSubNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUCPFunctionUnderSubNetwork ; + uses ExternalGNBCUCPFunctionWrapper; + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 2445a1e99..7948b9167 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -4,11 +4,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { prefix "extgnbcuup3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). @@ -16,11 +19,10 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUUPFunctionGrp { description "Represets the ExternalGNBCUUPFunction IOC."; @@ -28,26 +30,27 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } } - grouping ExternalGNBCUUPFunctionWrapper { + grouping ExternalGNBCUUPFunctionSubtree { list ExternalGNBCUUPFunction { description "Represents the properties, known by the management function, of a GNBCUUPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -57,13 +60,24 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderNRNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUUPFunctionUnderNRNetwork; + uses ExternalGNBCUUPFunctionSubtree; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderSubNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUUPFunctionUnderSubNetwork ; + uses ExternalGNBCUUPFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 064b98db3..e8dc9d6c6 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -3,26 +3,27 @@ module _3gpp-nr-nrm-externalgnbdufunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbdufunction"; prefix "extgnbdu3gpp"; - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 ExternalGNBDUFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBDUFunctionGrp { description "Represets the ExternalGNBDUFunction IOC."; @@ -30,36 +31,28 @@ module _3gpp-nr-nrm-externalgnbdufunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } yext3gpp:inVariant; } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } - - list pLMNId { - description "Specifies the PLMN identifier to be used as part of the - global RAN node identity."; - key "mcc mnc"; - min-elements 1; - max-elements 1; - uses types3gpp:PLMNId; - } } - grouping ExternalGNBDUFunctionWrapper { + grouping ExternalGNBDUFunctionSubtree { list ExternalGNBDUFunction { description "Represents the properties, known by the management function, of a GNBDUFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -69,13 +62,24 @@ module _3gpp-nr-nrm-externalgnbdufunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBDUFunctionWrapper; + feature ExternalGNBDUFunctionUnderNRNetwork { + description "The ExternalGNBDUFunction shall be contained under + NRNetwork"; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBDUFunctionWrapper; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBDUFunctionUnderNRNetwork; + uses ExternalGNBDUFunctionSubtree; + } + + feature ExternalGNBDUFunctionUnderSubNetwork { + description "The ExternalGNBDUFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBDUFunctionUnderSubNetwork ; + uses ExternalGNBDUFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index b982aa12c..94ec2b7c7 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -5,43 +5,57 @@ module _3gpp-nr-nrm-externalnrcellcu { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-externalgnbcucpfunction { prefix extgnbcucp3gpp; } 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 ExternalNRCellCU 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalNRCellCUGrp { description "Represents the ExternalNRCellCU IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf cellLocalId { - description "Identifies an NR cell of a gNB. Together with corresponding - gNB ID it forms the NR Cell Identifier (NCI)."; - reference "NCI in 3GPP TS 38.300"; + description "It identifies a NR cell of a gNB. + + It, together with the gNB Identifier (using gNBId of the parent + GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network + sharing scenario) or ExternalCUCPFunction), identifies a NR cell within + a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300. + + The NCI can be constructed by encoding the gNB Identifier using gNBId + (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU + (for MOCN network sharing scenario) or ExternalCUCPFunction) and + cellLocalId where the gNB Identifier field is of length specified by + gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or + ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of + TS 38.413. + + The NR Cell Global identifier (NCGI) is constructed from the + PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of + the cell. + + See relation between NCI and NCGI subclause 8.2 of TS 38.300 "; mandatory true; - type int32 {range "0..16383"; } + type int32; } leaf nRPCI { - description "The Physical Cell Identity (PCI) of the NR cell."; - reference "3GPP TS 36.211"; + description "This holds the Physical Cell Identity (PCI) of the NR cell. + + allowedValues: + See 3GPP TS 36.211 subclause 6.11 for legal values of pci."; mandatory true; - type int32 { range "0..1007"; } + type int64; } list pLMNIdList { @@ -62,11 +76,11 @@ module _3gpp-nr-nrm-externalnrcellcu { } } - grouping ExternalNRCellCUWrapper { + grouping ExternalNRCellCUSubtree { list ExternalNRCellCU { - description "Represents the properties of an NRCellCU controlled by - another Management Service Provider."; - reference "3GPP TS 28.541"; + description "This IOC contains necessary attributes for inter-system + and intra-system handover. It also contains a subset of the attributes + of related IOCs controlled by Management Service Provider."; key id; uses top3gpp:Top_Grp; container attributes { @@ -75,14 +89,4 @@ module _3gpp-nr-nrm-externalnrcellcu { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalNRCellCUWrapper; - } - - augment "/nrnet3gpp:NRNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalNRCellCUWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 1fd046946..dcaba95b4 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -4,8 +4,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { prefix "extservgw3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + //import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -16,6 +15,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,7 +43,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalServingGWFunctionWrapper; } @@ -51,5 +51,5 @@ module _3gpp-nr-nrm-externalservinggwfunction { augment "/eutranet3gpp:EUtraNetwork" { if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; uses ExternalServingGWFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 11e924dab..abe82b6c8 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -4,17 +4,19 @@ module _3gpp-nr-nrm-externalupffunction { prefix "extupf3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } + /*import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/ 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 ExternalUPFFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -42,7 +44,7 @@ module _3gpp-nr-nrm-externalupffunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalUPFFunctionWrapper; } @@ -50,5 +52,5 @@ module _3gpp-nr-nrm-externalupffunction { augment "/nrnet3gpp:NRNetwork" { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalUPFFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index a1589ef2b..7dc301049 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -1,30 +1,29 @@ module _3gpp-nr-nrm-nrfrequency { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrfrequency"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency"; prefix "nrfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 NRFrequency 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 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-04-25 { reference CR-1526 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial version"; } grouping NRFrequencyGrp { description "Represents the NRFrequency IOC."; - reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf absoluteFrequencySSB { description "The absolute frequency applicable for a downlink NR carrier @@ -33,18 +32,20 @@ module _3gpp-nr-nrm-nrfrequency { type uint32 { range "0.. 3279165"; } } - leaf sSBSubCarrierSpacing { - description "Sub-carrier spacing of the SSB."; + leaf ssBSubCarrierSpacing { + description "Sub-carrier spacing of the SSB. + Note that the allowed values of SSB used for representing data, + by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz."; mandatory true; - type uint8 { range "15 | 30 | 60 | 120"; } + type uint8 { range "15 | 30 | 60 | 120 | 240"; } units "kHz"; } - leaf-list multiFrequencyBandListNR { + leaf multiFrequencyBandListNR { description "List of additional frequency bands the frequency belongs to. The list is automatically set by the gNB."; + mandatory true; config false; - min-elements 0; type uint16 { range "1..256"; } } } @@ -52,23 +53,30 @@ module _3gpp-nr-nrm-nrfrequency { grouping NRFrequencyWrapper { list NRFrequency { description "Represents certain NR frequency properties."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses NRFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + feature NRFrequencyUnderNRNetwork { + description "NRFrequency shall be contained under NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature NRFrequencyUnderNRNetwork; uses NRFrequencyWrapper; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + feature NRFrequencyUnderSubNetwork { + description "NRFrequency shall be contained under SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature NRFrequencyUnderSubNetwork; uses NRFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 9e622884d..044c2d0db 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -3,40 +3,37 @@ module _3gpp-nr-nrm-nrnetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork"; prefix "nrnet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } 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 NRNetwork 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderNRNetwork { - description "Classes representing external entities like NRFrequency, - ExternalGNBCUCPFunction, ExternalGNBDUFunction - are contained under a NRNetwork list/class."; - } + revision 2019-06-17 { reference "Initial revision"; } grouping NRNetworkGrp { - description "Represents the NRNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the NRNetwork IOC. + Contains no additiona attributes."; } - list NRNetwork { - description "A subnetwork containing gNB external NR entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses NRNetworkGrp; + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list NRNetwork { + description "Represents a set of NR frequencies and external NR entities + (e.g. ExternalGNBCUCPFunction). This is used to differentiate these + entities and frequencies from those in EUTRAN."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NRNetworkGrp; + } } } } \ No newline at end of file -- GitLab From e486e032a24ffcad83b6c137ba6ceb08fe5c2a9c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 May 2025 13:00:52 +0900 Subject: [PATCH 020/100] Removed incorrect note from measurements --- yang-models/_3gpp-common-measurements.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e04577d77..a1c17734b 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -43,7 +43,7 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or - ManagedFunction. Note: KPIs will only be supported under SubNetwork + ManagedFunction. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-05-18 { reference CR-0531; } revision 2025-02-05 { reference CR-0460; } revision 2025-01-28 { reference CR-0511; } revision 2024-11-06 { reference CR-0487; } -- GitLab From d6c740ac469b28eaf8108696d7976e7edce4f636 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Sat, 3 May 2025 15:35:10 +0000 Subject: [PATCH 021/100] Edit _3gpp-common-fm.yang add new alarmType OTHER + new revision statement --- yang-models/_3gpp-common-fm.yang | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 308f0dfd6..e97331449 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; @@ -41,6 +42,11 @@ module _3gpp-common-fm { } typedef eventType { + type enumeration { + enum OTHER { + value 1; + } + type enumeration { enum COMMUNICATIONS_ALARM { value 2; -- GitLab From 65040c81d429356cb0329d6c6ac1bd4c36c323a4 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Sat, 3 May 2025 15:48:25 +0000 Subject: [PATCH 022/100] Edit _3gpp-common-fm.yang alarmType corrections --- yang-models/_3gpp-common-fm.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index e97331449..0d1d8a276 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -46,8 +46,7 @@ module _3gpp-common-fm { enum OTHER { value 1; } - - type enumeration { + enum COMMUNICATIONS_ALARM { value 2; } -- GitLab From f3d49adb6c8ba532a0022abafd646e1743ec616f Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:36:52 +0000 Subject: [PATCH 023/100] Add new file --- .../_3gpp-common-antennafunction.yang | 214 ++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 yang-models/yang-models/_3gpp-common-antennafunction.yang diff --git a/yang-models/yang-models/_3gpp-common-antennafunction.yang b/yang-models/yang-models/_3gpp-common-antennafunction.yang new file mode 100644 index 000000000..bd2097941 --- /dev/null +++ b/yang-models/yang-models/_3gpp-common-antennafunction.yang @@ -0,0 +1,214 @@ +module _3gpp-common-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-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-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + 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.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-06 { + description "Initial revision"; + } +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 types3gpp: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 types3gpp: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 types3gpp:Altitude; + } + + leaf height { + description "The height of an antenna above sea level. + Note: The value of this attribute has no operational + impact on the network, e.g. the NE behavior 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 TS 37.466. + Decprecated: Use 'elevation' attribute"; + reference "3GPP TS 37.466, Iuant interface: Application part"; + status deprecated; + units meters; + type uint64 { + fraction-digits 1; + } + } + + 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 types3gpp: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 types3gpp: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 types3gpp: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 types3gpp: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"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + + } + + augment "/me3gpp:ManagedElement" { + + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MO 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; + } + } +} -- GitLab From 6be78c4c5600c048b522bff39727124ab62060a2 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:38:06 +0000 Subject: [PATCH 024/100] Add new file --- .../_3gpp-common-sectorequipmentfunction.yang | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 yang-models/_3gpp-common-sectorequipmentfunction.yang diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang new file mode 100644 index 000000000..0c5ec789e --- /dev/null +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -0,0 +1,102 @@ +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; + prefix "secteqpfunc3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + 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.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { + description "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 fqBands { + description "The list of frequency bands supported by the hardware + associated with the SectorEquipmentFunction. The earfcnDl and earfcnUl + or earfcn of cells associated with the SectorEquipmentFunction must + be assigned with value within one of the specified frequencyBands values."; + config false; + type string; + } + + leaf-list theAntennaList { + description "This attribute contains the distinguished names of the + AntennaFunction."; + type types3gpp:DistinguishedName; + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + status deprecated; + config false; + type types3gpp:DistinguishedName; + } + + leaf-list theTMAList { + description "This attribute contains the DNs of one or more TMAFunctions."; + status deprecated; + config false; + type types3gpp:DistinguishedName; + } + + 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; + } + } + +} -- GitLab From c3f5c7868bd0af44f2d61e37bb488c021105c889 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:38:27 +0000 Subject: [PATCH 025/100] Delete _3gpp-common-antennafunction.yang --- .../_3gpp-common-antennafunction.yang | 214 ------------------ 1 file changed, 214 deletions(-) delete mode 100644 yang-models/yang-models/_3gpp-common-antennafunction.yang diff --git a/yang-models/yang-models/_3gpp-common-antennafunction.yang b/yang-models/yang-models/_3gpp-common-antennafunction.yang deleted file mode 100644 index bd2097941..000000000 --- a/yang-models/yang-models/_3gpp-common-antennafunction.yang +++ /dev/null @@ -1,214 +0,0 @@ -module _3gpp-common-antennafunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-common-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-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } - 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.662 Generic Network Resource Model (NRM)"; - - revision 2025-05-06 { - description "Initial revision"; - } -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 types3gpp: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 types3gpp: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 types3gpp:Altitude; - } - - leaf height { - description "The height of an antenna above sea level. - Note: The value of this attribute has no operational - impact on the network, e.g. the NE behavior 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 TS 37.466. - Decprecated: Use 'elevation' attribute"; - reference "3GPP TS 37.466, Iuant interface: Application part"; - status deprecated; - units meters; - type uint64 { - fraction-digits 1; - } - } - - 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 types3gpp: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 types3gpp: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 types3gpp: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 types3gpp: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"; - } - } - - leaf-list theCellList { - description "This attribute contains the DNs of EUtranGenericCell - or UtranGenericCell if associations between them exist. - This attribute contains the DNs of GSMCellPart if association - between them exist. "; - config false; - status deprecated; - type types3gpp:DistinguishedName; - } - - } - - augment "/me3gpp:ManagedElement" { - - list AntennaFunction { - key id; - uses top3gpp:Top_Grp; - description "This MO 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; - } - } -} -- GitLab From de439a22531c5672e0ee3e2f6060d6c717000250 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:39:12 +0000 Subject: [PATCH 026/100] Add new file --- yang-models/_3gpp-common-antennafunction.yang | 214 ++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 yang-models/_3gpp-common-antennafunction.yang diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang new file mode 100644 index 000000000..cb2987888 --- /dev/null +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -0,0 +1,214 @@ +module _3gpp-common-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-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-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + 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.662 Generic Network Resource Model (NRM)"; + + revision 2025-03-27 { + description "Initial revision"; + } +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 types3gpp: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 types3gpp: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 types3gpp:Altitude; + } + + leaf height { + description "The height of an antenna above sea level. + Note: The value of this attribute has no operational + impact on the network, e.g. the NE behavior 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 TS 37.466. + Decprecated: Use 'elevation' attribute"; + reference "3GPP TS 37.466, Iuant interface: Application part"; + status deprecated; + units meters; + type uint64 { + fraction-digits 1; + } + } + + 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 types3gpp: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 types3gpp: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 types3gpp: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 types3gpp: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"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + + } + + augment "/me3gpp:ManagedElement" { + + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MO 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; + } + } +} -- GitLab From 2bc1571dc1279917ad256f8071eca6aafd57457c Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:41:10 +0000 Subject: [PATCH 027/100] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index cb2987888..ec060fb5d 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -6,7 +6,6 @@ module _3gpp-common-antennafunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -62,9 +61,7 @@ grouping AntennaFunctionGrp { reference "3GPP TS 37.466, Iuant interface: Application part"; status deprecated; units meters; - type uint64 { - fraction-digits 1; - } + type uint64; } leaf horizBeamWidth { -- GitLab From 756d33f8dfc3f3ef991d052d6ee854d2a15153c8 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:41:30 +0000 Subject: [PATCH 028/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 0c5ec789e..b9f922fbf 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -6,7 +6,6 @@ module _3gpp-common-sectorequipmentfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; -- GitLab From 7c77f355f6f93ef5f7705980a410fe9023240dd6 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:51:18 +0000 Subject: [PATCH 029/100] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 58 +++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index b9f922fbf..6cee6a465 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -2,35 +2,36 @@ module _3gpp-common-sectorequipmentfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; prefix "secteqpfunc3gpp"; - + 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.662 Generic Network Resource Model (NRM)"; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; revision 2025-05-01 { description "Initial revision"; } - grouping SectorEquipmentFunctionGrp { + + grouping SectorEquipmentFunctionGrp { description "Represents the SectorEquipmentFunction."; uses mf3gpp:ManagedFunctionGrp; - + leaf confOutputPower { - description "It defines the allowed total power to use for all + 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 fqBands { description "The list of frequency bands supported by the hardware associated with the SectorEquipmentFunction. The earfcnDl and earfcnUl @@ -39,63 +40,60 @@ module _3gpp-common-sectorequipmentfunction { config false; type string; } - + leaf-list theAntennaList { - description "This attribute contains the distinguished names of the + description "This attribute contains the distinguished names of the AntennaFunction."; type types3gpp:DistinguishedName; - } - + } + leaf-list theCellList { description "This attribute contains the DNs of EUtranGenericCell or UtranGenericCell if associations between them exist. This attribute contains the DNs of GSMCellPart if association between them exist. "; - status deprecated; config false; - type types3gpp:DistinguishedName; + type types3gpp:DistinguishedName; } - + leaf-list theTMAList { description "This attribute contains the DNs of one or more TMAFunctions."; - status deprecated; config false; type types3gpp:DistinguishedName; } - + 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 + 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 + Note: referencedBy is a DN datatype and so can reference an MOI under a different ME"; config false; - type types3gpp:DistinguishedName; + 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 + 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; - } - } + } +} } -- GitLab From 9ddbf7e87a99db4665ecc091386117c81998fb7f Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:53:16 +0000 Subject: [PATCH 030/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 71aba87b050c2bc1ec598ef10bd3c1f58d8cac69 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:53:55 +0000 Subject: [PATCH 031/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 6cee6a465..8ece48ae9 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -95,5 +95,4 @@ module _3gpp-common-sectorequipmentfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } - } -- GitLab From 81a8da4677fe0e66468d4b9924624df39ba7973e Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 10:08:50 +0000 Subject: [PATCH 032/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 8ece48ae9..df60212af 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,8 +1,8 @@ module _3gpp-common-sectorequipmentfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; - prefix "secteqpfunc3gpp"; - + prefix "scteqpfun3gpp"; + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -16,7 +16,7 @@ module _3gpp-common-sectorequipmentfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - revision 2025-05-01 { + revision 2025-05-06 { description "Initial revision"; } -- GitLab From a8b2e3af8da7b48d260214d7c843cf63b605e94d Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 11:06:07 +0000 Subject: [PATCH 033/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index df60212af..acde35c46 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -34,9 +34,14 @@ module _3gpp-common-sectorequipmentfunction { leaf fqBands { description "The list of frequency bands supported by the hardware - associated with the SectorEquipmentFunction. The earfcnDl and earfcnUl - or earfcn of cells associated with the SectorEquipmentFunction must - be assigned with value within one of the specified frequencyBands values."; + associated with the SectorEquipmentFunction. The earfcnDl and + earfcnUl or earfcn of cells associated with the SectorEquipmentFunction + must be assigned with value within one of the specified frequencyBands values. + + AllowedValues: + A list of frequency bands expressed as strings. + Valid frequency band values may be found in 3GPP TS 25.104 (3G), + 36.104 (LTE) and 38.104 (NR)."; config false; type string; } -- GitLab From 106cab7615b3d98b46b179684aca6febd50cec31 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:24:39 +0000 Subject: [PATCH 034/100] Edit _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 acde35c46..bce164cd8 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -100,4 +100,4 @@ module _3gpp-common-sectorequipmentfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} +} \ No newline at end of file -- GitLab From 0b0aabfc0fdfeae4dac1b7f0a622b87c8495c0c9 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:30:07 +0000 Subject: [PATCH 035/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index bce164cd8..3e9962ccd 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,5 +1,4 @@ -module _3gpp-common-sectorequipmentfunction { - yang-version 1.1; +module _3gpp-common-sectorequipmentfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; prefix "scteqpfun3gpp"; -- GitLab From 71263a9194079a1b94176d86d2f9e8173c885401 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:35:08 +0000 Subject: [PATCH 036/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 3e9962ccd..f9cc99a3f 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,4 +1,5 @@ -module _3gpp-common-sectorequipmentfunction { yang-version 1.1; +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; prefix "scteqpfun3gpp"; @@ -15,9 +16,7 @@ module _3gpp-common-sectorequipmentfunction { yang-version 1.1; TTA, TTC). All rights reserved."; reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - revision 2025-05-06 { - description "Initial revision"; - } + revision 2025-05-06 { description "Initial revision"; } grouping SectorEquipmentFunctionGrp { description "Represents the SectorEquipmentFunction."; -- GitLab From ef4c201a2cca6b97c124bc6e4c9321c963a68ef2 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:35:59 +0000 Subject: [PATCH 037/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From c1ede4762cb1020f5fe7b04f4e509b2d6b26b9b9 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:24:41 +0000 Subject: [PATCH 038/100] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index f9cc99a3f..1e6d69a21 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -43,28 +43,7 @@ module _3gpp-common-sectorequipmentfunction { config false; type string; } - - leaf-list theAntennaList { - description "This attribute contains the distinguished names of the - AntennaFunction."; - type types3gpp:DistinguishedName; - } - - leaf-list theCellList { - description "This attribute contains the DNs of EUtranGenericCell - or UtranGenericCell if associations between them exist. - This attribute contains the DNs of GSMCellPart if association - between them exist. "; - config false; - type types3gpp:DistinguishedName; - } - - leaf-list theTMAList { - description "This attribute contains the DNs of one or more TMAFunctions."; - config false; - type types3gpp:DistinguishedName; - } - + leaf-list referencedBy { description "This attribute contains the DNs of one or more objects that refer to this object. -- GitLab From d9bfcf5f5f6e3d4a32da004c14ed1030ed023575 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:54:06 +0000 Subject: [PATCH 039/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From d2bf7133cec72ffb2c7dd714a58b9a3f1d21bb7e Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:33:55 +0000 Subject: [PATCH 040/100] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 1e6d69a21..3b09829d4 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -30,16 +30,23 @@ module _3gpp-common-sectorequipmentfunction { type uint32; } - leaf fqBands { - description "The list of frequency bands supported by the hardware - associated with the SectorEquipmentFunction. The earfcnDl and - earfcnUl or earfcn of cells associated with the SectorEquipmentFunction - must be assigned with value within one of the specified frequencyBands values. - - AllowedValues: - A list of frequency bands expressed as strings. - Valid frequency band values may be found in 3GPP TS 25.104 (3G), - 36.104 (LTE) and 38.104 (NR)."; + 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 +
    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; } -- GitLab From da61b7d9b896e9eeb0eb79a0abd9939eb6f77986 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:37:57 +0000 Subject: [PATCH 041/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From a2df3aabd1f6fce18591942b7d66b9655753905d Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:04:11 +0000 Subject: [PATCH 042/100] Edit _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 3b09829d4..ac6dc5f42 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -42,7 +42,7 @@ module _3gpp-common-sectorequipmentfunction { AllowedValues: Operating band id or supported frequency tuple -
      expressed as a string. + expressed as a string. Examples for NR: Bands: {'n1', 'n12'} -- GitLab From 8f2ebf2e169b6fc67d7283941a8422c00380c234 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:08:25 +0000 Subject: [PATCH 043/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From bb9f0952c484acb810cfad66d437ff4c67dd8c5e Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 06:39:13 +0000 Subject: [PATCH 044/100] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index ec060fb5d..532efc006 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -49,21 +49,7 @@ grouping AntennaFunctionGrp { below sea level. If empty, value is not defined."; type types3gpp:Altitude; } - - leaf height { - description "The height of an antenna above sea level. - Note: The value of this attribute has no operational - impact on the network, e.g. the NE behavior 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 TS 37.466. - Decprecated: Use 'elevation' attribute"; - reference "3GPP TS 37.466, Iuant interface: Application part"; - status deprecated; - units meters; - type uint64; - } - + leaf horizBeamWidth { description "The 3 dB power beamwidth of the antenna pattern in the horizontal plane. -- GitLab From 5c232475a7bf8f3dd1a5f9cc21d39b0dcd51625b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 07:08:25 +0000 Subject: [PATCH 045/100] Edit _3gpp-common-antennafunction.yang -- GitLab From 7a0a353c3822aad344a239d8209ae0892fe18a9c Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:44:05 +0000 Subject: [PATCH 046/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index ac6dc5f42..e125a28bd 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -10,8 +10,9 @@ module _3gpp-common-sectorequipmentfunction { 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). + 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.662 Generic Network Resource Model (NRM)"; -- GitLab From 1486b720664a14a277ed03763245c885497119a4 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:45:12 +0000 Subject: [PATCH 047/100] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index 532efc006..3ad251f21 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -185,7 +185,7 @@ grouping AntennaFunctionGrp { list AntennaFunction { key id; uses top3gpp:Top_Grp; - description "This MO represents an array of radiating elements that + description "This MOI represents an array of radiating elements that may be tilted to adjust the RF coverage of a cell(s)."; container attributes { -- GitLab From e85fca7f3a88dd80354334076f98f46ac28f4d6b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:55:57 +0000 Subject: [PATCH 048/100] Edit _3gpp-common-antennafunction.yang -- GitLab From 16085dbf887380f7b5e0c3440cdca75533862acf Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:56:36 +0000 Subject: [PATCH 049/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 4b09501dd266c654c492ce2e74df9ed0491bfcb3 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 27 May 2025 05:27:00 +0200 Subject: [PATCH 050/100] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1702 Ts28.623 r18 CR0535 mdtplmn list yang --- yang-models/_3gpp-common-trace.yang | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index edb7e7632..460ea4b21 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 2025-05-06 { reference "0531" ; } + revision 2025-05-06 { reference "CR-0531 CR-0535" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } revision 2024-11-05 { reference "CR-0470" ; } @@ -1499,16 +1499,6 @@ module _3gpp-common-trace { reference "clauses 5.10.38 of TS 32.422."; } - list pLMNList { - when '../../../jobType = "LOGGED_MDT_ONLY"'; - key "mcc mnc"; - uses types3gpp:PLMNId; - max-elements 16; - description "It indicates the PLMNs where measurement collection, status - indication and log reporting is allowed."; - reference "Clause 5.10.24 of 3GPP TS 32.422."; - } - list areaConfigurationForNeighCell { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; @@ -1618,6 +1608,14 @@ module _3gpp-common-trace { both MN and SN. The value TRUE means the MDT configuration is for MN only."; } + + list pLMNList { + key "mcc mnc"; + uses types3gpp:PLMNId; + max-elements 16; + description "It indicates the PLMNs where measurement collection. "; + reference "Clause 5.10.24 of 3GPP TS 32.422."; + } } grouping UECoreMeasConfigGrp { -- GitLab From a40bc728522e73a17236eb6aa70918a9033c8e28 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 25 Mar 2025 23:37:04 +0100 Subject: [PATCH 051/100] removed invariant from attribute comments --- yang-models/_3gpp-common-fm.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 223ea0033..7b0159238 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-03-24 { reference CR-0025; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; reference CR-0008 ; @@ -103,12 +104,14 @@ module _3gpp-common-fm { type yang:date-and-time; config false; mandatory true; + yext3gpp:inVariant; description "Date and Time the comment was created."; } leaf commentUserId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the user who made the comment."; } @@ -116,6 +119,7 @@ module _3gpp-common-fm { leaf commentSystemId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the system ( Management System) from which the comment is made. That system supports the user that made the comment."; @@ -124,6 +128,7 @@ module _3gpp-common-fm { leaf commentText { type string; mandatory true; + yext3gpp:inVariant; description "It carries the textual comment."; } } @@ -382,7 +387,6 @@ module _3gpp-common-fm { } list comments { - yext3gpp:inVariant; yext3gpp:notNotifyable; description "List of comments and data about the comments."; key idx; -- GitLab From 3013120c1098e33c8731cf5532c7be583d39ebe0 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Mar 2025 00:06:47 +0100 Subject: [PATCH 052/100] corrected spelling of MeContext --- yang-models/_3gpp-common-mecontext.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index ed183f1a7..b1a261872 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -24,6 +24,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { @@ -39,7 +40,7 @@ module _3gpp-common-mecontext { } augment "/subnet3gpp:SubNetwork" { - list Mecontext { + 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. -- GitLab From 178a52c602de700995582ac8ba2736a0a81e5695 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Mar 2025 02:26:42 +0100 Subject: [PATCH 053/100] corrected containment of dynamic5qiset --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 12ef3c65c..4eaa13bfd 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -6,6 +6,9 @@ module _3gpp-5gc-nrm-dynamic5qiset { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; } organization "3gpp SA5"; @@ -16,6 +19,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-24 { reference CR-1488 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-01-07 { reference CR-0643; } @@ -52,11 +56,41 @@ module _3gpp-5gc-nrm-dynamic5qiset { } } + feature Dynamic5QISetUnderSubNetwork { + description "Dynamic5QISet shall be contained under SubNetwork."; + } augment "/subnet3gpp:SubNetwork" { + if-feature Dynamic5QISetUnderSubNetwork; uses Dynamic5QISetSubtree; } + feature Dynamic5QISetUnderManagedElement { + description "Dynamic5QISet shall be contained under ManagedElement."; + } augment "/me3gpp:ManagedElement" { + if-feature Dynamic5QISetUnderManagedElement; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBDUFunction { + description "Dynamic5QISet shall be contained under GNBDUFunction."; + } + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { + if-feature Dynamic5QISetUnderGNBDUFunction; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUCPFunction { + description "Dynamic5QISet shall be contained under GNBCUCPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUUPFunction { + description "Dynamic5QISet shall be contained under GNBCUUPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { uses Dynamic5QISetSubtree; } } \ No newline at end of file -- GitLab From 491cc6b6be39421e83180b07956f8c663a8c0831 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 20:52:02 +0100 Subject: [PATCH 054/100] added invarin for dnprefix --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 ++ yang-models/_3gpp-common-managed-element.yang | 5 ++++- yang-models/_3gpp-common-mecontext.yang | 5 ++++- yang-models/_3gpp-common-subnetwork.yang | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 4eaa13bfd..a92687b76 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -84,6 +84,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { description "Dynamic5QISet shall be contained under GNBCUCPFunction."; } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + if-feature Dynamic5QISetUnderGNBCUCPFunction; uses Dynamic5QISetSubtree; } @@ -91,6 +92,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { description "Dynamic5QISet shall be contained under GNBCUUPFunction."; } augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { + if-feature Dynamic5QISetUnderGNBCUUPFunction; uses Dynamic5QISetSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index eaa8dbdb7..74c55b00e 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -4,6 +4,7 @@ module _3gpp-common-managed-element { prefix "me3gpp"; import _3gpp-common-yang-types { prefix types3gpp ; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -19,7 +20,7 @@ module _3gpp-common-managed-element { description "Defines ManagedElement which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -34,6 +35,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-03-24 { reference "CR-0517"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -141,6 +143,7 @@ module _3gpp-common-managed-element { A Distingushed Name(DN) is defined by 3GPP TS 32.300, which splits the DN into a DN Prefix and Local DN"; type types3gpp:DistinguishedName; + yext3gpp:inVariant; } leaf userLabel { diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index b1a261872..0f4adc741 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -4,6 +4,7 @@ module _3gpp-common-mecontext { prefix "mectx3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import ietf-yang-schema-mount { prefix yangmnt; } @@ -12,7 +13,7 @@ module _3gpp-common-mecontext { 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, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,6 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-24 { reference "CR-0517"; } revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } @@ -32,6 +34,7 @@ module _3gpp-common-mecontext { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; 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."; diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 23362b81d..e28091cf6 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -4,6 +4,7 @@ module _3gpp-common-subnetwork { prefix "subnet3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -19,7 +20,7 @@ module _3gpp-common-subnetwork { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -34,6 +35,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-03-24 { reference "CR-0517"; } revision 2024-08-18 { reference CR-1336 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -152,6 +154,7 @@ module _3gpp-common-subnetwork { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; reference "Annex C of 32.300 "; } -- GitLab From 0881dc8964adfecdcceef02b84aeace1b4b17ea0 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 23:33:47 +0100 Subject: [PATCH 055/100] small updates --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 +- yang-models/_3gpp-common-mecontext.yang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index a92687b76..0f2d0222b 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -15,7 +15,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the dynamic 5QIs including their QoS characteristics. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 0f4adc741..531eab227 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -25,7 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-03-24 { reference "CR-0517"; } + revision 2025-03-24 { reference "CR-0524"; } revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } -- GitLab From f6d5c80d2a8ad1b408083fbf9447d74daea2f299 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 28 Mar 2025 21:17:23 +0100 Subject: [PATCH 056/100] updated subsriptioncontrol --- yang-models/_3gpp-common-fm.yang | 2 +- yang-models/_3gpp-common-mecontext.yang | 2 +- .../_3gpp-common-subscription-control.yang | 29 +++++++++++++++---- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 7b0159238..54fda08ed 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,7 +12,7 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 531eab227..df9b7ef0d 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -26,7 +26,7 @@ module _3gpp-common-mecontext { Information Service (IS)"; revision 2025-03-24 { reference "CR-0524"; } - revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } + revision 2025-03-24 { reference "CR-0517 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index b637e1ff5..29ffa4c8f 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -5,12 +5,13 @@ module _3gpp-common-subscription-control { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - + import ietf-yang-types { prefix yang; } + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -18,6 +19,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-03-24 { reference CR-0517 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } @@ -84,11 +86,26 @@ module _3gpp-common-subscription-control { } } case dataNodeSelector { - leaf dataNodeSelector { - type string; + container dataNodeSelector { description "The value shall follow the rules of RFC 8641 filter-spec"; - reference "RFC 8641 section 5."; + reference "RFC 8641 section 5. and ietf-yang-push.yang"; + choice dataNodeSelector { + anydata datastore-subtree-filter { + description "Subtree filter"; + reference + "RFC 6241: Network Configuration Protocol (NETCONF), Section 6"; + } + leaf datastore-xpath-filter { + type yang:xpath1.0; + description "XPath-filter"; + reference + "XML Path Language (XPath) Version 1.0 + (https://www.w3.org/TR/1999/REC-xpath-19991116) + RFC 7950: The YANG 1.1 Data Modeling Language, + Section 10"; + } + } } } } @@ -114,7 +131,7 @@ module _3gpp-common-subscription-control { list scope { description "Scopes (selects) data nodes in an object tree."; key idx; - max-elements 8; + max-elements 1; leaf idx { type string; } uses ScopeGrp; } -- GitLab From f0d60112dc3b525d25619de695a2bb675be42342 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 11 Apr 2025 00:47:11 +0200 Subject: [PATCH 057/100] Update thresholdinfo --- yang-models/_3gpp-common-fm.yang | 180 +++++++++++++++++++++++-------- 1 file changed, 138 insertions(+), 42 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 54fda08ed..16b3a4898 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -133,6 +133,141 @@ module _3gpp-common-fm { } } + grouping ThresholdHysteresisGrp { + description "The ThresholdHysteresis defines the threshold boundaries to + control the hysteresis mechanism. + + The high attribute of ThresholdHysteresis identifies the higher value of + a threshold with hysteris, the integer type is used for counter + thresholds and the float type for gauge thresholds. The low attribute + of ThresholdHysteresis identifies the lower value of a threshold with + hysteresis, applicable only to gauge thresholds."; + + leaf high { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "Higher value of a threshold with hysteris, the integer type + is used for counter thresholds and the float type for gauge + thresholds."; + } + + leaf low { + type decimal64 { + fraction-digits 7; + } + description "Lower value of a threshold with hysteresis, applicable + only to gauge thresholds."; + } + } + + grouping ThresholdLevelIndGrp { + description "The up attribute indicates for counter and gauge thresholds + that the threshold crossing occurred when going up. The down attribute + only indicates for gauge thresholds that the threshold crossing occurred + when going down, applicable only to gauge thresholds."; + + list up { + description "Indicates for counter and gauge thresholds that the + threshold crossing occurred when going up."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + + list down { + description "Indicates for gauge thresholds that the threshold crossing + occurred when going down, applicable only to gauge thresholds."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + } + + grouping ThresholdCrossingGrp { + description "The datatype indicates the crossed threshold + information regardless of the gauge threshold, which represents an + instantaneous value that changes over time, or the counter threshold, + which represents monotonically increasing cumulative quantity. + + The observedMeasurement attribute of TheresholdInfo specifies the name + of the monitored measurement that crossed the threshold and that + caused the notification (Rec. ITU-T X. 733[8]). The observedValue + attribute indicates the value of the gauge or counter which crossed + the threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. Integer values + are used for counters and float values for gauges (Rec. ITU-T X. 733). + Note that a 'number' type property can contain both integers and + floating point numbers. + + For the thresholdLevel attribute, in the case of a gauge, it specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case of + a counter, it specifies only the threshold value (Rec. ITU-T X. 733). + + For the armTime attribute, for a gauge threshold, it specifies the + time at which the threshold was last re-armed, namely the time after + the previous threshold crossing at which the hysteresis value of the + threshold was exceeded thus again permitting generation of + notifications when the threshold is crossed; for a counter threshold, + the later of the time at which the threshold offset was last applied, + or the time at which the counter was last initialized (for resettable + counters) (Rec. ITU-T X. 733)."; + + leaf observedMeasurement { + type string; + mandatory true; + description "The name of the monitored measurement that crossed the + threshold and that caused the notification (Rec. ITU-T X. 733 "; + } + + leaf observedValue { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "The value of the gauge or counter which crossed the + threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. + Integer values are used for counters and float values for gauges + (Rec. ITU-T X. 733). Note that a 'number' type property can contain + both integers and floating point numbers."; + } + + list thresholdLevel { + description "In the case of a gauge the threshold level specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case + of a counter the threshold level specifies only the threshold value + (Rec. ITU-T X. 733)."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdLevelIndGrp; + } + + leaf armTime { + type yang:date-and-time; + description "For a gauge threshold, the time at which the threshold + was last re-armed, namely the time after the previous threshold + crossing at which the hysteresis value of the threshold was + exceeded thus again permitting generation of notifications when the + threshold is crossed. For a counter threshold, the later of the time + at which the threshold offset was last applied, or the time at + which the counter was last initialized (for resettable counters) + (Rec. ITU-T X. 733)"; + } + } + grouping AlarmRecordGrp { description "Contains alarm information of an alarmed object instance. A new record is created in the alarm list when an alarmed object @@ -260,52 +395,13 @@ module _3gpp-common-fm { yext3gpp:notNotifyable; } - grouping ThresholdInfoGrp { - leaf measurementType { - type string; - mandatory true; - } - - leaf direction { - type enumeration { - enum INCREASING; - enum DECREASING; - } - mandatory true; - description " - If it is 'Increasing', the threshold crossing notification is - triggered when the measurement value equals or exceeds a - thresholdValue. - - If it is 'Decreasing', the threshold crossing notification is - triggered when the measurement value equals or below a - thresholdValue."; - } - - leaf thresholdLevel { - type string; - } - - leaf thresholdValue { - type string; - } - - leaf hysteresis { - type string; - description "The hysteresis has a threshold high and a threshold - low value that are different from the threshold value. - A hysteresis, therefore, defines the threshold-high and - threshold-low levels within which the measurementType value is - allowed to oscillate without triggering the threshold crossing - notification."; - } - } - list thresholdInfo { config false ; yext3gpp:notNotifyable; description "Indicates the crossed threshold"; - uses ThresholdInfoGrp; + key idx; + leaf idx { type int32; } + uses ThresholdCrossingGrp; } list stateChangeDefinition { -- GitLab From 8bb4803768e73d063c613b2ce8b6e4cb86ac4feb Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 11 Apr 2025 01:11:34 +0200 Subject: [PATCH 058/100] Updated CR numbers as file is same in R18 and R19 --- yang-models/_3gpp-common-fm.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 16b3a4898..308f0dfd6 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,7 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; - revision 2025-03-24 { reference CR-0025; } + revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; reference CR-0008 ; -- GitLab From 0af7f04b74db15bb78713b305b4f8f4a91ab5801 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 26 Mar 2025 18:55:46 +0000 Subject: [PATCH 059/100] Update _3gpp-nr-nrm-drachoptimizationfunction.yang --- .../_3gpp-nr-nrm-drachoptimizationfunction.yang | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 399bd2bfd..e0eda2492 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-drachoptimizationfunction { description "Defines the YANG mapping of the DRACHOptimizationFunction 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 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-03-28 { reference CR-xxxx ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } @@ -52,7 +53,13 @@ module _3gpp-nr-nrm-drachoptimizationfunction { type TargetProbabilityT; } leaf numberofpreamblessent { - description "This attribute determines the number of preambles sent."; + description "This attribute indicates the number of preambles sent + used to configure a wanted distribution of RACH preambles in a + vendor implemented DRACH optimisation function. + Note: The DRACH optimization function may configure preambleTransMax + as defined in TS 38.331 [54]. The allowed values for preambleTransMax + are 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200 (see 38.331 [54], + subclause 6.3.2)."; mandatory true; type NumberofpreamblessentT; } -- GitLab From 6646ea9b1c4e213890e601660a77d58439914fe5 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 20:14:04 +0000 Subject: [PATCH 060/100] Update _3gpp-nr-nrm-drachoptimizationfunction.yang --- yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index e0eda2492..08cb89d88 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-drachoptimizationfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-28 { reference CR-xxxx ; } + revision 2025-03-28 { reference CR-1503 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From 220acea114495720e02a816127eea19ef30f1073 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 14 Apr 2025 14:48:38 +0000 Subject: [PATCH 061/100] Edit _3gpp-nr-nrm-drachoptimizationfunction.yang Updated revision date to conform to the rule in 32.160 clause 6.2.1.13 In order to avoid reusing the same revision date in multiple releases, when a new YANG module revision is needed the revision date should be set as follows. Instead of setting the exact revision date when the module was last edited, the date nearest to that day that is not in the future and that follows the rule below should be used. When divided by 6, the day in the date should have the same remainder as the release number: (DAY modulo 6 == releaseNumber modulo 6). --- yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 08cb89d88..cd55b40c5 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-drachoptimizationfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-28 { reference CR-1503 ; } + revision 2025-03-30 { reference CR-1503 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From f12e731eaed2f5abca79ce9fe13b0e9a9158bf0e Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 14 Apr 2025 14:56:52 +0000 Subject: [PATCH 062/100] Edit _3gpp-common-subnetwork.yang Adding changes from https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1685 --- yang-models/_3gpp-common-subnetwork.yang | 31 ++++-------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index e28091cf6..e454361ba 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -35,7 +35,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2025-03-24 { reference "CR-0517"; } + revision 2025-03-24 { reference "CR-0517 CR0526"; } revision 2024-08-18 { reference CR-1336 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -211,34 +211,13 @@ module _3gpp-common-subnetwork { list SubNetwork { key id; - description "Represents a set of managed entities"; + description "Represents a set of managed entities + Contained ManagedElements and SubNetworks shall be connected via + YANG Schema-mount."; uses top3gpp:Top_Grp; container attributes { uses SubNetworkGrp; - leaf-list parents { - description "Reference to all containg SubNetwork instances - in strict order from the root subnetwork down to the immediate - parent subnetwork. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetworks. - This reference MUST NOT be present for the top level SubNetwork and - MUST be present for other SubNetworks."; - type leafref { - path "../../../SubNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained SubNetwork instances. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetwork."; - type leafref { - path "../../../SubNetwork/id"; - } - } } uses meas3gpp:MeasurementSubtree { @@ -274,7 +253,7 @@ module _3gpp-common-subnetwork { } yangmnt:mount-point children-of-SubNetwork { - description "Mountpoint for ManagedElement"; + description "Mountpoint for contained ManagedElements and SubNetworks"; reference "RFC8528 YANG Schema Mount"; } -- GitLab From 3f9133de4d7ded1701a9f9ae3a635d3a5dae632a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Apr 2025 19:22:18 +0200 Subject: [PATCH 063/100] Modified some file dates as duplicate dates were used which violates RFC 7950. No functional change. --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 3 +-- yang-models/_3gpp-common-filemanagement.yang | 2 +- yang-models/_3gpp-common-files.yang | 2 +- yang-models/_3gpp-common-subscription-control.yang | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index a4724bf4e..e951d0cf2 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -19,8 +19,7 @@ in 3GPP TS 23.501. TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2023-09-18 { reference CR-1043 ; } - revision 2023-04-26 { reference CR-0916; } + revision 2023-09-24 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-04-10 { reference "S5-202101"; } diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index d9b5afa66..0a78825ae 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -18,7 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2024-11-07 { reference CR-0473 ; } + revision 2024-11-12 { reference CR-0473 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 9317e769f..3a4ba43dc 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -25,7 +25,7 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-05-11 { reference CR-0362 ; } + revision 2024-05-12 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 29ffa4c8f..784cba09c 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -19,7 +19,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-03-24 { reference CR-0517 ; } + revision 2025-03-30 { reference CR-0517 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } -- GitLab From 504fd40f6ed8e2013d44402ceb53dfc76c1919c2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 17:32:49 +0200 Subject: [PATCH 064/100] removed duplicate yext3gpp:inVariant --- 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 b19385705..edb7e7632 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 2025-05-06 { reference "0531" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } revision 2024-11-05 { reference "CR-0470" ; } @@ -1761,7 +1762,6 @@ module _3gpp-common-trace { type string; yext3gpp:inVariant; description "Identifier of a TraceJob"; - yext3gpp:inVariant; } leaf traceReportingFormat { -- GitLab From ae6b0e532a360c2d21a923f24a7ce5976ebf69cd Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 22:56:08 +0200 Subject: [PATCH 065/100] corrected operatorDU and EP_F1C/U containment except externals --- yang-models/_3gpp-nr-nrm-ep.yang | 77 +++++++++--------------- yang-models/_3gpp-nr-nrm-operatordu.yang | 13 +++- 2 files changed, 41 insertions(+), 49 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 927bc49b1..1bad0c7ff 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-ep { description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } @@ -46,16 +47,30 @@ module _3gpp-nr-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_F1CGrp { - description "Represents the EP_F1C IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1CSubtree { + list EP_F1C { + description "Represents the local end point of the control plane + interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } - grouping EP_F1UGrp { - description "Represents the EP_F1U IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1USubtree { + list EP_F1U { + description "Represents the local end point of the user plane + interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } grouping EP_XnCGrp { @@ -114,16 +129,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; - } - } + uses EP_F1CSubtree; list EP_NgC { description "Represents the local end point of the control plane @@ -176,16 +182,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; list EP_NgU { description "Represents the local end point of the NG user plane @@ -236,26 +233,12 @@ module _3gpp-nr-nrm-ep { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { if-feature EPClassesUnderGNBDUFunction; - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the DU and CU or CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; + uses EP_F1CSubtree { + refine EP_F1C { + max-elements 1; } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the DU and CU or CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 98a702b77..f50f7873a 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -7,15 +7,17 @@ module _3gpp-nr-nrm-operatordu { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-nr-nrm-ep { prefix ep3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } @@ -76,7 +78,14 @@ module _3gpp-nr-nrm-operatordu { container attributes { uses OperatorDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; + + uses ep3gpp:EP_F1CSubtree { + refine EP_F1C { + max-elements 1; + } + } + + uses ep3gpp:EP_F1USubtree; } } } \ No newline at end of file -- GitLab From 6459076b26a6c4d264b66d309107094afc2f5497 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:19:46 +0200 Subject: [PATCH 066/100] Remove unneeded nroperatorcelldu --- yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 42afcf248..b4d490fbb 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nroperatorcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } @@ -79,7 +80,6 @@ module _3gpp-nr-nrm-nroperatorcelldu { container attributes { uses NROperatorCellDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; } } } \ No newline at end of file -- GitLab From d4187699b1af380d89fdf13cef32e3ba87f24b26 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:43:16 +0200 Subject: [PATCH 067/100] removed unneeded idx leaf from NRECMappingRule --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 81519e61c..f971ade81 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -9,11 +9,12 @@ 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 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 ; } + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-12 { reference "CR-1336 CR-1337"; } grouping NRECMappingRuleGrp { description "Represents the unified mapping rule to support Energy Cost Mapping @@ -43,12 +44,16 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NRECMappingRuleSubtree { description "Helps augmenting NRECMappingRule into multiple places."; list NRECMappingRule { - description "The mapping rule."; + description "Represents the unified mapping rule, applicable for the + group of gNBs (within a certain area), for the calculation of the + energy cost (see TS 34.423). + + NRECMappingRule can be name-contained by SubNetwork or ManagedElement. + It applies to all ManagedEntity contained by the parent."; key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type uint32; } container attributes { uses NRECMappingRuleGrp; } -- GitLab From 7263693c84631cc9c79d33bef8513f40be7ab13d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:58:07 +0200 Subject: [PATCH 068/100] corrected DANRManagementFunction --- .../_3gpp-nr-nrm-danrmanagementfunction.yang | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index d0afa896a..884fcadfa 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -3,45 +3,49 @@ module _3gpp-nr-nrm-danrmanagementfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction"; prefix "danrmanagementfunction3gpp"; - import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the DANRManagementFunction IOC + that is part of the NR 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-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } - grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR function is activated or deactivated."; + description "This attribute determines whether the intra-system ANR + function is activated or deactivated."; type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR function is activated or deactivated."; + description "This attribute determines whether the inter-system ANR + function is activated or deactivated."; type boolean; } - - } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature gnbcucp3gpp:DANRManagementFunction; + list DANRManagementFunction { + description "This IOC contains attributes to support the D-SON function + of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { uses DANRManagementFunctionGrp; + } + } } } \ No newline at end of file -- GitLab From b2130264353cc371ec0e8d98d9ec057fdf41eb07 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 May 2025 01:41:05 +0900 Subject: [PATCH 069/100] Corrected containments --- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 55 ++++------------ yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 28 +++++--- .../_3gpp-nr-nrm-externalamffunction.yang | 16 ++--- .../_3gpp-nr-nrm-externalenbfunction.yang | 32 +++++++--- .../_3gpp-nr-nrm-externaleutrancell.yang | 35 ++-------- .../_3gpp-nr-nrm-externalgnbcucpfunction.yang | 50 ++++++++++----- .../_3gpp-nr-nrm-externalgnbcuupfunction.yang | 46 ++++++++----- .../_3gpp-nr-nrm-externalgnbdufunction.yang | 58 +++++++++-------- .../_3gpp-nr-nrm-externalnrcellcu.yang | 64 ++++++++++--------- ...3gpp-nr-nrm-externalservinggwfunction.yang | 8 +-- .../_3gpp-nr-nrm-externalupffunction.yang | 12 ++-- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 46 +++++++------ yang-models/_3gpp-nr-nrm-nrnetwork.yang | 39 ++++++----- 13 files changed, 250 insertions(+), 239 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3958b9c1a..2448d72f5 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,61 +3,34 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } 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 EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2023, 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderEUtraNetwork { - description "Classes representing external entities like EUtranFrequency, - ExternalENBFunction are contained under a EUtraNetwork list/class."; - } + revision 2019-06-17 {reference "Initial revision"; } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the EUtraNetwork IOC. + Contains no additiona attributes."; } - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; - leaf-list parents { - description "Reference to all containg EUtraNetwork instances - in strict order from the root EUtraNetwork down to the immediate - parent EUtraNetwork. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetworks. - This reference MUST NOT be present for the top level EUtraNetwork and - MUST be present for other EUtraNetworks."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained EUtraNetwork instances. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetwork."; - type leafref { - path "../../../EUtraNetwork/id"; - } + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; } } } diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 0698485b4..eebe52d4a 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -3,29 +3,29 @@ module _3gpp-nr-nrm-eutranfrequency { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfrequency"; prefix "eutraneteutranfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 EUtranFrequency 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping EUtranFrequencyGrp { description "Represents the EUtranFrequency IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf earfcnDL { description "Specifies the channel number for the central DL frequency."; @@ -51,17 +51,25 @@ module _3gpp-nr-nrm-eutranfrequency { container attributes { uses EUtranFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } + feature ExternalENBFunctionUnderSubNetwork { + description "The ExternalENBFunction shall be contained under SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + if-feature ExternalENBFunctionUnderSubNetwork ; uses EUtranFrequencyWrapper ; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + feature ExternalENBFunctionUnderEUtraNetwork { + description "The ExternalENBFunction shall be contained under EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature ExternalENBFunctionUnderEUtraNetwork; uses EUtranFrequencyWrapper ; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index eb0547390..f74c5d3a0 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -5,26 +5,24 @@ module _3gpp-nr-nrm-externalamffunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalAMFFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalAMFFunctionGrp { description "Represents the ExternalAMFFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { @@ -61,12 +59,6 @@ module _3gpp-nr-nrm-externalamffunction { } augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalAMFFunctionWrapper; - } - - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalAMFFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index cdb1611c4..ed8cb6683 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -4,24 +4,27 @@ module _3gpp-nr-nrm-externalenbfunction { prefix "extenb3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + import _3gpp-nr-nrm-externaleutrancell { prefix exteutrancell3gpp; } 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 ExternalENBFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalENBFunctionGrp { description "Represets the ExternalENBFunction IOC."; @@ -48,16 +51,29 @@ module _3gpp-nr-nrm-externalenbfunction { uses ExternalENBFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree; + uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree; } } + feature ExternalENBFunctionUnderSubNetwork { + description "The ExternalENBFunction shall be contained under + SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + if-feature ExternalENBFunctionUnderSubNetwork ; uses ExternalENBFunctionWrapper; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + feature ExternalENBFunctionUnderEUtraNetwork { + description "The ExternalENBFunction shall be contained under + EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature ExternalENBFunctionUnderEUtraNetwork; uses ExternalENBFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index d3306bc8c..2a5ff1f39 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -5,25 +5,22 @@ module _3gpp-nr-nrm-externaleutrancell { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } - import _3gpp-nr-nrm-externalenbfunction { prefix extenb3gpp; } 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 ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalEUtranGenericCellGrp { description "Represents the ExternalEUtranGenericCell IOC."; @@ -106,7 +103,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellFDDWrapper { + grouping ExternalEUtranCellFDDSubtree { list ExternalEUtranCellFDD { description "Represents the common properties of external E-UTRAN FDD cell provided by eNB or NG-RAN FDD cell provided by ng-eNB."; @@ -120,7 +117,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellTDDWrapper { + grouping ExternalEUtranCellTDDSubtree { list ExternalEUtranCellTDD { description "Represents the common properties of external E-UTRAN cell TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB."; @@ -133,24 +130,4 @@ module _3gpp-nr-nrm-externaleutrancell { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellTDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellTDDWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index 6c295a404..b32301bde 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -5,40 +5,44 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; } 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 ExternalGNBCUCPFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUCPFunctionGrp { description "Represets the ExternalGNBCUCPFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } @@ -57,23 +61,35 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { list ExternalGNBCUCPFunction { description "Represents the properties, known by the management function, of a GNBCUCPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses ExternalGNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses extnrcellcu3gpp:ExternalNRCellCUSubtree; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUCPFunctionWrapper; + feature ExternalGNBCUCPFunctionUnderNRNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + NRNetwork"; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUCPFunctionUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } -} + + feature ExternalGNBCUCPFunctionUnderSubNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUCPFunctionUnderSubNetwork ; + uses ExternalGNBCUCPFunctionWrapper; + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 2445a1e99..7948b9167 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -4,11 +4,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { prefix "extgnbcuup3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). @@ -16,11 +19,10 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUUPFunctionGrp { description "Represets the ExternalGNBCUUPFunction IOC."; @@ -28,26 +30,27 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } } - grouping ExternalGNBCUUPFunctionWrapper { + grouping ExternalGNBCUUPFunctionSubtree { list ExternalGNBCUUPFunction { description "Represents the properties, known by the management function, of a GNBCUUPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -57,13 +60,24 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderNRNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUUPFunctionUnderNRNetwork; + uses ExternalGNBCUUPFunctionSubtree; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderSubNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUUPFunctionUnderSubNetwork ; + uses ExternalGNBCUUPFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 064b98db3..e8dc9d6c6 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -3,26 +3,27 @@ module _3gpp-nr-nrm-externalgnbdufunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbdufunction"; prefix "extgnbdu3gpp"; - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 ExternalGNBDUFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBDUFunctionGrp { description "Represets the ExternalGNBDUFunction IOC."; @@ -30,36 +31,28 @@ module _3gpp-nr-nrm-externalgnbdufunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } yext3gpp:inVariant; } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } - - list pLMNId { - description "Specifies the PLMN identifier to be used as part of the - global RAN node identity."; - key "mcc mnc"; - min-elements 1; - max-elements 1; - uses types3gpp:PLMNId; - } } - grouping ExternalGNBDUFunctionWrapper { + grouping ExternalGNBDUFunctionSubtree { list ExternalGNBDUFunction { description "Represents the properties, known by the management function, of a GNBDUFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -69,13 +62,24 @@ module _3gpp-nr-nrm-externalgnbdufunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBDUFunctionWrapper; + feature ExternalGNBDUFunctionUnderNRNetwork { + description "The ExternalGNBDUFunction shall be contained under + NRNetwork"; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBDUFunctionWrapper; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBDUFunctionUnderNRNetwork; + uses ExternalGNBDUFunctionSubtree; + } + + feature ExternalGNBDUFunctionUnderSubNetwork { + description "The ExternalGNBDUFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBDUFunctionUnderSubNetwork ; + uses ExternalGNBDUFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index b982aa12c..94ec2b7c7 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -5,43 +5,57 @@ module _3gpp-nr-nrm-externalnrcellcu { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-externalgnbcucpfunction { prefix extgnbcucp3gpp; } 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 ExternalNRCellCU 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalNRCellCUGrp { description "Represents the ExternalNRCellCU IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf cellLocalId { - description "Identifies an NR cell of a gNB. Together with corresponding - gNB ID it forms the NR Cell Identifier (NCI)."; - reference "NCI in 3GPP TS 38.300"; + description "It identifies a NR cell of a gNB. + + It, together with the gNB Identifier (using gNBId of the parent + GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network + sharing scenario) or ExternalCUCPFunction), identifies a NR cell within + a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300. + + The NCI can be constructed by encoding the gNB Identifier using gNBId + (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU + (for MOCN network sharing scenario) or ExternalCUCPFunction) and + cellLocalId where the gNB Identifier field is of length specified by + gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or + ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of + TS 38.413. + + The NR Cell Global identifier (NCGI) is constructed from the + PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of + the cell. + + See relation between NCI and NCGI subclause 8.2 of TS 38.300 "; mandatory true; - type int32 {range "0..16383"; } + type int32; } leaf nRPCI { - description "The Physical Cell Identity (PCI) of the NR cell."; - reference "3GPP TS 36.211"; + description "This holds the Physical Cell Identity (PCI) of the NR cell. + + allowedValues: + See 3GPP TS 36.211 subclause 6.11 for legal values of pci."; mandatory true; - type int32 { range "0..1007"; } + type int64; } list pLMNIdList { @@ -62,11 +76,11 @@ module _3gpp-nr-nrm-externalnrcellcu { } } - grouping ExternalNRCellCUWrapper { + grouping ExternalNRCellCUSubtree { list ExternalNRCellCU { - description "Represents the properties of an NRCellCU controlled by - another Management Service Provider."; - reference "3GPP TS 28.541"; + description "This IOC contains necessary attributes for inter-system + and intra-system handover. It also contains a subset of the attributes + of related IOCs controlled by Management Service Provider."; key id; uses top3gpp:Top_Grp; container attributes { @@ -75,14 +89,4 @@ module _3gpp-nr-nrm-externalnrcellcu { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalNRCellCUWrapper; - } - - augment "/nrnet3gpp:NRNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalNRCellCUWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 1fd046946..dcaba95b4 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -4,8 +4,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { prefix "extservgw3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + //import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -16,6 +15,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,7 +43,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalServingGWFunctionWrapper; } @@ -51,5 +51,5 @@ module _3gpp-nr-nrm-externalservinggwfunction { augment "/eutranet3gpp:EUtraNetwork" { if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; uses ExternalServingGWFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 11e924dab..abe82b6c8 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -4,17 +4,19 @@ module _3gpp-nr-nrm-externalupffunction { prefix "extupf3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } + /*import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/ 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 ExternalUPFFunction 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -42,7 +44,7 @@ module _3gpp-nr-nrm-externalupffunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalUPFFunctionWrapper; } @@ -50,5 +52,5 @@ module _3gpp-nr-nrm-externalupffunction { augment "/nrnet3gpp:NRNetwork" { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalUPFFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index a1589ef2b..7dc301049 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -1,30 +1,29 @@ module _3gpp-nr-nrm-nrfrequency { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrfrequency"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency"; prefix "nrfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 NRFrequency 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 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-04-25 { reference CR-1526 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial version"; } grouping NRFrequencyGrp { description "Represents the NRFrequency IOC."; - reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf absoluteFrequencySSB { description "The absolute frequency applicable for a downlink NR carrier @@ -33,18 +32,20 @@ module _3gpp-nr-nrm-nrfrequency { type uint32 { range "0.. 3279165"; } } - leaf sSBSubCarrierSpacing { - description "Sub-carrier spacing of the SSB."; + leaf ssBSubCarrierSpacing { + description "Sub-carrier spacing of the SSB. + Note that the allowed values of SSB used for representing data, + by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz."; mandatory true; - type uint8 { range "15 | 30 | 60 | 120"; } + type uint8 { range "15 | 30 | 60 | 120 | 240"; } units "kHz"; } - leaf-list multiFrequencyBandListNR { + leaf multiFrequencyBandListNR { description "List of additional frequency bands the frequency belongs to. The list is automatically set by the gNB."; + mandatory true; config false; - min-elements 0; type uint16 { range "1..256"; } } } @@ -52,23 +53,30 @@ module _3gpp-nr-nrm-nrfrequency { grouping NRFrequencyWrapper { list NRFrequency { description "Represents certain NR frequency properties."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses NRFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + feature NRFrequencyUnderNRNetwork { + description "NRFrequency shall be contained under NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature NRFrequencyUnderNRNetwork; uses NRFrequencyWrapper; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + feature NRFrequencyUnderSubNetwork { + description "NRFrequency shall be contained under SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature NRFrequencyUnderSubNetwork; uses NRFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 9e622884d..044c2d0db 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -3,40 +3,37 @@ module _3gpp-nr-nrm-nrnetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork"; prefix "nrnet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } 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 NRNetwork 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 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-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderNRNetwork { - description "Classes representing external entities like NRFrequency, - ExternalGNBCUCPFunction, ExternalGNBDUFunction - are contained under a NRNetwork list/class."; - } + revision 2019-06-17 { reference "Initial revision"; } grouping NRNetworkGrp { - description "Represents the NRNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the NRNetwork IOC. + Contains no additiona attributes."; } - list NRNetwork { - description "A subnetwork containing gNB external NR entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses NRNetworkGrp; + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list NRNetwork { + description "Represents a set of NR frequencies and external NR entities + (e.g. ExternalGNBCUCPFunction). This is used to differentiate these + entities and frequencies from those in EUTRAN."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NRNetworkGrp; + } } } } \ No newline at end of file -- GitLab From 3a9025831a98e708b2148c303e09b1a68aa496af Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 May 2025 13:00:52 +0900 Subject: [PATCH 070/100] Removed incorrect note from measurements --- yang-models/_3gpp-common-measurements.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e04577d77..a1c17734b 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -43,7 +43,7 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or - ManagedFunction. Note: KPIs will only be supported under SubNetwork + ManagedFunction. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-05-18 { reference CR-0531; } revision 2025-02-05 { reference CR-0460; } revision 2025-01-28 { reference CR-0511; } revision 2024-11-06 { reference CR-0487; } -- GitLab From b19a6520a1e694194092898124fc3bc758728c97 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Sat, 3 May 2025 15:35:10 +0000 Subject: [PATCH 071/100] Edit _3gpp-common-fm.yang add new alarmType OTHER + new revision statement --- yang-models/_3gpp-common-fm.yang | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 308f0dfd6..e97331449 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; @@ -41,6 +42,11 @@ module _3gpp-common-fm { } typedef eventType { + type enumeration { + enum OTHER { + value 1; + } + type enumeration { enum COMMUNICATIONS_ALARM { value 2; -- GitLab From ddea1098f89912194f57d7abbf61c89278e87179 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Sat, 3 May 2025 15:48:25 +0000 Subject: [PATCH 072/100] Edit _3gpp-common-fm.yang alarmType corrections --- yang-models/_3gpp-common-fm.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index e97331449..0d1d8a276 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -46,8 +46,7 @@ module _3gpp-common-fm { enum OTHER { value 1; } - - type enumeration { + enum COMMUNICATIONS_ALARM { value 2; } -- GitLab From bb60f04c86330c860dc7d4bb9c9d6c5ab54769d1 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 27 May 2025 05:27:00 +0200 Subject: [PATCH 073/100] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1702 Ts28.623 r18 CR0535 mdtplmn list yang --- yang-models/_3gpp-common-trace.yang | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index edb7e7632..460ea4b21 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 2025-05-06 { reference "0531" ; } + revision 2025-05-06 { reference "CR-0531 CR-0535" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } revision 2024-11-05 { reference "CR-0470" ; } @@ -1499,16 +1499,6 @@ module _3gpp-common-trace { reference "clauses 5.10.38 of TS 32.422."; } - list pLMNList { - when '../../../jobType = "LOGGED_MDT_ONLY"'; - key "mcc mnc"; - uses types3gpp:PLMNId; - max-elements 16; - description "It indicates the PLMNs where measurement collection, status - indication and log reporting is allowed."; - reference "Clause 5.10.24 of 3GPP TS 32.422."; - } - list areaConfigurationForNeighCell { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; @@ -1618,6 +1608,14 @@ module _3gpp-common-trace { both MN and SN. The value TRUE means the MDT configuration is for MN only."; } + + list pLMNList { + key "mcc mnc"; + uses types3gpp:PLMNId; + max-elements 16; + description "It indicates the PLMNs where measurement collection. "; + reference "Clause 5.10.24 of 3GPP TS 32.422."; + } } grouping UECoreMeasConfigGrp { -- GitLab From 5d849325e2ceb1975ff6e39a8108b1ebf72556a3 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:36:52 +0000 Subject: [PATCH 074/100] Add new file --- .../_3gpp-common-antennafunction.yang | 214 ++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 yang-models/yang-models/_3gpp-common-antennafunction.yang diff --git a/yang-models/yang-models/_3gpp-common-antennafunction.yang b/yang-models/yang-models/_3gpp-common-antennafunction.yang new file mode 100644 index 000000000..bd2097941 --- /dev/null +++ b/yang-models/yang-models/_3gpp-common-antennafunction.yang @@ -0,0 +1,214 @@ +module _3gpp-common-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-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-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + 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.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-06 { + description "Initial revision"; + } +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 types3gpp: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 types3gpp: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 types3gpp:Altitude; + } + + leaf height { + description "The height of an antenna above sea level. + Note: The value of this attribute has no operational + impact on the network, e.g. the NE behavior 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 TS 37.466. + Decprecated: Use 'elevation' attribute"; + reference "3GPP TS 37.466, Iuant interface: Application part"; + status deprecated; + units meters; + type uint64 { + fraction-digits 1; + } + } + + 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 types3gpp: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 types3gpp: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 types3gpp: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 types3gpp: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"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + + } + + augment "/me3gpp:ManagedElement" { + + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MO 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; + } + } +} -- GitLab From 6800b31922e81f3cf58154a0de228ece009e8dd0 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:38:06 +0000 Subject: [PATCH 075/100] Add new file --- .../_3gpp-common-sectorequipmentfunction.yang | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 yang-models/_3gpp-common-sectorequipmentfunction.yang diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang new file mode 100644 index 000000000..0c5ec789e --- /dev/null +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -0,0 +1,102 @@ +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; + prefix "secteqpfunc3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + 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.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { + description "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 fqBands { + description "The list of frequency bands supported by the hardware + associated with the SectorEquipmentFunction. The earfcnDl and earfcnUl + or earfcn of cells associated with the SectorEquipmentFunction must + be assigned with value within one of the specified frequencyBands values."; + config false; + type string; + } + + leaf-list theAntennaList { + description "This attribute contains the distinguished names of the + AntennaFunction."; + type types3gpp:DistinguishedName; + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + status deprecated; + config false; + type types3gpp:DistinguishedName; + } + + leaf-list theTMAList { + description "This attribute contains the DNs of one or more TMAFunctions."; + status deprecated; + config false; + type types3gpp:DistinguishedName; + } + + 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; + } + } + +} -- GitLab From 14eb641ac86d5f27fa808cfac8dd30496217ebad Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:38:27 +0000 Subject: [PATCH 076/100] Delete _3gpp-common-antennafunction.yang --- .../_3gpp-common-antennafunction.yang | 214 ------------------ 1 file changed, 214 deletions(-) delete mode 100644 yang-models/yang-models/_3gpp-common-antennafunction.yang diff --git a/yang-models/yang-models/_3gpp-common-antennafunction.yang b/yang-models/yang-models/_3gpp-common-antennafunction.yang deleted file mode 100644 index bd2097941..000000000 --- a/yang-models/yang-models/_3gpp-common-antennafunction.yang +++ /dev/null @@ -1,214 +0,0 @@ -module _3gpp-common-antennafunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-common-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-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } - 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.662 Generic Network Resource Model (NRM)"; - - revision 2025-05-06 { - description "Initial revision"; - } -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 types3gpp: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 types3gpp: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 types3gpp:Altitude; - } - - leaf height { - description "The height of an antenna above sea level. - Note: The value of this attribute has no operational - impact on the network, e.g. the NE behavior 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 TS 37.466. - Decprecated: Use 'elevation' attribute"; - reference "3GPP TS 37.466, Iuant interface: Application part"; - status deprecated; - units meters; - type uint64 { - fraction-digits 1; - } - } - - 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 types3gpp: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 types3gpp: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 types3gpp: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 types3gpp: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"; - } - } - - leaf-list theCellList { - description "This attribute contains the DNs of EUtranGenericCell - or UtranGenericCell if associations between them exist. - This attribute contains the DNs of GSMCellPart if association - between them exist. "; - config false; - status deprecated; - type types3gpp:DistinguishedName; - } - - } - - augment "/me3gpp:ManagedElement" { - - list AntennaFunction { - key id; - uses top3gpp:Top_Grp; - description "This MO 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; - } - } -} -- GitLab From f55820034cdb57c46827dc7c8a2d09eb956f13c6 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:39:12 +0000 Subject: [PATCH 077/100] Add new file --- yang-models/_3gpp-common-antennafunction.yang | 214 ++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 yang-models/_3gpp-common-antennafunction.yang diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang new file mode 100644 index 000000000..cb2987888 --- /dev/null +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -0,0 +1,214 @@ +module _3gpp-common-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-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-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + 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.662 Generic Network Resource Model (NRM)"; + + revision 2025-03-27 { + description "Initial revision"; + } +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 types3gpp: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 types3gpp: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 types3gpp:Altitude; + } + + leaf height { + description "The height of an antenna above sea level. + Note: The value of this attribute has no operational + impact on the network, e.g. the NE behavior 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 TS 37.466. + Decprecated: Use 'elevation' attribute"; + reference "3GPP TS 37.466, Iuant interface: Application part"; + status deprecated; + units meters; + type uint64 { + fraction-digits 1; + } + } + + 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 types3gpp: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 types3gpp: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 types3gpp: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 types3gpp: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"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + + } + + augment "/me3gpp:ManagedElement" { + + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MO 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; + } + } +} -- GitLab From 363242d4d16a410828416bd5ba590af89882d48e Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:41:10 +0000 Subject: [PATCH 078/100] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index cb2987888..ec060fb5d 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -6,7 +6,6 @@ module _3gpp-common-antennafunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -62,9 +61,7 @@ grouping AntennaFunctionGrp { reference "3GPP TS 37.466, Iuant interface: Application part"; status deprecated; units meters; - type uint64 { - fraction-digits 1; - } + type uint64; } leaf horizBeamWidth { -- GitLab From 9e42cb06863ed67cf1e0af72ce375aecd5860474 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:41:30 +0000 Subject: [PATCH 079/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 0c5ec789e..b9f922fbf 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -6,7 +6,6 @@ module _3gpp-common-sectorequipmentfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; -- GitLab From 66247dacba03e22ffb7499a11b79c75cf4ef2120 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:51:18 +0000 Subject: [PATCH 080/100] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 58 +++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index b9f922fbf..6cee6a465 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -2,35 +2,36 @@ module _3gpp-common-sectorequipmentfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; prefix "secteqpfunc3gpp"; - + 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.662 Generic Network Resource Model (NRM)"; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; revision 2025-05-01 { description "Initial revision"; } - grouping SectorEquipmentFunctionGrp { + + grouping SectorEquipmentFunctionGrp { description "Represents the SectorEquipmentFunction."; uses mf3gpp:ManagedFunctionGrp; - + leaf confOutputPower { - description "It defines the allowed total power to use for all + 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 fqBands { description "The list of frequency bands supported by the hardware associated with the SectorEquipmentFunction. The earfcnDl and earfcnUl @@ -39,63 +40,60 @@ module _3gpp-common-sectorequipmentfunction { config false; type string; } - + leaf-list theAntennaList { - description "This attribute contains the distinguished names of the + description "This attribute contains the distinguished names of the AntennaFunction."; type types3gpp:DistinguishedName; - } - + } + leaf-list theCellList { description "This attribute contains the DNs of EUtranGenericCell or UtranGenericCell if associations between them exist. This attribute contains the DNs of GSMCellPart if association between them exist. "; - status deprecated; config false; - type types3gpp:DistinguishedName; + type types3gpp:DistinguishedName; } - + leaf-list theTMAList { description "This attribute contains the DNs of one or more TMAFunctions."; - status deprecated; config false; type types3gpp:DistinguishedName; } - + 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 + 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 + Note: referencedBy is a DN datatype and so can reference an MOI under a different ME"; config false; - type types3gpp:DistinguishedName; + 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 + 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; - } - } + } +} } -- GitLab From da1ffc44f5ec9bdbd413f9c07aa08fa3668412c5 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:53:16 +0000 Subject: [PATCH 081/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 776e9704f29c6e38bac6116883b2889c777a8097 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 8 May 2025 19:53:55 +0000 Subject: [PATCH 082/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 6cee6a465..8ece48ae9 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -95,5 +95,4 @@ module _3gpp-common-sectorequipmentfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } - } -- GitLab From fe8661151fded0f5e38586f65e8a91ebeb6b1fb6 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 10:08:50 +0000 Subject: [PATCH 083/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 8ece48ae9..df60212af 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,8 +1,8 @@ module _3gpp-common-sectorequipmentfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; - prefix "secteqpfunc3gpp"; - + prefix "scteqpfun3gpp"; + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -16,7 +16,7 @@ module _3gpp-common-sectorequipmentfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - revision 2025-05-01 { + revision 2025-05-06 { description "Initial revision"; } -- GitLab From f6308e561e5442d60791a22b3cdc3c1ecca28fd7 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 11:06:07 +0000 Subject: [PATCH 084/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index df60212af..acde35c46 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -34,9 +34,14 @@ module _3gpp-common-sectorequipmentfunction { leaf fqBands { description "The list of frequency bands supported by the hardware - associated with the SectorEquipmentFunction. The earfcnDl and earfcnUl - or earfcn of cells associated with the SectorEquipmentFunction must - be assigned with value within one of the specified frequencyBands values."; + associated with the SectorEquipmentFunction. The earfcnDl and + earfcnUl or earfcn of cells associated with the SectorEquipmentFunction + must be assigned with value within one of the specified frequencyBands values. + + AllowedValues: + A list of frequency bands expressed as strings. + Valid frequency band values may be found in 3GPP TS 25.104 (3G), + 36.104 (LTE) and 38.104 (NR)."; config false; type string; } -- GitLab From df855f0785338680c10ea8a6a7c0897434f0a56c Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:24:39 +0000 Subject: [PATCH 085/100] Edit _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 acde35c46..bce164cd8 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -100,4 +100,4 @@ module _3gpp-common-sectorequipmentfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} +} \ No newline at end of file -- GitLab From 6ae63401e6af93743d0c0f68f964e497d283748e Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:30:07 +0000 Subject: [PATCH 086/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index bce164cd8..3e9962ccd 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,5 +1,4 @@ -module _3gpp-common-sectorequipmentfunction { - yang-version 1.1; +module _3gpp-common-sectorequipmentfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; prefix "scteqpfun3gpp"; -- GitLab From 71cc5f37e81ce73d8acd9978a829e7c39c51db14 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:35:08 +0000 Subject: [PATCH 087/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 3e9962ccd..f9cc99a3f 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,4 +1,5 @@ -module _3gpp-common-sectorequipmentfunction { yang-version 1.1; +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; prefix "scteqpfun3gpp"; @@ -15,9 +16,7 @@ module _3gpp-common-sectorequipmentfunction { yang-version 1.1; TTA, TTC). All rights reserved."; reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - revision 2025-05-06 { - description "Initial revision"; - } + revision 2025-05-06 { description "Initial revision"; } grouping SectorEquipmentFunctionGrp { description "Represents the SectorEquipmentFunction."; -- GitLab From 17ae9f2024d9c1f138b2b17cf147ccc44d178531 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 14:35:59 +0000 Subject: [PATCH 088/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From e560212f8a43ec1a66de2ef34e713df8e415579d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:24:41 +0000 Subject: [PATCH 089/100] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index f9cc99a3f..1e6d69a21 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -43,28 +43,7 @@ module _3gpp-common-sectorequipmentfunction { config false; type string; } - - leaf-list theAntennaList { - description "This attribute contains the distinguished names of the - AntennaFunction."; - type types3gpp:DistinguishedName; - } - - leaf-list theCellList { - description "This attribute contains the DNs of EUtranGenericCell - or UtranGenericCell if associations between them exist. - This attribute contains the DNs of GSMCellPart if association - between them exist. "; - config false; - type types3gpp:DistinguishedName; - } - - leaf-list theTMAList { - description "This attribute contains the DNs of one or more TMAFunctions."; - config false; - type types3gpp:DistinguishedName; - } - + leaf-list referencedBy { description "This attribute contains the DNs of one or more objects that refer to this object. -- GitLab From 3ea21d69a028a815ade27c58cc140cb21b726aa8 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:54:06 +0000 Subject: [PATCH 090/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 7b58322538a5040ffe3fda2141f3ba5806e3470b Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:33:55 +0000 Subject: [PATCH 091/100] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 1e6d69a21..3b09829d4 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -30,16 +30,23 @@ module _3gpp-common-sectorequipmentfunction { type uint32; } - leaf fqBands { - description "The list of frequency bands supported by the hardware - associated with the SectorEquipmentFunction. The earfcnDl and - earfcnUl or earfcn of cells associated with the SectorEquipmentFunction - must be assigned with value within one of the specified frequencyBands values. - - AllowedValues: - A list of frequency bands expressed as strings. - Valid frequency band values may be found in 3GPP TS 25.104 (3G), - 36.104 (LTE) and 38.104 (NR)."; + 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 +
        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; } -- GitLab From a0932fcb58378c37b6561ef2df27c134c246e634 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:37:57 +0000 Subject: [PATCH 092/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From dddce0cc00fa2b14281e0d8cff68797da3e2da99 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:04:11 +0000 Subject: [PATCH 093/100] Edit _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 3b09829d4..ac6dc5f42 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -42,7 +42,7 @@ module _3gpp-common-sectorequipmentfunction { AllowedValues: Operating band id or supported frequency tuple -
          expressed as a string. + expressed as a string. Examples for NR: Bands: {'n1', 'n12'} -- GitLab From 854ce85bd5906cdde04d5c077dd58796c3726b9e Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:08:25 +0000 Subject: [PATCH 094/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 7f207b517cd8c4aa8cd74e23962d5e6eb8d288fc Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 06:39:13 +0000 Subject: [PATCH 095/100] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index ec060fb5d..532efc006 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -49,21 +49,7 @@ grouping AntennaFunctionGrp { below sea level. If empty, value is not defined."; type types3gpp:Altitude; } - - leaf height { - description "The height of an antenna above sea level. - Note: The value of this attribute has no operational - impact on the network, e.g. the NE behavior 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 TS 37.466. - Decprecated: Use 'elevation' attribute"; - reference "3GPP TS 37.466, Iuant interface: Application part"; - status deprecated; - units meters; - type uint64; - } - + leaf horizBeamWidth { description "The 3 dB power beamwidth of the antenna pattern in the horizontal plane. -- GitLab From 3e5f4a70eaaca3f5d1d566b81a2bf69210cefc95 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 07:08:25 +0000 Subject: [PATCH 096/100] Edit _3gpp-common-antennafunction.yang -- GitLab From 515ab8a0d4d65821d7a6a83c8de5389d4f5b1d9b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:44:05 +0000 Subject: [PATCH 097/100] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index ac6dc5f42..e125a28bd 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -10,8 +10,9 @@ module _3gpp-common-sectorequipmentfunction { 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). + 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.662 Generic Network Resource Model (NRM)"; -- GitLab From dabd5093c2da2fc5fac69057a1b286b2195c7faa Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:45:12 +0000 Subject: [PATCH 098/100] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index 532efc006..3ad251f21 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -185,7 +185,7 @@ grouping AntennaFunctionGrp { list AntennaFunction { key id; uses top3gpp:Top_Grp; - description "This MO represents an array of radiating elements that + description "This MOI represents an array of radiating elements that may be tilted to adjust the RF coverage of a cell(s)."; container attributes { -- GitLab From 146a9a95ee504e0158b4ecd0540a654de54bb91b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:55:57 +0000 Subject: [PATCH 099/100] Edit _3gpp-common-antennafunction.yang -- GitLab From ec0bd8f5c835571f59aaf76c0cac5d1c1865025e Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:56:36 +0000 Subject: [PATCH 100/100] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab