From 21accaad8c8af0215b025edd151eef9cfae1294d Mon Sep 17 00:00:00 2001 From: ligan Date: Thu, 8 May 2025 11:13:21 +0000 Subject: [PATCH 01/12] Update file _3gpp-energy-nrm-energyinformation.yang --- .../_3gpp-energy-nrm-energyinformation.yang | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 yang-models/_3gpp-energy-nrm-energyinformation.yang diff --git a/yang-models/_3gpp-energy-nrm-energyinformation.yang b/yang-models/_3gpp-energy-nrm-energyinformation.yang new file mode 100644 index 000000000..ca09877f4 --- /dev/null +++ b/yang-models/_3gpp-energy-nrm-energyinformation.yang @@ -0,0 +1,121 @@ +module _3gpp-energy-nrm-energyinformation { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-energy-nrm-energyinformation; + prefix energyinformation3gpp; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the Energy Information NRM. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.310"; + + revision 2025-05-08 { reference CR-1273 ; } + + + feature energyinformationUnderSubNetwork { + description "The energyinformation shall be contained under SubNetwork"; + } + + feature energyinformationUnderManagedElement { + description "The energyrelatedinformation shall be contained under ManagedElement"; + } + + grouping EnergySourceInfo { + description "This data type defines the information related to a type of energy source."; + + leaf energySourceType { + type string; + config true; + description "The attribute is used to indicate the type of energy source used by +an energy supply mode to produce the energy."; + } + + leaf energySourceCef { + type real; + config true; + units kg CO2eq/kWh; + description "The attribute is used to indicate the Carbon Emission Factor of +a type of energy source. Its unit is kg CO2eq / kWh. + } + + leaf renewableEnergy { + type boolean; + config true; + description "This attribute represents if the energy source is +renewable or non-renewable. + } + + leaf energyCompositionPercentage { + type real; + config true; + default 100; + description "The attribute is used to indicate the percentage of energy source type + used by the energy supply mode."; + } + + } + + grouping EnergyInfoGroup { + description "This IOC represents a group of Network Elements and information related +to the energy supply modes that are used to power them."; + + list energySupplyModeRefList { + type DN; + config true; + description "The list of energy supply modes for the Network Elements of the group"; + } + + list memberDNList { + type DN; + config true; + default 0; + description "This attribute contains the DNs of managed entities that +are members of the energy info group."; + } + + } + + grouping EnergySupplyInfo { + description "This IOC defines the information related to energy supply +and the sources used to produce the energy."; + + leaf energySupplyMode { + type enumeration { + enum GRID_ELECTRICITY; + enum BACKUP_ENERGY; + enum LOCALLY_GENERATED_ENERGY; + } + config true; + description "This attribute indicates the mode by which energy +is supplied to a Network Element. + } + + list energySourceList { + type EnergySourceInfo; + config true; + description "This attribute represents the list of sources used to produce +the energy by the supplier. This includes energy related information i.e., +carbon emission and renewable energy related information, and the percentage of +the energy produced using the source."; + } + + } + + augment "/subnet3gpp:SubNetwork" { + if-feature energyinformationUnderSubNetwork; + uses EnergyInfoGroup; + } + + augment "/me3gpp:ManagedElement" { + if-feature energyinformationUnderManagedElement; + uses EnergyInfoGroup; + } +} \ No newline at end of file -- GitLab From 4bb9fd9ebe692f1a4ce60c9d11e1e49ae7f577b9 Mon Sep 17 00:00:00 2001 From: ligan Date: Thu, 8 May 2025 11:14:17 +0000 Subject: [PATCH 02/12] Update file _3gpp-energy-nrm-energyinformation.yang --- yang-models/_3gpp-energy-nrm-energyinformation.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-energy-nrm-energyinformation.yang b/yang-models/_3gpp-energy-nrm-energyinformation.yang index ca09877f4..96518447d 100644 --- a/yang-models/_3gpp-energy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-energy-nrm-energyinformation.yang @@ -17,7 +17,7 @@ module _3gpp-energy-nrm-energyinformation { TTA, TTC). All rights reserved."; reference "3GPP TS 28.310"; - revision 2025-05-08 { reference CR-1273 ; } + revision 2025-05-08 { reference CR-abcd ; } feature energyinformationUnderSubNetwork { -- GitLab From 910e74f57b71bccb0f465fbf49aa9dc9bb27b80d Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 8 May 2025 14:43:29 +0200 Subject: [PATCH 03/12] Edit _3gpp-energy-nrm-energyinformation.yang Balazs updates 1 --- yang-models/_3gpp-energy-nrm-energyinformation.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-energy-nrm-energyinformation.yang b/yang-models/_3gpp-energy-nrm-energyinformation.yang index 96518447d..f63f6fda8 100644 --- a/yang-models/_3gpp-energy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-energy-nrm-energyinformation.yang @@ -2,7 +2,7 @@ module _3gpp-energy-nrm-energyinformation { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-energy-nrm-energyinformation; - prefix energyinformation3gpp; + prefix engyinfo3gpp; import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } @@ -17,7 +17,7 @@ module _3gpp-energy-nrm-energyinformation { TTA, TTC). All rights reserved."; reference "3GPP TS 28.310"; - revision 2025-05-08 { reference CR-abcd ; } + revision 2025-05-07 { reference CR-abcd ; } feature energyinformationUnderSubNetwork { @@ -41,7 +41,7 @@ an energy supply mode to produce the energy."; leaf energySourceCef { type real; config true; - units kg CO2eq/kWh; + units "kg CO2eq/kWh"; description "The attribute is used to indicate the Carbon Emission Factor of a type of energy source. Its unit is kg CO2eq / kWh. } -- GitLab From 6d35c30da74a3eb5b6996f50a5de7b54d5b0b546 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 8 May 2025 15:02:24 +0200 Subject: [PATCH 04/12] Edit _3gpp-energy-nrm-energyinformation.yang --- .../_3gpp-energy-nrm-energyinformation.yang | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/yang-models/_3gpp-energy-nrm-energyinformation.yang b/yang-models/_3gpp-energy-nrm-energyinformation.yang index f63f6fda8..1f486d4ed 100644 --- a/yang-models/_3gpp-energy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-energy-nrm-energyinformation.yang @@ -28,34 +28,34 @@ module _3gpp-energy-nrm-energyinformation { description "The energyrelatedinformation shall be contained under ManagedElement"; } - grouping EnergySourceInfo { + grouping EnergySourceInfoGrp { description "This data type defines the information related to a type of energy source."; leaf energySourceType { type string; - config true; description "The attribute is used to indicate the type of energy source used by an energy supply mode to produce the energy."; } leaf energySourceCef { - type real; - config true; + type decimal64 { + fraction-digits 2; + } units "kg CO2eq/kWh"; description "The attribute is used to indicate the Carbon Emission Factor of -a type of energy source. Its unit is kg CO2eq / kWh. +a type of energy source. Its unit is kg CO2eq / kWh."; } leaf renewableEnergy { type boolean; - config true; description "This attribute represents if the energy source is -renewable or non-renewable. +renewable or non-renewable."; } leaf energyCompositionPercentage { - type real; - config true; + type uint8 { + range 0..100; + } default 100; description "The attribute is used to indicate the percentage of energy source type used by the energy supply mode."; @@ -63,27 +63,24 @@ renewable or non-renewable. } - grouping EnergyInfoGroup { + grouping EnergyInfoGroupGrp { description "This IOC represents a group of Network Elements and information related to the energy supply modes that are used to power them."; list energySupplyModeRefList { - type DN; - config true; + type types3gpp:DistinguishedName; description "The list of energy supply modes for the Network Elements of the group"; } list memberDNList { - type DN; - config true; - default 0; + type types3gpp:DistinguishedName; description "This attribute contains the DNs of managed entities that are members of the energy info group."; } } - grouping EnergySupplyInfo { + grouping EnergySupplyInfoGrp { description "This IOC defines the information related to energy supply and the sources used to produce the energy."; @@ -93,14 +90,12 @@ and the sources used to produce the energy."; enum BACKUP_ENERGY; enum LOCALLY_GENERATED_ENERGY; } - config true; description "This attribute indicates the mode by which energy is supplied to a Network Element. } list energySourceList { type EnergySourceInfo; - config true; description "This attribute represents the list of sources used to produce the energy by the supplier. This includes energy related information i.e., carbon emission and renewable energy related information, and the percentage of @@ -111,11 +106,11 @@ the energy produced using the source."; augment "/subnet3gpp:SubNetwork" { if-feature energyinformationUnderSubNetwork; - uses EnergyInfoGroup; + uses EnergyInfoGroupGrp; } augment "/me3gpp:ManagedElement" { if-feature energyinformationUnderManagedElement; - uses EnergyInfoGroup; + uses EnergyInfoGroupGrp; } } \ No newline at end of file -- GitLab From 2c2f0ae4b51f0e76b1dbc4e84e26b3f77168bae4 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 8 May 2025 15:06:48 +0200 Subject: [PATCH 05/12] Edit _3gpp-energy-nrm-energyinformation.yang --- yang-models/_3gpp-energy-nrm-energyinformation.yang | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-energy-nrm-energyinformation.yang b/yang-models/_3gpp-energy-nrm-energyinformation.yang index 1f486d4ed..f52a61430 100644 --- a/yang-models/_3gpp-energy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-energy-nrm-energyinformation.yang @@ -68,11 +68,13 @@ renewable or non-renewable."; to the energy supply modes that are used to power them."; list energySupplyModeRefList { + description ""; + type types3gpp:DistinguishedName; description "The list of energy supply modes for the Network Elements of the group"; } - list memberDNList { + leaf-list memberDNList { type types3gpp:DistinguishedName; description "This attribute contains the DNs of managed entities that are members of the energy info group."; @@ -95,11 +97,13 @@ is supplied to a Network Element. } list energySourceList { - type EnergySourceInfo; description "This attribute represents the list of sources used to produce the energy by the supplier. This includes energy related information i.e., carbon emission and renewable energy related information, and the percentage of the energy produced using the source."; + key idx; + leaf idx { type uint32; } + uses EnergySourceInfoGrp; } } -- GitLab From 98453d5b1006cc1fb99c20750a569960976e39d3 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 8 May 2025 15:13:17 +0200 Subject: [PATCH 06/12] Update 2 files - /yang-models/_3gpp-energy-nrm-energyinformation.yang - /yang-models/_3gpp-engy-nrm-energyinformation.yang --- ...information.yang => _3gpp-engy-nrm-energyinformation.yang} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename yang-models/{_3gpp-energy-nrm-energyinformation.yang => _3gpp-engy-nrm-energyinformation.yang} (94%) diff --git a/yang-models/_3gpp-energy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang similarity index 94% rename from yang-models/_3gpp-energy-nrm-energyinformation.yang rename to yang-models/_3gpp-engy-nrm-energyinformation.yang index f52a61430..a6c5d44ef 100644 --- a/yang-models/_3gpp-energy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -1,7 +1,7 @@ -module _3gpp-energy-nrm-energyinformation { +module _3gpp-engy-nrm-energyinformation { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-energy-nrm-energyinformation; + namespace urn:3gpp:sa5:_3gpp-engy-nrm-energyinformation; prefix engyinfo3gpp; import _3gpp-common-top { prefix top3gpp; } -- GitLab From 6cabdba4efaabde753bea50953c7249aa4aeee14 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 8 May 2025 21:15:43 +0200 Subject: [PATCH 07/12] fixing pyang errors --- .../_3gpp-engy-nrm-energyinformation.yang | 99 ++++++++++++------- 1 file changed, 66 insertions(+), 33 deletions(-) diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang index a6c5d44ef..7868ff1bd 100644 --- a/yang-models/_3gpp-engy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -4,8 +4,6 @@ module _3gpp-engy-nrm-energyinformation { namespace urn:3gpp:sa5:_3gpp-engy-nrm-energyinformation; prefix engyinfo3gpp; - import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -29,27 +27,40 @@ module _3gpp-engy-nrm-energyinformation { } grouping EnergySourceInfoGrp { - description "This data type defines the information related to a type of energy source."; + description "This data type defines the information related to a type + of energy source. This information is configured by the operator with + the information obtained from sources external to 3GPP. The attribute + energySourceType is used to indicate the type of energy source used by + an energy supply mode to produce the energy. The attribute energySourceCef + is used to indicate the carbon emission factor of the energy source. + The attribute renewableEnergy is used to indicate if the energy source + is renewable or non-renewable. The attribute energyCompositionPercentage + is used to indicate the percentage of energy source used to produce the + energy."; leaf energySourceType { type string; - description "The attribute is used to indicate the type of energy source used by -an energy supply mode to produce the energy."; + mandatory true; + description "The attribute is used to indicate the type of energy source + used by an energy supply mode to produce the energy."; } leaf energySourceCef { type decimal64 { fraction-digits 2; } + mandatory true; units "kg CO2eq/kWh"; - description "The attribute is used to indicate the Carbon Emission Factor of -a type of energy source. Its unit is kg CO2eq / kWh."; + description "The attribute is used to indicate the Carbon Emission Factor + of a type of energy source. Its unit is kg CO2eq / kWh."; } leaf renewableEnergy { + description "This attribute represents if the energy source is renewable + or non-renewable. This information is configured by the operator with the + information obtained from external sources."; type boolean; - description "This attribute represents if the energy source is -renewable or non-renewable."; + mandatory true; } leaf energyCompositionPercentage { @@ -57,55 +68,77 @@ renewable or non-renewable."; range 0..100; } default 100; - description "The attribute is used to indicate the percentage of energy source type - used by the energy supply mode."; + description "The attribute is used to indicate the percentage of energy + source type used by the energy supply mode."; } } grouping EnergyInfoGroupGrp { - description "This IOC represents a group of Network Elements and information related -to the energy supply modes that are used to power them."; - - list energySupplyModeRefList { - description ""; - + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; + + leaf energySupplyModeRefList { + description "The list of energy supply modes for the Network Elements + of the group. This information is configured by the operator with the + information obtained from external sources."; type types3gpp:DistinguishedName; - description "The list of energy supply modes for the Network Elements of the group"; } - leaf-list memberDNList { + leaf memberDNList { + description "This attribute contains the DNs of managed entities + that are members of the energy info group."; type types3gpp:DistinguishedName; - description "This attribute contains the DNs of managed entities that -are members of the energy info group."; } } grouping EnergySupplyInfoGrp { - description "This IOC defines the information related to energy supply -and the sources used to produce the energy."; + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; leaf energySupplyMode { + description "The mode by which energy is supplied to a Network Element. + This information is configured by the operator with the information + obtained from external sources.The mode can be one of the following: + GRID_ELECTRICITY: Energy from local grid electricity + (See Grid electricity in clause 6 of ITU-T Recommendation L.1333 [D]) + BACKUP_ENERGY: Energy from backup diesel or other types (from battery + banks/UPS), or from generators such as solar panels. (See Backup energy + in clause 6 of ITU-T Recommendation L.1333[D]) LOCALLY_GENERATED_ENERGY: + Energy provided by local generators not used for backup functionality, + e.g., solar panels, wind generator etc. (See Locally generated energy + in clause 6 of ITU-T Recommendation L.1333[D])"; + mandatory true; type enumeration { enum GRID_ELECTRICITY; enum BACKUP_ENERGY; - enum LOCALLY_GENERATED_ENERGY; - } - description "This attribute indicates the mode by which energy -is supplied to a Network Element. + enum LOCALLY_GENERATED_ENERGY; + } } list energySourceList { - description "This attribute represents the list of sources used to produce -the energy by the supplier. This includes energy related information i.e., -carbon emission and renewable energy related information, and the percentage of -the energy produced using the source."; + description "This attribute represents the list of sources used to + produce the energy by the supplier. This includes energy related + information i.e., carbon emission and renewable energy related + information, and the percentage of the energy produced using the + source."; + min-elements 1; key idx; leaf idx { type uint32; } uses EnergySourceInfoGrp; - } - + } } augment "/subnet3gpp:SubNetwork" { -- GitLab From 83939b0312b3747900c2ea9917d02859bff883e2 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 8 May 2025 21:22:20 +0200 Subject: [PATCH 08/12] correct yang linting --- .../_3gpp-engy-nrm-energyinformation.yang | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang index 7868ff1bd..e1e143ff9 100644 --- a/yang-models/_3gpp-engy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -7,23 +7,23 @@ module _3gpp-engy-nrm-energyinformation { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } - organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the Energy Information NRM. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, + TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.310"; - revision 2025-05-07 { reference CR-abcd ; } + revision 2025-05-07 { reference CR-abcd ; } feature energyinformationUnderSubNetwork { - description "The energyinformation shall be contained under SubNetwork"; + description "The energyinformation shall be contained under SubNetwork"; } - + feature energyinformationUnderManagedElement { - description "The energyrelatedinformation shall be contained under ManagedElement"; + description "The energyrelatedinformation shall be contained under + ManagedElement"; } grouping EnergySourceInfoGrp { @@ -52,7 +52,7 @@ module _3gpp-engy-nrm-energyinformation { mandatory true; units "kg CO2eq/kWh"; description "The attribute is used to indicate the Carbon Emission Factor - of a type of energy source. Its unit is kg CO2eq / kWh."; + of a type of energy source. Its unit is kg CO2eq / kWh."; } leaf renewableEnergy { -- GitLab From 7070cf8b39dd29b9dadc9a5c9226f378810f9b6a Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 8 May 2025 21:26:29 +0200 Subject: [PATCH 09/12] correcting file format due to linting error --- .../_3gpp-engy-nrm-energyinformation.yang | 304 +++++++++--------- 1 file changed, 152 insertions(+), 152 deletions(-) diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang index e1e143ff9..49b702bf5 100644 --- a/yang-models/_3gpp-engy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -1,153 +1,153 @@ -module _3gpp-engy-nrm-energyinformation { - yang-version 1.1; - - namespace urn:3gpp:sa5:_3gpp-engy-nrm-energyinformation; - prefix engyinfo3gpp; - - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-yang-types { prefix types3gpp; } - organization "3gpp SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the Energy Information NRM. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, - TSDSI, TTA, TTC). All rights reserved."; - reference "3GPP TS 28.310"; - - revision 2025-05-07 { reference CR-abcd ; } - - - feature energyinformationUnderSubNetwork { - description "The energyinformation shall be contained under SubNetwork"; - } - - feature energyinformationUnderManagedElement { - description "The energyrelatedinformation shall be contained under - ManagedElement"; - } - - grouping EnergySourceInfoGrp { - description "This data type defines the information related to a type - of energy source. This information is configured by the operator with - the information obtained from sources external to 3GPP. The attribute - energySourceType is used to indicate the type of energy source used by - an energy supply mode to produce the energy. The attribute energySourceCef - is used to indicate the carbon emission factor of the energy source. - The attribute renewableEnergy is used to indicate if the energy source - is renewable or non-renewable. The attribute energyCompositionPercentage - is used to indicate the percentage of energy source used to produce the - energy."; - - leaf energySourceType { - type string; - mandatory true; - description "The attribute is used to indicate the type of energy source - used by an energy supply mode to produce the energy."; - } - - leaf energySourceCef { - type decimal64 { - fraction-digits 2; - } - mandatory true; - units "kg CO2eq/kWh"; - description "The attribute is used to indicate the Carbon Emission Factor - of a type of energy source. Its unit is kg CO2eq / kWh."; - } - - leaf renewableEnergy { - description "This attribute represents if the energy source is renewable - or non-renewable. This information is configured by the operator with the - information obtained from external sources."; - type boolean; - mandatory true; - } - - leaf energyCompositionPercentage { - type uint8 { - range 0..100; - } - default 100; - description "The attribute is used to indicate the percentage of energy - source type used by the energy supply mode."; - } - - } - - grouping EnergyInfoGroupGrp { - description "This IOC represents a group of Network Elements, represented - by ManagedElement IOC and information related to the energy supply modes - that are used to power them. This information is configured by the - operator. Attribute memberDNList can be configured with the DNs of - ManagedElement or DNs of SubNetwork. This attribute provides the list - of Network Elements in the group, represented using ManagedElement MOIs - or represented using SubNetwork MOIs. In the case, memberDNList is - configured by DN of SubNetwork, then all the ManagedElement MOIs that - are name-contained by the SubNetwork MOI are part of the group. Attribute - energySupplyModeRefList is used to indicate the mode of energy supply - for powering the Network Elements of the group."; - - leaf energySupplyModeRefList { - description "The list of energy supply modes for the Network Elements - of the group. This information is configured by the operator with the - information obtained from external sources."; - type types3gpp:DistinguishedName; - } - - leaf memberDNList { - description "This attribute contains the DNs of managed entities - that are members of the energy info group."; - type types3gpp:DistinguishedName; - } - - } - - grouping EnergySupplyInfoGrp { - description "This IOC defines the information related to energy supply - and the sources used to produce the energy. This information is configured - by the operator with the information obtained from sources external to - 3GPP e.g an energy supplier. "; - - leaf energySupplyMode { - description "The mode by which energy is supplied to a Network Element. - This information is configured by the operator with the information - obtained from external sources.The mode can be one of the following: - GRID_ELECTRICITY: Energy from local grid electricity - (See Grid electricity in clause 6 of ITU-T Recommendation L.1333 [D]) - BACKUP_ENERGY: Energy from backup diesel or other types (from battery - banks/UPS), or from generators such as solar panels. (See Backup energy - in clause 6 of ITU-T Recommendation L.1333[D]) LOCALLY_GENERATED_ENERGY: - Energy provided by local generators not used for backup functionality, - e.g., solar panels, wind generator etc. (See Locally generated energy - in clause 6 of ITU-T Recommendation L.1333[D])"; - mandatory true; - type enumeration { - enum GRID_ELECTRICITY; - enum BACKUP_ENERGY; - enum LOCALLY_GENERATED_ENERGY; - } - } - - list energySourceList { - description "This attribute represents the list of sources used to - produce the energy by the supplier. This includes energy related - information i.e., carbon emission and renewable energy related - information, and the percentage of the energy produced using the - source."; - min-elements 1; - key idx; - leaf idx { type uint32; } - uses EnergySourceInfoGrp; - } - } - - augment "/subnet3gpp:SubNetwork" { - if-feature energyinformationUnderSubNetwork; - uses EnergyInfoGroupGrp; - } - - augment "/me3gpp:ManagedElement" { - if-feature energyinformationUnderManagedElement; - uses EnergyInfoGroupGrp; - } +module _3gpp-engy-nrm-energyinformation { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-engy-nrm-energyinformation; + prefix engyinfo3gpp; + + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the Energy Information NRM. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, + TSDSI, TTA, TTC). All rights reserved."; + reference "3GPP TS 28.310"; + + revision 2025-05-07 { reference CR-abcd ; } + + + feature energyinformationUnderSubNetwork { + description "The energyinformation shall be contained under SubNetwork"; + } + + feature energyinformationUnderManagedElement { + description "The energyrelatedinformation shall be contained under + ManagedElement"; + } + + grouping EnergySourceInfoGrp { + description "This data type defines the information related to a type + of energy source. This information is configured by the operator with + the information obtained from sources external to 3GPP. The attribute + energySourceType is used to indicate the type of energy source used by + an energy supply mode to produce the energy. The attribute energySourceCef + is used to indicate the carbon emission factor of the energy source. + The attribute renewableEnergy is used to indicate if the energy source + is renewable or non-renewable. The attribute energyCompositionPercentage + is used to indicate the percentage of energy source used to produce the + energy."; + + leaf energySourceType { + type string; + mandatory true; + description "The attribute is used to indicate the type of energy source + used by an energy supply mode to produce the energy."; + } + + leaf energySourceCef { + type decimal64 { + fraction-digits 2; + } + mandatory true; + units "kg CO2eq/kWh"; + description "The attribute is used to indicate the Carbon Emission Factor + of a type of energy source. Its unit is kg CO2eq / kWh."; + } + + leaf renewableEnergy { + description "This attribute represents if the energy source is renewable + or non-renewable. This information is configured by the operator with the + information obtained from external sources."; + type boolean; + mandatory true; + } + + leaf energyCompositionPercentage { + type uint8 { + range 0..100; + } + default 100; + description "The attribute is used to indicate the percentage of energy + source type used by the energy supply mode."; + } + + } + + grouping EnergyInfoGroupGrp { + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; + + leaf energySupplyModeRefList { + description "The list of energy supply modes for the Network Elements + of the group. This information is configured by the operator with the + information obtained from external sources."; + type types3gpp:DistinguishedName; + } + + leaf memberDNList { + description "This attribute contains the DNs of managed entities + that are members of the energy info group."; + type types3gpp:DistinguishedName; + } + + } + + grouping EnergySupplyInfoGrp { + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; + + leaf energySupplyMode { + description "The mode by which energy is supplied to a Network Element. + This information is configured by the operator with the information + obtained from external sources.The mode can be one of the following: + GRID_ELECTRICITY: Energy from local grid electricity + (See Grid electricity in clause 6 of ITU-T Recommendation L.1333 [D]) + BACKUP_ENERGY: Energy from backup diesel or other types (from battery + banks/UPS), or from generators such as solar panels. (See Backup energy + in clause 6 of ITU-T Recommendation L.1333[D]) LOCALLY_GENERATED_ENERGY: + Energy provided by local generators not used for backup functionality, + e.g., solar panels, wind generator etc. (See Locally generated energy + in clause 6 of ITU-T Recommendation L.1333[D])"; + mandatory true; + type enumeration { + enum GRID_ELECTRICITY; + enum BACKUP_ENERGY; + enum LOCALLY_GENERATED_ENERGY; + } + } + + list energySourceList { + description "This attribute represents the list of sources used to + produce the energy by the supplier. This includes energy related + information i.e., carbon emission and renewable energy related + information, and the percentage of the energy produced using the + source."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses EnergySourceInfoGrp; + } + } + + augment "/subnet3gpp:SubNetwork" { + if-feature energyinformationUnderSubNetwork; + uses EnergyInfoGroupGrp; + } + + augment "/me3gpp:ManagedElement" { + if-feature energyinformationUnderManagedElement; + uses EnergyInfoGroupGrp; + } } \ No newline at end of file -- GitLab From d3e5f49c6af65cb11703d055f02c272fdebfc37e Mon Sep 17 00:00:00 2001 From: ligan Date: Fri, 9 May 2025 01:41:17 +0000 Subject: [PATCH 10/12] Update file _3gpp-engy-nrm-energyinformation.yang --- yang-models/_3gpp-engy-nrm-energyinformation.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang index 49b702bf5..4d1f7c1d0 100644 --- a/yang-models/_3gpp-engy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -14,7 +14,7 @@ module _3gpp-engy-nrm-energyinformation { TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.310"; - revision 2025-05-07 { reference CR-abcd ; } + revision 2025-05-07 { reference CR-0082 ; } feature energyinformationUnderSubNetwork { -- GitLab From 78579169657f8d8e2fff96e4f549f0b489437ba8 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 May 2025 13:24:33 +0200 Subject: [PATCH 11/12] correcting ioc defintions _3gpp-engy-nrm-energyinformation.yang --- .../_3gpp-engy-nrm-energyinformation.yang | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang index 4d1f7c1d0..0561a8493 100644 --- a/yang-models/_3gpp-engy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -7,6 +7,8 @@ module _3gpp-engy-nrm-energyinformation { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the Energy Information NRM. @@ -143,11 +145,37 @@ module _3gpp-engy-nrm-energyinformation { augment "/subnet3gpp:SubNetwork" { if-feature energyinformationUnderSubNetwork; - uses EnergyInfoGroupGrp; + list EnergyInfoGroup { + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + list EnergySupplyInfo { + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } } augment "/me3gpp:ManagedElement" { if-feature energyinformationUnderManagedElement; - uses EnergyInfoGroupGrp; + list EnergyInfoGroup { + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + list EnergySupplyInfo { + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } } } \ No newline at end of file -- GitLab From ade9471744a0cc340ae191ae7d26879054c68569 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 May 2025 13:49:46 +0200 Subject: [PATCH 12/12] correcting linting error _3gpp-engy-nrm-energyinformation.yang --- .../_3gpp-engy-nrm-energyinformation.yang | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang index 0561a8493..38b72c25e 100644 --- a/yang-models/_3gpp-engy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -77,17 +77,6 @@ module _3gpp-engy-nrm-energyinformation { } grouping EnergyInfoGroupGrp { - description "This IOC represents a group of Network Elements, represented - by ManagedElement IOC and information related to the energy supply modes - that are used to power them. This information is configured by the - operator. Attribute memberDNList can be configured with the DNs of - ManagedElement or DNs of SubNetwork. This attribute provides the list - of Network Elements in the group, represented using ManagedElement MOIs - or represented using SubNetwork MOIs. In the case, memberDNList is - configured by DN of SubNetwork, then all the ManagedElement MOIs that - are name-contained by the SubNetwork MOI are part of the group. Attribute - energySupplyModeRefList is used to indicate the mode of energy supply - for powering the Network Elements of the group."; leaf energySupplyModeRefList { description "The list of energy supply modes for the Network Elements @@ -105,10 +94,6 @@ module _3gpp-engy-nrm-energyinformation { } grouping EnergySupplyInfoGrp { - description "This IOC defines the information related to energy supply - and the sources used to produce the energy. This information is configured - by the operator with the information obtained from sources external to - 3GPP e.g an energy supplier. "; leaf energySupplyMode { description "The mode by which energy is supplied to a Network Element. @@ -146,6 +131,17 @@ module _3gpp-engy-nrm-energyinformation { augment "/subnet3gpp:SubNetwork" { if-feature energyinformationUnderSubNetwork; list EnergyInfoGroup { + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; key id; uses top3gpp:Top_Grp; container attributes { @@ -153,7 +149,11 @@ module _3gpp-engy-nrm-energyinformation { } } list EnergySupplyInfo { - key id; + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; + key id; uses top3gpp:Top_Grp; container attributes { uses EnergyInfoGroupGrp; @@ -164,6 +164,17 @@ module _3gpp-engy-nrm-energyinformation { augment "/me3gpp:ManagedElement" { if-feature energyinformationUnderManagedElement; list EnergyInfoGroup { + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; key id; uses top3gpp:Top_Grp; container attributes { @@ -171,6 +182,10 @@ module _3gpp-engy-nrm-energyinformation { } } list EnergySupplyInfo { + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab