From b4600bb91e341ecc19132c9734fd2a8fafdfd8b8 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:24:08 +0000 Subject: [PATCH 01/13] Add new file --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 54 +++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 yang-models/_3gpp-nr-nrm-ecmappingrule.yang diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang new file mode 100644 index 000000000..15cca562b --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1,54 @@ +module _3gpp-nr-nrm-ecmappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; + + import _3gpp-common-top { prefix top3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the unified mapping rule input to support + Energy Cost Index Mapping when Energy Cost Reporting. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-21 { reference CR-1337 ; } + + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + leaf eCMRInputMinValue { + type uint8; + description "The minimum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCMRInputMaxValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCTimeInterval { + type uint8; + description "Time interval (in seconds) that + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; + } + } + + grouping NGRANECMappingRuleSubtree { + description "Helps augmenting NGRANECMappingRule into multiple places."; + list NGRANECMappingRule { + key id; + uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; + leaf idx { type uint32; } + container attributes { + uses NGRANECMappingRuleGrp; + } + } + } +} -- GitLab From 061b3beee4d7e371905cd21785d77b5dac72a2d6 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:26:47 +0000 Subject: [PATCH 02/13] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010..d3e1bea68 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -13,6 +13,7 @@ module _3gpp-common-subnetwork { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +34,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -61,6 +63,10 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } + feature ECMappingRuleUnderSubNetwork { + description "ECMappingRule shall be contained under SubNetwork."; + } + feature EcmConnectionInfoUnderSubNetwork { description "The EcmConnectionInfo shall be contained under Subnetwork"; @@ -264,6 +270,11 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + + yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; reference "RFC8528 YANG Schema Mount"; @@ -271,4 +282,4 @@ module _3gpp-common-subnetwork { // augment external parts here } -} \ No newline at end of file +} -- GitLab From 4b4d7f96c966a51ccef88440c71f455e6a49b229 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:28:46 +0000 Subject: [PATCH 03/13] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a..ad54b08b5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -12,6 +12,7 @@ module _3gpp-common-managed-element { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-08-21 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -49,6 +51,10 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; + } + feature EcmConnectionInfoUnderManagedElement { description "The EcmConnectionInfo shall be contained under ManagedElement"; @@ -304,5 +310,10 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderManagedElement; + } + } } -- GitLab From 82dcca6cc20baf860d28348d47b1b0d374ed5c69 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:31:07 +0000 Subject: [PATCH 04/13] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec..5fb2475ec 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-21 { reference CR-1337 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -180,6 +181,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule."; + } + + } grouping QceIdMappingInfoGrp { @@ -223,4 +231,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +} -- GitLab From ad8289277d7a8f3ff27ad6927ccd7510ceff728c Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:08 +0000 Subject: [PATCH 05/13] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 15cca562b..71a6e89aa 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-21 { reference CR-1337 ; } - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; + grouping NRECMappingRuleGrp { + description "Represents the NRECMappingRule IOC."; leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied @@ -38,16 +38,16 @@ module _3gpp-nr-nrm-ecmappingrule { } } - grouping NGRANECMappingRuleSubtree { - description "Helps augmenting NGRANECMappingRule into multiple places."; - list NGRANECMappingRule { + grouping NRECMappingRuleSubtree { + description "Helps augmenting NRECMappingRule into multiple places."; + list NRECMappingRule { key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; leaf idx { type uint32; } container attributes { - uses NGRANECMappingRuleGrp; + uses NRECMappingRuleGrp; } } } -- GitLab From a8e66265892207fb4ec57b63c78bc311303ff374 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:29 +0000 Subject: [PATCH 06/13] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ad54b08b5..67e6a6e15 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } -- GitLab From e01dac1c59e61f79fea7871eb442da3fccb707a8 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:52 +0000 Subject: [PATCH 07/13] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d3e1bea68..ddd472941 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -270,7 +270,7 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderSubNetwork; } -- GitLab From 585440a9c5b75b6d8214d9365e4ff20405825e52 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:11:28 +0000 Subject: [PATCH 08/13] Revert "Update _3gpp-common-managed-element.yang" This reverts commit ba2aaf70017a3ca4ae2b1e824ebe641b5bdd4930 --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 67e6a6e15..ad54b08b5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NRECMappingRuleSubtree { + uses ecmap3gpp:NGRANECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } -- GitLab From 365c298bde147ef10f10bd9b96c33341d8857e63 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:15:34 +0000 Subject: [PATCH 09/13] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ad54b08b5..81a6c1e80 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -312,7 +312,7 @@ module _3gpp-common-managed-element { } uses ecmap3gpp:NGRANECMappingRuleSubtree { - if-feature EcmConnectionInfoUnderManagedElement; + if-feature ECMappingRuleUnderManagedElement; } } -- GitLab From 184f56a40442af170d0f431de90eda39cefbf7c0 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:18:55 +0000 Subject: [PATCH 10/13] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 81a6c1e80..705d01a29 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature ECMappingRuleUnderManagedElement; } -- GitLab From 4bb11c709eb83cb63ce012a3466f85dccd1c9a29 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 08:59:46 +0000 Subject: [PATCH 11/13] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 71a6e89aa..ac5fbfe30 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -16,7 +16,9 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-21 { reference CR-1337 ; } grouping NRECMappingRuleGrp { - description "Represents the NRECMappingRule IOC."; + description "Represents the unified mapping rule to support Energy Cost Mapping + when Energy Cost Reporting is supported. Can be name-contained by SubNetwork + or ManagedElement. It applies to all ManagedEntity contained by the parent."; leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied -- GitLab From 22fe5cc9e5a74c28c17186ccb6264d1706ca618a Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 09:01:09 +0000 Subject: [PATCH 12/13] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 5fb2475ec..ad0875a56 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -184,7 +184,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; - description "DN of a NRECMappingRule."; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement, applies."; } -- GitLab From 05c414f52d053cee2954379d6fa429052d999604 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 10:01:02 +0000 Subject: [PATCH 13/13] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ad0875a56..896327a78 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -185,10 +185,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; description "DN of a NRECMappingRule. An empty value indicates the - NRECMappingRule contained by parent, e.g. ManagedElement, applies."; + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; } - - } grouping QceIdMappingInfoGrp { -- GitLab