From 304cb72d2b82992f8a5bf4cb98250cb64ed2e28a Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 3 Nov 2022 21:35:44 +0000 Subject: [PATCH 1/7] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index ebf227f80..c0839de8e 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -9,9 +9,17 @@ module _3gpp-5gc-nrm-configurable5qiset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the configurable 5QIs, including their QoS characteristics, that need to be pre-configured - (and configurable) to the 5G NFs."; + (and configurable) to the 5G NFs. + + The 5QI set definition supports multiple deployment scenarios. The sets can + be name contained by SubNetwork ManagedElement, GNBDUFunction, GNBCUUPFunction + and GNBCUCPFunction. Sets are then referenced by attribute (configurable5QISetRef) + in applicable MOIs. For consistency it is recommended that referenced 5QI sets be + defined within the same subtree."; + reference "3GPP TS 28.541"; + revision 2022-11-02 { refernce "CR-0753" ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-04-29 { reference "CR-0729"; } revision 2022-01-07 { reference CR-0643; } @@ -132,4 +140,4 @@ module _3gpp-5gc-nrm-configurable5qiset { uses FiveQICharacteristicsSubtree; } } -} \ No newline at end of file +} -- GitLab From 5ffc88d07cb5e1063f5c56473a7c4e9398ed7b3e Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 3 Nov 2022 21:37:21 +0000 Subject: [PATCH 2/7] Update _3gpp-common-managed-function.yang --- yang-models/_3gpp-common-managed-function.yang | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index a2bca7e83..52f1f21a4 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -7,6 +7,7 @@ module _3gpp-common-managed-function { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } + import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -20,6 +21,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2022-11-02 { reference "CR-0753"; } revision 2022-01-07 { reference "CR-0146"; } revision 2021-01-25 { reference "CR-0122"; } revision 2020-09-30 { reference "CR-bbbb"; } @@ -31,6 +33,11 @@ module _3gpp-common-managed-function { revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-18 { reference "Initial revision"; } + feature Configurable5QISetUnderManagedFunction { + description "The Configurable5QISet shall be contained under + ManagedFunction"; + } + feature MeasurementsUnderManagedFunction { description "The MeasurementSubtree shall be contained under ManageElement"; } @@ -321,5 +328,9 @@ module _3gpp-common-managed-function { uses trace3gpp:TraceSubtree { if-feature TraceUnderManagedFunction ; } + + uses fiveqi3gpp: Configurable5QISetSubtree { + if-feature Configurable5QISetUnderManagedFunction; + } } -} \ No newline at end of file +} -- GitLab From 7859833767c371ae1841bb619602e45673786a58 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 3 Nov 2022 21:38:43 +0000 Subject: [PATCH 3/7] Update _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 8e6bb83f0..b01357d75 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -14,6 +14,7 @@ module _3gpp-nr-nrm-gnbdufunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2022-11-02 { reference "CR-0753"; } revision 2022-07-28 { reference "CR-0770"; } revision 2021-10-28 { reference CR-0607 ; } revision 2021-04-30 { reference CR-0490 ; } @@ -172,6 +173,17 @@ module _3gpp-nr-nrm-gnbdufunction { } } + leaf configurable5QISetRef { + type types3gpp:DistinguishedName; + description "DN of the Configurable5QISet that the GNBDUFunction supports (is associated + to)."; + } + + leaf dynamic5QISetRef { + type types3gpp:DistinguishedName; + description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; + } + augment "/me3gpp:ManagedElement" { list GNBDUFunction { @@ -185,4 +197,4 @@ module _3gpp-nr-nrm-gnbdufunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 81ecd0efe9be8a507ff77362a5cb5821fd7160fe Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 3 Nov 2022 21:42:54 +0000 Subject: [PATCH 4/7] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index c0839de8e..c496799f2 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -19,7 +19,7 @@ module _3gpp-5gc-nrm-configurable5qiset { reference "3GPP TS 28.541"; - revision 2022-11-02 { refernce "CR-0753" ; } + revision 2022-11-02 { reference "CR-0753" ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-04-29 { reference "CR-0729"; } revision 2022-01-07 { reference CR-0643; } -- GitLab From 13f0c543e810e75ae067c7de296c545309d16843 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 3 Nov 2022 21:58:29 +0000 Subject: [PATCH 5/7] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index c496799f2..41d5f0565 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -13,9 +13,9 @@ module _3gpp-5gc-nrm-configurable5qiset { The 5QI set definition supports multiple deployment scenarios. The sets can be name contained by SubNetwork ManagedElement, GNBDUFunction, GNBCUUPFunction - and GNBCUCPFunction. Sets are then referenced by attribute (configurable5QISetRef) - in applicable MOIs. For consistency it is recommended that referenced 5QI sets be - defined within the same subtree."; + and GNBCUCPFunction. Sets are then referenced by attribute + (configurable5QISetRef) in applicable MOIs. For consistency it is recommended + that referenced 5QI sets be defined within the same subtree."; reference "3GPP TS 28.541"; -- GitLab From da501b716718bca4876cbf609b5ee0bbca6dfbf9 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 3 Nov 2022 22:06:17 +0000 Subject: [PATCH 6/7] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 41d5f0565..86f096e42 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -12,10 +12,10 @@ module _3gpp-5gc-nrm-configurable5qiset { (and configurable) to the 5G NFs. The 5QI set definition supports multiple deployment scenarios. The sets can - be name contained by SubNetwork ManagedElement, GNBDUFunction, GNBCUUPFunction - and GNBCUCPFunction. Sets are then referenced by attribute - (configurable5QISetRef) in applicable MOIs. For consistency it is recommended - that referenced 5QI sets be defined within the same subtree."; + be name contained by SubNetwork ManagedElement, GNBDUFunction, + GNBCUUPFunction and GNBCUCPFunction. Sets are then referenced by attribute + (configurable5QISetRef) in applicable MOIs. For consistency it is + recommended that referenced 5QI sets be defined within the same subtree."; reference "3GPP TS 28.541"; -- GitLab From 356cb5bc68aad733fc3300db7bc5e4298021754b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 3 Nov 2022 22:10:19 +0000 Subject: [PATCH 7/7] Update _3gpp-common-managed-function.yang --- yang-models/_3gpp-common-managed-function.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 52f1f21a4..347ce760d 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -329,7 +329,7 @@ module _3gpp-common-managed-function { if-feature TraceUnderManagedFunction ; } - uses fiveqi3gpp: Configurable5QISetSubtree { + uses fiveqi3gpp:Configurable5QISetSubtree { if-feature Configurable5QISetUnderManagedFunction; } } -- GitLab