From bd10f2055c749d106f4dc7d679665e72ef9f9b75 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 16 Jun 2022 20:53:28 +0000 Subject: [PATCH 01/12] Add new file --- yang-models/_3gpp-nr-nrm-bwpset.yang | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 yang-models/_3gpp-nr-nrm-bwpset.yang diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang new file mode 100644 index 000000000..64dcf269e --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -0,0 +1,37 @@ +module _3gpp-nr-nrm-bwpset { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-bwpset"; + prefix "bwpset3gpp"; + + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the BWPSet Information 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-06-14 { reference CR-xxxx ; } + + grouping BWPSetGrp { + description "Represents the BWPSet IOC."; + reference "3GPP TS 28.541"; + uses mf3gpp:ManagedFunctionGrp; + + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { + + list BWPList { + description "Represents a bandwidth part (BWP)."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses BWPSetGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} +} -- GitLab From c8c557bd4ca8e979ce8b9691410554bdc8ecfac1 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 16 Jun 2022 20:57:45 +0000 Subject: [PATCH 02/12] Update _3gpp-nr-nrm-bwpset.yang --- yang-models/_3gpp-nr-nrm-bwpset.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 64dcf269e..75368ff79 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -20,7 +20,7 @@ module _3gpp-nr-nrm-bwpset { description "Represents the BWPSet IOC."; reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; - + } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { list BWPList { @@ -34,4 +34,3 @@ module _3gpp-nr-nrm-bwpset { } } } -} -- GitLab From 2e77fc92c419d165c15e9a92943a7494231fdeb4 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 16 Jun 2022 20:58:50 +0000 Subject: [PATCH 03/12] Update _3gpp-nr-nrm-bwpset.yang --- yang-models/_3gpp-nr-nrm-bwpset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 75368ff79..de51381e9 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -24,7 +24,7 @@ module _3gpp-nr-nrm-bwpset { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { list BWPList { - description "Represents a bandwidth part (BWP)."; + description "Represents a bandwidth part (BWP) set."; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From 02524b63eeb14fc0123fa201dc9aa6c9c39aeb9c Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 16 Jun 2022 21:02:39 +0000 Subject: [PATCH 04/12] Update _3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 0cb6dce0c..33062bcdd 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -374,6 +374,12 @@ module _3gpp-nr-nrm-nrcelldu { type types3gpp:DistinguishedName; } + leaf-list bWPSetRef { + description "Reference to corresponding BWPSet instance."; + min-elements 1; + type BWPSet; + } + leaf-list nRFrequencyRef { description "Reference to corresponding NRFrequency instance."; type types3gpp:DistinguishedName; @@ -434,4 +440,4 @@ module _3gpp-nr-nrm-nrcelldu { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 0053dddde949f81d23eba6b1c3a9cc07ce7962a5 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 16 Jun 2022 21:04:42 +0000 Subject: [PATCH 05/12] Update _3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 33062bcdd..394fa52d0 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -377,7 +377,7 @@ module _3gpp-nr-nrm-nrcelldu { leaf-list bWPSetRef { description "Reference to corresponding BWPSet instance."; min-elements 1; - type BWPSet; + type types3gpp:DistinguishedName; } leaf-list nRFrequencyRef { -- GitLab From cdccdca1bc98680153aa52110401602e2e7af43d Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 16 Jun 2022 21:07:51 +0000 Subject: [PATCH 06/12] Update _3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 394fa52d0..3c585772f 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -376,7 +376,6 @@ module _3gpp-nr-nrm-nrcelldu { leaf-list bWPSetRef { description "Reference to corresponding BWPSet instance."; - min-elements 1; type types3gpp:DistinguishedName; } -- GitLab From 9a10faa93256ea8aed1af1a94bc281debd5f3fc2 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 29 Jun 2022 15:41:45 +0000 Subject: [PATCH 07/12] Update _3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 3c585772f..6d9c25f9d 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2022-06-29 { reference "S5-224303" ; } revision 2021-10-28 { reference CR-0607 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-25 { reference CR-0386 ; } -- GitLab From a720cccae79fd0e984ee9b70375a94c2cf810d47 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 29 Jun 2022 15:42:40 +0000 Subject: [PATCH 08/12] Update _3gpp-nr-nrm-bwpset.yang --- yang-models/_3gpp-nr-nrm-bwpset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index de51381e9..75b1d8e23 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -14,7 +14,7 @@ module _3gpp-nr-nrm-bwpset { (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2022-06-14 { reference CR-xxxx ; } + revision 2022-06-29 { reference "S5-224303" ; } grouping BWPSetGrp { description "Represents the BWPSet IOC."; -- GitLab From 007769cfe561a26d9f2eb1d642e1d314ce2b9fee Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 1 Jul 2022 15:22:13 +0000 Subject: [PATCH 09/12] Update _3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 6d9c25f9d..9aea6f0d3 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2022-06-29 { reference "S5-224303" ; } + revision 2022-06-29 { reference S5-224352 ; } revision 2021-10-28 { reference CR-0607 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-25 { reference CR-0386 ; } -- GitLab From 1f62a5f7f6533acec453f82e02480ac0bccb4e4b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 1 Jul 2022 15:22:54 +0000 Subject: [PATCH 10/12] Update _3gpp-nr-nrm-bwpset.yang --- yang-models/_3gpp-nr-nrm-bwpset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 75b1d8e23..1c2f51987 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -14,7 +14,7 @@ module _3gpp-nr-nrm-bwpset { (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2022-06-29 { reference "S5-224303" ; } + revision 2022-06-29 { reference S5-224352 ; } grouping BWPSetGrp { description "Represents the BWPSet IOC."; -- GitLab From ffec9f243a68d012a568b7b3030a18a93d3a8aa1 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 1 Aug 2022 19:27:12 +0000 Subject: [PATCH 11/12] Update _3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 9aea6f0d3..87908d8e3 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2022-06-29 { reference S5-224352 ; } + revision 2022-06-29 { reference CR-0756 ; } revision 2021-10-28 { reference CR-0607 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-25 { reference CR-0386 ; } -- GitLab From 6b7f7c9ea3e9d13a12eb8552120b05fedb33c295 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 1 Aug 2022 19:28:19 +0000 Subject: [PATCH 12/12] Update _3gpp-nr-nrm-bwpset.yang --- yang-models/_3gpp-nr-nrm-bwpset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 1c2f51987..ff630709c 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -14,7 +14,7 @@ module _3gpp-nr-nrm-bwpset { (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2022-06-29 { reference S5-224352 ; } + revision 2022-06-29 { reference CR-0756 ; } grouping BWPSetGrp { description "Represents the BWPSet IOC."; -- GitLab