From dd2d23a2553c91fec2f73130fa6f829c0afed84e Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:46:44 +0000 Subject: [PATCH 01/59] Add new file --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 95 ++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 yang-models/_3gpp-nr-nrm-ecimappingrule.yang diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang new file mode 100644 index 000000000..cd7c67765 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -0,0 +1,95 @@ +module _3gpp-5gc-nrm-ecimappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule; + prefix ecimapping3gpp; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-externalgnbcucpfunction {prefix gnbcucp3gpp; } + + 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 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-12 { reference CR-1336 ; } + + grouping ECIMappingRuleInput { + description + "Input to the unified mapping rule to support ECI."; + reference "3GPP TS 28.541"; + + leaf eciMRInputMinimumValue { + type uint8; + description "The minimum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eciMRInputMaximumValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eciTimeInterval { + 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."; + } + } + + grouping NGRANECIMappingRuleGrp { + description "Represents the NGRANECIMappingRule IOC."; + list dynamic5QIs { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ECIMappingRuleInput; + } + } + } + + grouping NGRANECIMappingRuleSetGrp { + description "Represents the NGRANECIMappingRuleSet IOC."; + list dynamic5QIs { + description "This IOC represents a group of mapping rules."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NGRANECIMappingRuleGrp; + } + } + } + + grouping NGRANECIMappingRuleSetSubtree { + description "Helps augmenting NGRANECIMappingRuleSet into multiple places."; + list NGRANECIMappingRuleSet { + description "Specifies the ECI mapping rules, see 3GPP TS 28.541."; + key "id"; + uses top3gpp:Top_Grp; + container attributes { + uses NGRANECIMappingRuleSetGrp; + } + uses NGRANECIMappingRuleGrp; + } + } + + augment "/subnet3gpp:SubNetwork" { + uses NGRANECIMappingRuleSetSubtree; + } + + augment "/me3gpp:ManagedElement" { + uses NGRANECIMappingRuleSetSubtree; + } + + augment "/me3gpp:ManagedElement" { + uses gnbcucp3gpp:NGRANECIMappingRuleSetSubtree; + } + +} -- GitLab From 69d380344e01d7dae985bfeab8da9bc0d330795c Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:52:01 +0000 Subject: [PATCH 02/59] Update _3gpp-nr-nrm-externalgnbcuupfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 2445a1e99..b770fe84b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,6 +7,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -16,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -41,6 +43,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } + + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } + } grouping ExternalGNBCUUPFunctionWrapper { @@ -66,4 +74,4 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalGNBCUUPFunctionWrapper; } -} \ No newline at end of file +} -- GitLab From aed1c41e9e75c32763538f16272fa4b9ca3756f6 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:54:17 +0000 Subject: [PATCH 03/59] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec..a8213313a 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-12 { reference CR-1336 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -180,6 +181,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nGRANECIMappingRuleRef { + type types3gpp:DistinguishedName; + description "This is the DN of ECIMappingRuleSet."; + } } grouping QceIdMappingInfoGrp { @@ -223,4 +229,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +} -- GitLab From 9515c0e4bff4ca087ccffc1271f3bf7f7ff80879 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:56:38 +0000 Subject: [PATCH 04/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index cd7c67765..c78b0e45d 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,4 +1,4 @@ -module _3gpp-5gc-nrm-ecimappingrule { +module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule; prefix ecimapping3gpp; @@ -89,7 +89,7 @@ module _3gpp-5gc-nrm-ecimappingrule { } augment "/me3gpp:ManagedElement" { - uses gnbcucp3gpp:NGRANECIMappingRuleSetSubtree; + uses NGRANECIMappingRuleSetSubtree; } } -- GitLab From 257fe1c7acda0a56ef8c65a602dfc8a90dc2153d Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:59:35 +0000 Subject: [PATCH 05/59] Update _3gpp-nr-nrm-externalgnbcuupfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 8 -------- 1 file changed, 8 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index b770fe84b..56a5fbe8b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,7 +7,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -17,7 +16,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,12 +41,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } - - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; - type types3gpp:DistinguishedName; - } - } grouping ExternalGNBCUUPFunctionWrapper { -- GitLab From 0b87e5a1869e8fc610c51a460076e68096bfd0f5 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:00:29 +0000 Subject: [PATCH 06/59] Update _3gpp-nr-nrm-externalgnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index cbe2baff3..f1b1e9ad3 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -17,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-12 { reference CR-1336; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -51,6 +52,11 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { max-elements 1; uses types3gpp:PLMNId; } + + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } } grouping ExternalGNBCUCPFunctionWrapper { @@ -76,4 +82,4 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } -} \ No newline at end of file +} -- GitLab From 9b262ccf982d46bb9d3d5b3d6f826f53c07ddf6f Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:04:08 +0000 Subject: [PATCH 07/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index c78b0e45d..e4c599de5 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,6 +1,6 @@ module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; prefix ecimapping3gpp; import _3gpp-common-top { prefix top3gpp; } @@ -89,7 +89,7 @@ module _3gpp-nr-nrm-ecimappingrule { } augment "/me3gpp:ManagedElement" { - uses NGRANECIMappingRuleSetSubtree; + uses gnbcucp3gpp:ExternalGNBCUCPFunctionGrp; } } -- GitLab From 1cb78c7b27c08249c887c98a1c874b2e94798586 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:09:32 +0000 Subject: [PATCH 08/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index e4c599de5..bc1df61c1 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,6 +1,6 @@ module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimaprule; prefix ecimapping3gpp; import _3gpp-common-top { prefix top3gpp; } -- GitLab From 97b1059ad6805dc672f72b843c9b91c7339a558f Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:15:13 +0000 Subject: [PATCH 09/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index bc1df61c1..08861e60b 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,7 +1,7 @@ module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimaprule; - prefix ecimapping3gpp; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; + prefix ecimap3gpp; import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } -- GitLab From 5f3235c113f000d59e90b66116391009140b75be Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:19:51 +0000 Subject: [PATCH 10/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 08861e60b..9648185a1 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,8 +88,4 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/me3gpp:ManagedElement" { - uses gnbcucp3gpp:ExternalGNBCUCPFunctionGrp; - } - } -- GitLab From c2750547f4ffbfa9508df75f44e8eafbf774ae9f Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:38:13 +0000 Subject: [PATCH 11/59] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a..ab421ebe0 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -33,6 +33,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-08-12 { reference CR-1336 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -182,6 +183,10 @@ module _3gpp-common-managed-element { min-elements 1; type string; } + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } } grouping ManagedElementGrp { -- GitLab From a0165d52e03ec9d4ad484d733dc8fe83b830564a Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:46:58 +0000 Subject: [PATCH 12/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 9648185a1..b939ab27d 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -6,7 +6,7 @@ module _3gpp-nr-nrm-ecimappingrule { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-externalgnbcucpfunction {prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -88,4 +88,8 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } + augment "/me3gpp:GNBCUCPFunction" { + uses gnbcucp3gpp:; + } + } -- GitLab From 9dfca967acaebc4dbf0a73b17d9d2dfeaf790f71 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:51:09 +0000 Subject: [PATCH 13/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index b939ab27d..99338e187 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,8 +88,8 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/me3gpp:GNBCUCPFunction" { - uses gnbcucp3gpp:; + augment "/gnbcucp3gpp:GNBCUCPFunction" { + uses NGRANECIMappingRuleSetSubtree:; } } -- GitLab From 425e26eea45bd4825f683fe0852584517d24b119 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:55:27 +0000 Subject: [PATCH 14/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 99338e187..e0e948ee0 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,7 +88,7 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/gnbcucp3gpp:GNBCUCPFunction" { + augment "/gnbcucp3gpp:GNBCUCPFunctionGrp" { uses NGRANECIMappingRuleSetSubtree:; } -- GitLab From fc42b29e39703e04e82ff614558c8de5c2e2095d Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 21:00:23 +0000 Subject: [PATCH 15/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index e0e948ee0..99338e187 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,7 +88,7 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/gnbcucp3gpp:GNBCUCPFunctionGrp" { + augment "/gnbcucp3gpp:GNBCUCPFunction" { uses NGRANECIMappingRuleSetSubtree:; } -- GitLab From a0f77a00dc457bba2203bb04450ff14028dbb552 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 21:03:25 +0000 Subject: [PATCH 16/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 99338e187..2b18ecc51 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,8 +88,4 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/gnbcucp3gpp:GNBCUCPFunction" { - uses NGRANECIMappingRuleSetSubtree:; - } - } -- GitLab From 9810413b19486b66b055a2546557ef1db10d0d8e Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:32:32 +0000 Subject: [PATCH 17/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 52 ++++++++------------ 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 2b18ecc51..2c9e67c3b 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,7 +1,7 @@ -module _3gpp-nr-nrm-ecimappingrule { +module _3gpp-nr-nrm-ecmappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; - prefix ecimap3gpp; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } @@ -18,24 +18,23 @@ module _3gpp-nr-nrm-ecimappingrule { revision 2024-08-12 { reference CR-1336 ; } - grouping ECIMappingRuleInput { + grouping ecMappingRuleInput { description - "Input to the unified mapping rule to support ECI."; - reference "3GPP TS 28.541"; + "Input to the unified mapping rule to support energy cost reporting."; - leaf eciMRInputMinimumValue { + leaf ecMRInputMinimumValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; } - leaf eciMRInputMaximumValue { + leaf ecMRInputMaximumValue { type uint8; description "The maximum value of to be applied for mapping from this attribute to the energy cost."; } - leaf eciTimeInterval { + leaf ecTimeInterval { type uint8; description "Time interval (in seconds) that should be applied for collecting values of mapping @@ -43,49 +42,38 @@ module _3gpp-nr-nrm-ecimappingrule { } } - grouping NGRANECIMappingRuleGrp { - description "Represents the NGRANECIMappingRule IOC."; - list dynamic5QIs { + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { description "This IOC represents a unified mapping rule."; key id; uses top3gpp:Top_Grp; container attributes { - uses ECIMappingRuleInput; + uses ECMappingRuleInput; } } } - - grouping NGRANECIMappingRuleSetGrp { - description "Represents the NGRANECIMappingRuleSet IOC."; - list dynamic5QIs { - description "This IOC represents a group of mapping rules."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses NGRANECIMappingRuleGrp; - } - } } - grouping NGRANECIMappingRuleSetSubtree { - description "Helps augmenting NGRANECIMappingRuleSet into multiple places."; - list NGRANECIMappingRuleSet { - description "Specifies the ECI mapping rules, see 3GPP TS 28.541."; + grouping NGRANECMappingRuleSubtree { + description "Helps augmenting NGRANECMappingRule into multiple places."; + list NGRANECMappingRule { + description "Specifies the energy cost mapping rules."; key "id"; uses top3gpp:Top_Grp; container attributes { - uses NGRANECIMappingRuleSetGrp; + uses NGRANECMappingRuleGrp; } - uses NGRANECIMappingRuleGrp; + uses NGRANECMappingRuleGrp; } } augment "/subnet3gpp:SubNetwork" { - uses NGRANECIMappingRuleSetSubtree; + uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { - uses NGRANECIMappingRuleSetSubtree; + uses NGRANECMappingRuleSubtree; } } -- GitLab From f33a835dd72d08e9b611e1b92666310a32f801a4 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:38:01 +0000 Subject: [PATCH 18/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 2c9e67c3b..62394428f 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -18,23 +18,23 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } - grouping ecMappingRuleInput { + grouping ECMappingRuleInput { description "Input to the unified mapping rule to support energy cost reporting."; - leaf ecMRInputMinimumValue { + leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; } - leaf ecMRInputMaximumValue { + leaf eCMRInputMaxValue { type uint8; description "The maximum value of to be applied for mapping from this attribute to the energy cost."; } - leaf ecTimeInterval { + leaf eCTimeInterval { type uint8; description "Time interval (in seconds) that should be applied for collecting values of mapping -- GitLab From 0485d163e075d78636b570945770b3d266e50519 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:38:49 +0000 Subject: [PATCH 19/59] Update _3gpp-nr-nrm-externalgnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang | 6 ------ 1 file changed, 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index f1b1e9ad3..6c295a404 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -17,7 +17,6 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-12 { reference CR-1336; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -52,11 +51,6 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { max-elements 1; uses types3gpp:PLMNId; } - - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; - type types3gpp:DistinguishedName; - } } grouping ExternalGNBCUCPFunctionWrapper { -- GitLab From 998541737d23960cbfc5adc454b565bc6703b6b4 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:52:38 +0000 Subject: [PATCH 20/59] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index a8213313a..7b168c437 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -182,9 +182,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This is the DN of EphemerisInfoSet."; } - leaf nGRANECIMappingRuleRef { + leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; - description "This is the DN of ECIMappingRuleSet."; + description "DN of a NRECMappingRule."; } } -- GitLab From e51be180216ef50e3c3130f0147c7b22efeb54ab Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:57:40 +0000 Subject: [PATCH 21/59] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ab421ebe0..570791a14 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -143,6 +143,7 @@ module _3gpp-common-managed-element { type string; } + leaf locationName { description "The physical location (e.g. an address) of an entity represented by a (derivative of) ManagedElement_. It may contain no @@ -183,10 +184,12 @@ module _3gpp-common-managed-element { min-elements 1; type string; } - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; + + leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule."; } + } grouping ManagedElementGrp { -- GitLab From cd13e1d76facfd279d93830c09dc14328ae219bf Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:02:17 +0000 Subject: [PATCH 22/59] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 62394428f..fea406f9a 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -52,8 +52,7 @@ module _3gpp-nr-nrm-ecmappingrule { uses ECMappingRuleInput; } } - } - } + } grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; -- GitLab From b13438845eb8f00f394d90ece6cca35bfd065b7a Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:07:31 +0000 Subject: [PATCH 23/59] Add new file --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 + 1 file changed, 1 insertion(+) 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..8b1378917 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1 @@ + -- GitLab From d91d4c7b16cd2257de00f8308cdeae9d2598e6ed Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:08:33 +0000 Subject: [PATCH 24/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 77 +++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 8b1378917..fea406f9a 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -1 +1,78 @@ +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; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } + 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 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-12 { reference CR-1336 ; } + + grouping ECMappingRuleInput { + description + "Input to the unified mapping rule to support energy cost reporting."; + + 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."; + } + } + + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ECMappingRuleInput; + } + } + } + + grouping NGRANECMappingRuleSubtree { + description "Helps augmenting NGRANECMappingRule into multiple places."; + list NGRANECMappingRule { + description "Specifies the energy cost mapping rules."; + key "id"; + uses top3gpp:Top_Grp; + container attributes { + uses NGRANECMappingRuleGrp; + } + uses NGRANECMappingRuleGrp; + } + } + + augment "/subnet3gpp:SubNetwork" { + uses NGRANECMappingRuleSubtree; + } + + augment "/me3gpp:ManagedElement" { + uses NGRANECMappingRuleSubtree; + } + +} -- GitLab From edfd63d931f787b4cf6b09b9e76ef8f49d5eefa9 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:08:51 +0000 Subject: [PATCH 25/59] Delete _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 78 -------------------- 1 file changed, 78 deletions(-) delete mode 100644 yang-models/_3gpp-nr-nrm-ecimappingrule.yang diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang deleted file mode 100644 index fea406f9a..000000000 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ /dev/null @@ -1,78 +0,0 @@ -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; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } - - 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 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.541"; - - revision 2024-08-12 { reference CR-1336 ; } - - grouping ECMappingRuleInput { - description - "Input to the unified mapping rule to support energy cost reporting."; - - 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."; - } - } - - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - description "This IOC represents a unified mapping rule."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses ECMappingRuleInput; - } - } - } - - grouping NGRANECMappingRuleSubtree { - description "Helps augmenting NGRANECMappingRule into multiple places."; - list NGRANECMappingRule { - description "Specifies the energy cost mapping rules."; - key "id"; - uses top3gpp:Top_Grp; - container attributes { - uses NGRANECMappingRuleGrp; - } - uses NGRANECMappingRuleGrp; - } - } - - augment "/subnet3gpp:SubNetwork" { - uses NGRANECMappingRuleSubtree; - } - - augment "/me3gpp:ManagedElement" { - uses NGRANECMappingRuleSubtree; - } - -} -- GitLab From f5ba6f6bb283620548dbd65b5a29dd0f79b1c054 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 09:23:57 +0000 Subject: [PATCH 26/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index fea406f9a..07d10a213 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -12,7 +12,7 @@ module _3gpp-nr-nrm-ecmappingrule { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the unified mapping rule input to support Energy Cost Index Mapping when Energy Cost Reporting. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; -- GitLab From 7af2149c192bf2211c4b18861c1e1e99701dbd84 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 14:22:16 +0000 Subject: [PATCH 27/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 07d10a213..dbce8e314 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -18,6 +18,11 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } + feature EnergyCostMappingRule { + description "Indicates whether alarm acknowledgement by the consumer is + supported."; + } + grouping ECMappingRuleInput { description "Input to the unified mapping rule to support energy cost reporting."; @@ -37,8 +42,9 @@ module _3gpp-nr-nrm-ecmappingrule { 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."; + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; } } @@ -63,16 +69,16 @@ module _3gpp-nr-nrm-ecmappingrule { container attributes { uses NGRANECMappingRuleGrp; } - uses NGRANECMappingRuleGrp; } } augment "/subnet3gpp:SubNetwork" { + if-feature EnergyCostMappingRule; uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { + if-feature EnergyCostMappingRule; uses NGRANECMappingRuleSubtree; } - } -- GitLab From 9768d4530772e01b2388416cddc1da2f15c42f1f Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 14:24:46 +0000 Subject: [PATCH 28/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 25 ++++++++------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index dbce8e314..5295e7d2f 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -22,12 +22,15 @@ module _3gpp-nr-nrm-ecmappingrule { description "Indicates whether alarm acknowledgement by the consumer is supported."; } - - grouping ECMappingRuleInput { - description - "Input to the unified mapping rule to support energy cost reporting."; - leaf eCMRInputMinValue { + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; @@ -46,19 +49,9 @@ module _3gpp-nr-nrm-ecmappingrule { rule attribute to be used for computing the energy cost."; units seconds; } - } - - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - description "This IOC represents a unified mapping rule."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses ECMappingRuleInput; - } } } + } grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; -- GitLab From 4296c7706cc612064d8531f616cd0d24b6ef6aa7 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:05:31 +0000 Subject: [PATCH 29/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 39 +++++++++++++-------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 5295e7d2f..7a18db3db 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -18,19 +18,16 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } - feature EnergyCostMappingRule { - description "Indicates whether alarm acknowledgement by the consumer is - supported."; + feature ECMappingRuleUnderSubNetwork { + description "ECMappingRule shall be contained under SubNetwork."; + } + + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; } - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - description "This IOC represents a unified mapping rule."; - key id; - uses top3gpp:Top_Grp; - container attributes { - leaf eCMRInputMinValue { + grouping ECMappingRuleInputGrp { + leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; @@ -49,15 +46,27 @@ module _3gpp-nr-nrm-ecmappingrule { rule attribute to be used for computing the energy cost."; units seconds; } + } + + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ECMappingRuleInputGrp; } } } grouping NGRANECMappingRuleSubtree { + key "idx"; + min-elements 1; + max-elements 1; description "Helps augmenting NGRANECMappingRule into multiple places."; - list NGRANECMappingRule { + list idx { description "Specifies the energy cost mapping rules."; - key "id"; uses top3gpp:Top_Grp; container attributes { uses NGRANECMappingRuleGrp; @@ -66,12 +75,12 @@ module _3gpp-nr-nrm-ecmappingrule { } augment "/subnet3gpp:SubNetwork" { - if-feature EnergyCostMappingRule; + if-feature EnergyCostMapECMappingRuleUnderSubNetwork; uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { - if-feature EnergyCostMappingRule; + if-feature ECMappingRuleUnderManagedElement; uses NGRANECMappingRuleSubtree; } } -- GitLab From 602c9b90903325ab6e32cba5b99a4c9f0f6935d9 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:15:10 +0000 Subject: [PATCH 30/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 7a18db3db..ef094c5e7 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -6,8 +6,7 @@ module _3gpp-nr-nrm-ecmappingrule { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } - + 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 @@ -75,7 +74,7 @@ module _3gpp-nr-nrm-ecmappingrule { } augment "/subnet3gpp:SubNetwork" { - if-feature EnergyCostMapECMappingRuleUnderSubNetwork; + if-feature ECMappingRuleUnderSubNetwork; uses NGRANECMappingRuleSubtree; } -- GitLab From d2b0d341e1f56276f426d1e9a405df0a375dd2e3 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:17:22 +0000 Subject: [PATCH 31/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ef094c5e7..2afbb8421 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -57,7 +57,6 @@ module _3gpp-nr-nrm-ecmappingrule { uses ECMappingRuleInputGrp; } } - } grouping NGRANECMappingRuleSubtree { key "idx"; -- GitLab From d47105ad19e1eef2a1bc3c54389409745a2027b6 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:24:11 +0000 Subject: [PATCH 32/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 2afbb8421..ef094c5e7 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -57,6 +57,7 @@ module _3gpp-nr-nrm-ecmappingrule { uses ECMappingRuleInputGrp; } } + } grouping NGRANECMappingRuleSubtree { key "idx"; -- GitLab From 7f0f8b33c3ad41e2f9312f7e2040421d554dc43e Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:57:08 +0000 Subject: [PATCH 33/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ef094c5e7..ad125aac2 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -60,7 +60,7 @@ module _3gpp-nr-nrm-ecmappingrule { } grouping NGRANECMappingRuleSubtree { - key "idx"; + key idx; min-elements 1; max-elements 1; description "Helps augmenting NGRANECMappingRule into multiple places."; -- GitLab From afc1796a6d677749a413372bb1b0b11fa641a85b Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:17:08 +0000 Subject: [PATCH 34/59] 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 ad125aac2..24397bd00 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -60,19 +60,19 @@ module _3gpp-nr-nrm-ecmappingrule { } grouping NGRANECMappingRuleSubtree { - key idx; + description "Helps augmenting NGRANECMappingRule into multiple places."; + key "idx"; min-elements 1; max-elements 1; - description "Helps augmenting NGRANECMappingRule into multiple places."; - list idx { - description "Specifies the energy cost mapping rules."; + list rules { + key "idx"; uses top3gpp:Top_Grp; - container attributes { + container idx { uses NGRANECMappingRuleGrp; } } } - + augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; uses NGRANECMappingRuleSubtree; -- GitLab From a3f7da2c3d49793a489512e427a62753d5812c02 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:36:49 +0000 Subject: [PATCH 35/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 24397bd00..cb12d1894 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -61,12 +61,10 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; - key "idx"; - min-elements 1; - max-elements 1; list rules { key "idx"; - uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; container idx { uses NGRANECMappingRuleGrp; } -- GitLab From a885b32b36bc6ba3502e3ca10fa61e61fcfc576c Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:42:43 +0000 Subject: [PATCH 36/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index cb12d1894..640046d81 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -50,7 +50,6 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleGrp { description "Represents the NGRANECMappingRule IOC."; list rules { - description "This IOC represents a unified mapping rule."; key id; uses top3gpp:Top_Grp; container attributes { @@ -61,13 +60,11 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; - list rules { - key "idx"; - min-elements 1; - max-elements 1; - container idx { + key "idx"; + min-elements 1; + max-elements 1; + list idx { uses NGRANECMappingRuleGrp; - } } } -- GitLab From cfffdd910a745f89b1d68b7ce5777be97bf500c2 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:55:29 +0000 Subject: [PATCH 37/59] 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 640046d81..c0ffec40b 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -60,13 +60,15 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; + list mappingrule { key "idx"; min-elements 1; max-elements 1; - list idx { + container idx { uses NGRANECMappingRuleGrp; } } + } augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; -- GitLab From a28e872accef789b311bcab02cb6d19f27c08308 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 17:00:38 +0000 Subject: [PATCH 38/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index c0ffec40b..1e5de11a7 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -64,9 +64,7 @@ module _3gpp-nr-nrm-ecmappingrule { key "idx"; min-elements 1; max-elements 1; - container idx { - uses NGRANECMappingRuleGrp; - } + uses NGRANECMappingRuleGrp; } } -- GitLab From d96f7395d349cfa84b9319e4b8da27a9c98d72fa Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 17:06:11 +0000 Subject: [PATCH 39/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 1e5de11a7..b29038034 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -61,11 +61,11 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; list mappingrule { - key "idx"; - min-elements 1; - max-elements 1; - uses NGRANECMappingRuleGrp; - } + key idx; + min-elements 1; + max-elements 1; + uses NGRANECMappingRuleGrp; + } } augment "/subnet3gpp:SubNetwork" { -- GitLab From 0d71df2fc8d81b1582e17e631ae10b903f49976f Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:42:49 +0000 Subject: [PATCH 40/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 31 +++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index b29038034..5a0c3854f 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -25,17 +25,18 @@ module _3gpp-nr-nrm-ecmappingrule { description "ECMappingRule shall be contained under ManagedElement."; } - grouping ECMappingRuleInputGrp { + 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."; + 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."; + for mapping from this attribute to the energy cost."; } leaf eCTimeInterval { @@ -44,27 +45,21 @@ module _3gpp-nr-nrm-ecmappingrule { should be applied for collecting values of mapping rule attribute to be used for computing the energy cost."; units seconds; - } - } - - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - key id; - uses top3gpp:Top_Grp; - container attributes { - uses ECMappingRuleInputGrp; - } - } + }; } grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; - list mappingrule { - key idx; + list NGRANECMappingRule { + key id; + use top3gpp:Top_Grp; min-elements 1; max-elements 1; - uses NGRANECMappingRuleGrp; + leaf idx { type unit32; } + container attributes { + uses NGRANECMappingRuleGrp; + } + } } } -- GitLab From cb35ed001b2d416c39f2400a9cc9117a46057cf6 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:47:21 +0000 Subject: [PATCH 41/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 5a0c3854f..f9ae083f4 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -45,7 +45,7 @@ module _3gpp-nr-nrm-ecmappingrule { should be applied for collecting values of mapping rule attribute to be used for computing the energy cost."; units seconds; - }; + } } grouping NGRANECMappingRuleSubtree { @@ -60,7 +60,6 @@ module _3gpp-nr-nrm-ecmappingrule { uses NGRANECMappingRuleGrp; } } - } } augment "/subnet3gpp:SubNetwork" { -- GitLab From 01d4d7b732c0902f3603b9b289f14ff3aa9d5461 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:55:09 +0000 Subject: [PATCH 42/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index f9ae083f4..ed7db374a 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -52,10 +52,10 @@ module _3gpp-nr-nrm-ecmappingrule { description "Helps augmenting NGRANECMappingRule into multiple places."; list NGRANECMappingRule { key id; - use top3gpp:Top_Grp; + uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type unit32; } + leaf idx { type uit32; } container attributes { uses NGRANECMappingRuleGrp; } @@ -64,11 +64,11 @@ module _3gpp-nr-nrm-ecmappingrule { augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; - uses NGRANECMappingRuleSubtree; + uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { if-feature ECMappingRuleUnderManagedElement; - uses NGRANECMappingRuleSubtree; + uses NGRANECMappingRuleSubtree; } } -- GitLab From 41c8b178a0a5abfd8503b85d9c75338b081cd264 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:58:51 +0000 Subject: [PATCH 43/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ed7db374a..c0331bc89 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -55,7 +55,7 @@ module _3gpp-nr-nrm-ecmappingrule { uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type uit32; } + leaf idx { type uint32; } container attributes { uses NGRANECMappingRuleGrp; } -- GitLab From 076195562d2d1aabafc95ea7870aa4f02077ad27 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 21:03:10 +0000 Subject: [PATCH 44/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index c0331bc89..0e796831c 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -64,7 +64,10 @@ module _3gpp-nr-nrm-ecmappingrule { augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; - uses NGRANECMappingRuleSubtree; + when '"1" = "1"'{ + uses NGRANECMappingRuleSubtree; + } + } } augment "/me3gpp:ManagedElement" { -- GitLab From e958d383d977cfd99fee2bdb57e50a5dbc3fab84 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 21:05:38 +0000 Subject: [PATCH 45/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 0e796831c..6cbf8cbff 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -64,10 +64,9 @@ module _3gpp-nr-nrm-ecmappingrule { augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; - when '"1" = "1"'{ + when '"1" = "1"'; uses NGRANECMappingRuleSubtree; } - } } augment "/me3gpp:ManagedElement" { -- GitLab From 171195c00332b5d651fe64ac115ba5d6be359134 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 21:12:39 +0000 Subject: [PATCH 46/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 6cbf8cbff..0d26806a5 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -66,7 +66,6 @@ module _3gpp-nr-nrm-ecmappingrule { if-feature ECMappingRuleUnderSubNetwork; when '"1" = "1"'; uses NGRANECMappingRuleSubtree; - } } augment "/me3gpp:ManagedElement" { -- GitLab From 425a7997184c3e979707c5f882a599a7137feefa Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 23:24:44 +0200 Subject: [PATCH 47/59] update x --- yang-models/_3gpp-common-managed-element.yang | 9 ++++++++ yang-models/_3gpp-common-subnetwork.yang | 10 +++++++++ yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 21 ------------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 570791a14..c9645cec4 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"; @@ -50,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"; @@ -312,5 +317,9 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderManagedElement; + } } } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010..85676b8b8 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-08-18 { reference CR-1336 ; } 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"; @@ -269,6 +275,10 @@ module _3gpp-common-subnetwork { reference "RFC8528 YANG Schema Mount"; } + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + // augment external parts here } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 0d26806a5..fa1fa3a62 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -4,8 +4,6 @@ module _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp; import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,14 +15,6 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } - feature ECMappingRuleUnderSubNetwork { - description "ECMappingRule shall be contained under SubNetwork."; - } - - feature ECMappingRuleUnderManagedElement { - description "ECMappingRule shall be contained under ManagedElement."; - } - grouping NGRANECMappingRuleGrp { description "Represents the NGRANECMappingRule IOC."; leaf eCMRInputMinValue { @@ -61,15 +51,4 @@ module _3gpp-nr-nrm-ecmappingrule { } } } - - augment "/subnet3gpp:SubNetwork" { - if-feature ECMappingRuleUnderSubNetwork; - when '"1" = "1"'; - uses NGRANECMappingRuleSubtree; - } - - augment "/me3gpp:ManagedElement" { - if-feature ECMappingRuleUnderManagedElement; - uses NGRANECMappingRuleSubtree; - } } -- GitLab From 31ec5e9491690659f77bd7cf0238b2d103484924 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:40:46 +0000 Subject: [PATCH 48/59] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index fa1fa3a62..d35070c4d 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -41,6 +41,7 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; list NGRANECMappingRule { + description "The mapping rule."; key id; uses top3gpp:Top_Grp; min-elements 1; -- GitLab From 41af415d5f6321409cd58f1437fe59ec8861f5b7 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 10:22:12 +0000 Subject: [PATCH 49/59] Revert "Update _3gpp-nr-nrm-externalgnbcuupfunction.yang" This reverts commit a967c4640554698c7a3abdce07d3a5fd4d0edd0f --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 56a5fbe8b..b770fe84b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,6 +7,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -16,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -41,6 +43,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } + + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } + } grouping ExternalGNBCUUPFunctionWrapper { -- GitLab From a89c535679dac1c225661a4f3c4d9d7e190c4ba4 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 11:07:12 +0000 Subject: [PATCH 50/59] Revert "Update _3gpp-nr-nrm-externalgnbcuupfunction.yang" This reverts commit cb70be13f8622db163aa403a6d968aa2279747a8 --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index b770fe84b..2445a1e99 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,7 +7,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -17,7 +16,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,12 +41,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } - - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; - type types3gpp:DistinguishedName; - } - } grouping ExternalGNBCUUPFunctionWrapper { @@ -74,4 +66,4 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalGNBCUUPFunctionWrapper; } -} +} \ No newline at end of file -- GitLab From cd110bcf65486a72bf2490c613d0f594bebe139f Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:28:28 +0000 Subject: [PATCH 51/59] 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 d35070c4d..949f21289 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-12 { reference CR-1336 ; } - 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,9 +38,9 @@ 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 { description "The mapping rule."; key id; uses top3gpp:Top_Grp; @@ -48,7 +48,7 @@ module _3gpp-nr-nrm-ecmappingrule { max-elements 1; leaf idx { type uint32; } container attributes { - uses NGRANECMappingRuleGrp; + uses NRECMappingRuleGrp; } } } -- GitLab From cbbfa1e17b6368de56638dc28d089f960d247959 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:29:02 +0000 Subject: [PATCH 52/59] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 85676b8b8..23362b81d 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -275,10 +275,10 @@ module _3gpp-common-subnetwork { reference "RFC8528 YANG Schema Mount"; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderSubNetwork; } // augment external parts here } -} \ No newline at end of file +} -- GitLab From 5efd6f2ca3c9703d13dc8605556ddcc24a2f2d75 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:39:59 +0000 Subject: [PATCH 53/59] 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 c9645cec4..bf3d07317 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -318,7 +318,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } } -- GitLab From 3a21d9fe0a7fec5e9e39452847d4bd419367e117 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:09:05 +0000 Subject: [PATCH 54/59] Revert "Update _3gpp-common-managed-element.yang" This reverts commit 51cc70b82b520025091ec976401d5430ea0c8cb0 --- 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 bf3d07317..c9645cec4 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -318,7 +318,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NRECMappingRuleSubtree { + uses ecmap3gpp:NGRANECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } } -- GitLab From e4f285ff7aaee2d54965a89e16f39ed21cfbe782 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:14:06 +0000 Subject: [PATCH 55/59] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index c9645cec4..eb77b6cf3 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -318,8 +318,8 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { - if-feature EcmConnectionInfoUnderManagedElement; + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature ECMappingRuleUnderManagedElement; } } } -- GitLab From 4d5451d26923c874d760e3398e858bdc50205a06 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 08:59:17 +0000 Subject: [PATCH 56/59] 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 949f21289..81519e61c 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-12 { reference CR-1336 ; } 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 cd60f250bfc9dcd30f6e8de3732db732ebdb7e50 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 09:00:41 +0000 Subject: [PATCH 57/59] 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 7b168c437..7cae7b624 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 62500db040b5ae44b846be02f24975a9b1b758bc Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 09:48:34 +0000 Subject: [PATCH 58/59] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 6 ------ 1 file changed, 6 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index eb77b6cf3..b9c7fa51c 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -189,12 +189,6 @@ module _3gpp-common-managed-element { min-elements 1; type string; } - - leaf nRECMappingRuleRef { - type types3gpp:DistinguishedName; - description "DN of a NRECMappingRule."; - } - } grouping ManagedElementGrp { -- GitLab From 850553fe269bd93b61b8b9c212d1f3fcc6db0065 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 10:00:06 +0000 Subject: [PATCH 59/59] 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 7cae7b624..e8ce1c9f8 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -185,7 +185,8 @@ 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."; } } -- GitLab