From 3b7e1f65ac40d35e5dd77c9377d2e050b4781d0c Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 26 Mar 2025 18:54:15 +0000 Subject: [PATCH 01/25] 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 55c1b68a2..bcb3ac324 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-25 { reference CR-xxxx ; } revision 2023-09-17 { reference CR-1042 ; } 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 fe346e60136c5011602d727c8307559fbf2dee68 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 20:12:37 +0000 Subject: [PATCH 02/25] 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 bcb3ac324..ac35a3efe 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-25 { reference CR-xxxx ; } + revision 2025-03-25 { reference CR-1502 ; } revision 2023-09-17 { reference CR-1042 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From dd558764afa25483f8c5d78bfcc2f5d82c2d9bc7 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 14 Apr 2025 13:58:38 +0000 Subject: [PATCH 03/25] 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 ac35a3efe..0e166be1f 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-25 { reference CR-1502 ; } + revision 2025-03-23 { reference CR-1502 ; } revision 2023-09-17 { reference CR-1042 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From 0b1a45563d9b105cdc1c41aa979acac8da425de0 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 23:44:09 +0100 Subject: [PATCH 04/25] add invariant to dnprefix --- yang-models/_3gpp-common-mecontext.yang | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index ed183f1a7..9626fb6ea 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; } @@ -24,6 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-23 { reference "CR-0523"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { @@ -31,6 +33,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."; -- GitLab From dea76490922f84a98b1135026e029271ea693fd9 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 14:33:53 +0000 Subject: [PATCH 05/25] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 9c2965d85..f55c97428 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-05-02 { reference "CR-0xxx" ; } revision 2025-02-05 { reference "CR-0502" ; } revision 2024-11-05 { reference "CR-0469" ; } revision 2024-08-09 { reference "CR-0419" ; } @@ -1228,13 +1229,11 @@ module _3gpp-common-trace { } list pLMNList { - when '../jobType = "LOGGED_MDT_ONLY"'; key "mcc mnc"; uses types3gpp:PLMNId; min-elements 1; max-elements 16; - description "It indicates the PLMNs where measurement collection, status - indication and log reporting is allowed."; + description "It indicates the PLMNs where measurement collection."; reference "Clause 5.10.24 of 3GPP TS 32.422"; } -- GitLab From c7498106d3de30de8ee71ad3c2b12ac7987353e5 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 23 Apr 2025 13:44:23 +0000 Subject: [PATCH 06/25] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index f55c97428..a57220b4f 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1229,11 +1229,15 @@ module _3gpp-common-trace { } list pLMNList { + when '../jobType = "LOGGED_MDT_ONLY"' + + 'or ../jobType = "IMMEDIATE_MDT_ONLY"' + + 'or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; key "mcc mnc"; uses types3gpp:PLMNId; min-elements 1; max-elements 16; - description "It indicates the PLMNs where measurement collection."; + 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"; } -- GitLab From fc1f4a23e3d22a90c9aa4279d78a80efe6203c9e Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Thu, 24 Apr 2025 01:57:08 +0000 Subject: [PATCH 07/25] Update file _3gpp-common-trace.yang --- 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 a57220b4f..5f4d51acd 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-05-02 { reference "CR-0xxx" ; } + revision 2025-05-05 { reference "CR-0xxx" ; } revision 2025-02-05 { reference "CR-0502" ; } revision 2024-11-05 { reference "CR-0469" ; } revision 2024-08-09 { reference "CR-0419" ; } -- GitLab From 4ab4b64faf2cb5f672e332fc0f72532993750f5a Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Sat, 26 Apr 2025 12:26:02 +0000 Subject: [PATCH 08/25] Update file _3gpp-common-trace.yang --- 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 5f4d51acd..1d9d05296 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-05-05 { reference "CR-0xxx" ; } + revision 2025-05-05 { reference "CR-0534" ; } revision 2025-02-05 { reference "CR-0502" ; } revision 2024-11-05 { reference "CR-0469" ; } revision 2024-08-09 { reference "CR-0419" ; } -- GitLab From 3b213eafb77ed5e0ae91d85ed29eb791d543ef92 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 17:39:49 +0000 Subject: [PATCH 09/25] Add new file --- yang-models/_3gpp-common-antennafunction.yang | 210 ++++++++++++++++++ 1 file changed, 210 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..9d16211ff --- /dev/null +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -0,0 +1,210 @@ +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-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-05 { 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; + } + + 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 0d221ab0c7cd7e2f371260c47dd0df4164321998 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 17:41:34 +0000 Subject: [PATCH 10/25] Add new file --- .../_3gpp-common-sectorequipmentfunction.yang | 101 ++++++++++++++++++ 1 file changed, 101 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..1a2f7ce3c --- /dev/null +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -0,0 +1,101 @@ +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; + prefix "scteqpfun3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the 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-05 { 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. + + 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; + } + + 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. + + In the case of SectorEquipmentFunction , these referring objects + may include Cells, NRSectorCarriers if associations between them + and the SectorEquipmentFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list SectorEquipmentFunction { + key id; + uses top3gpp:Top_Grp; + description "This IOC represents a set of cells within a geographical + area that has common functions relating to AntennaFunction, TMAFunction + and supporting equipment, such as power amplifier."; + + must 'id != ""' { + error-message "Empty id value is not allowed."; + } + + container attributes { + uses SectorEquipmentFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } +} +} \ No newline at end of file -- GitLab From b1107837529ee23bd954dd639818bbecacff1a56 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 17:53:01 +0000 Subject: [PATCH 11/25] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 7ce327fa1a90daf9c035b0650a2b8cc00f582279 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 17:57:30 +0000 Subject: [PATCH 12/25] Edit _3gpp-common-antennafunction.yang -- GitLab From 3a84560334003feceabca9dba516e356fc8bfdba Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:23:44 +0000 Subject: [PATCH 13/25] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 1a2f7ce3c..026cd0591 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -44,27 +44,6 @@ module _3gpp-common-sectorequipmentfunction { 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 81c5c72e2045bdfa3857d960d7bd0bb2ec609a0b Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:53:16 +0000 Subject: [PATCH 14/25] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 2eb39ea430a47c8f9e854b24962290a0cae6a014 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:31:54 +0000 Subject: [PATCH 15/25] 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 026cd0591..ea467853a 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -29,17 +29,24 @@ module _3gpp-common-sectorequipmentfunction { 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. - 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 67e66bef133daeefc751596b2be36b1d8876d068 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:37:10 +0000 Subject: [PATCH 16/25] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 69 +------------------ 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index ea467853a..5505dd0fd 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,35 +1,3 @@ -module _3gpp-common-sectorequipmentfunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; - prefix "scteqpfun3gpp"; - - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the 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-05 { 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-list fqBandList { description "The list of frequency bands/ranges supported by the hardware associated with the SectorEquipmentFunction. The @@ -49,39 +17,4 @@ module _3gpp-common-sectorequipmentfunction { Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; config false; type string; - } - - leaf-list referencedBy { - description "This attribute contains the DNs of one or more objects - that refer to this object. - - In the case of SectorEquipmentFunction , these referring objects - may include Cells, NRSectorCarriers if associations between them - and the SectorEquipmentFunction exist. - - Note: referencedBy is a DN datatype and so can reference an MOI - under a different ME"; - config false; - type types3gpp:DistinguishedName; - } - } - - augment "/me3gpp:ManagedElement" { - list SectorEquipmentFunction { - key id; - uses top3gpp:Top_Grp; - description "This IOC represents a set of cells within a geographical - area that has common functions relating to AntennaFunction, TMAFunction - and supporting equipment, such as power amplifier."; - - must 'id != ""' { - error-message "Empty id value is not allowed."; - } - - container attributes { - uses SectorEquipmentFunctionGrp; - } - uses mf3gpp:ManagedFunctionContainedClasses; - } -} -} \ No newline at end of file + } \ No newline at end of file -- GitLab From 2e9bf86abe303bec7dd8de6bf7ee22148e0c80f9 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:42:20 +0000 Subject: [PATCH 17/25] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 5505dd0fd..700d6dc34 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,3 +1,35 @@ +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; + prefix "scteqpfun3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the 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-05 { 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-list fqBandList { description "The list of frequency bands/ranges supported by the hardware associated with the SectorEquipmentFunction. The @@ -17,4 +49,60 @@ Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; config false; type string; - } \ No newline at end of file + } + + 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. + + 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 19badc8aaf6bb402d50801dd9b35ab2f191226f3 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:03:09 +0000 Subject: [PATCH 18/25] 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 700d6dc34..96206f986 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 c5958d5916e36a4fc5932cdace3fd2162d3b0ce5 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:07:46 +0000 Subject: [PATCH 19/25] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 299e109bd21b1f79a696475f2cbed26173226ffb Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 07:53:52 +0000 Subject: [PATCH 20/25] 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 9d16211ff..2365a19e9 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -48,21 +48,7 @@ module _3gpp-common-antennafunction { 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 27bebc276e65ef666424d13561787223a63aaccb Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 07:56:39 +0000 Subject: [PATCH 21/25] Edit _3gpp-common-antennafunction.yang -- GitLab From 445edc9534a5b4d7ecd5faddc4f3ce99025ef419 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:41:12 +0000 Subject: [PATCH 22/25] 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 2365a19e9..7748e448f 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -184,7 +184,7 @@ module _3gpp-common-antennafunction { 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 9dade47e0515ff47a3439f2d9b92fa85775c1c53 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:42:45 +0000 Subject: [PATCH 23/25] 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 96206f986..39202e031 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 e7f89a9f15a0dd944298f518bf65e653e3f816fa Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:53:38 +0000 Subject: [PATCH 24/25] Edit _3gpp-common-antennafunction.yang -- GitLab From b6bb7b427c84883e34835b163cc4e21430325698 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:54:42 +0000 Subject: [PATCH 25/25] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab