From d5e42359333b57ba76121348aef6bc7b47b79b46 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 30 Apr 2021 16:03:39 +0200 Subject: [PATCH 01/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 2a402a96e..8ce35f72e 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -37,7 +37,11 @@ module _3gpp-5gc-nrm-configurable5qiset { } } - grouping FiveQICharacteristics { + grouping FiveQICharacteristicsGrp { + description "Represents the FiveQICharacteristics IOC."; + reference "3GPP TS 28.541"; + key id; + uses Configurable5QISetGrp; leaf fiveQIValue { type uint32 { range 0..255 ; @@ -97,10 +101,14 @@ module _3gpp-5gc-nrm-configurable5qiset { grouping Configurable5QISetGrp { description "Represents the Configurable5QISet IOC."; list configurable5QIs { - key "fiveQIValue"; - uses FiveQICharacteristics; + key id; + leaf id {} + attributes { + uses FiveQICharacteristicsGrp; + } } } + grouping Configurable5QISetSubtree { list Configurable5QISet { -- GitLab From d6dd2a7f0f45497b713fa9be9e6ac4425d815cd0 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 30 Apr 2021 16:11:52 +0200 Subject: [PATCH 02/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 9b19f6a32..4588d8119 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -20,12 +20,14 @@ module _3gpp-5gc-nrm-dynamic5qiset { grouping Dynamic5QISetGrp { description "Represents the Dynamic5QISet IOC."; - list dynamic5QIs { - key "fiveQIValue"; - description "Represents the Dynamic5QISet IOC."; - uses Conf5QIs3gpp:FiveQICharacteristics; - } - } + list { + key id; + leaf id {} + attributes { + uses Conf5QIs3gpp:FiveQICharacteristicsGrp; + } + } + } grouping Dynamic5QISetSubtree { description "Helps augmenting Dynamic5QISet into multiple places."; @@ -47,4 +49,9 @@ module _3gpp-5gc-nrm-dynamic5qiset { augment "/me3gpp:ManagedElement" { uses Dynamic5QISetSubtree; } + + augment "/dyn5QIs3gpp:Dynamic5QISetGrp" { + uses Conf5QIs3gpp:FiveQICharacteristicsGrp; + } + } \ No newline at end of file -- GitLab From 1b3ead025fa7694d8115ef9ed9042d004ff3e408 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 19:27:33 +0200 Subject: [PATCH 03/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- .../_3gpp-5gc-nrm-configurable5qiset.yang | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 8ce35f72e..d888c30ee 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -37,12 +37,14 @@ module _3gpp-5gc-nrm-configurable5qiset { } } - grouping FiveQICharacteristicsGrp { - description "Represents the FiveQICharacteristics IOC."; - reference "3GPP TS 28.541"; - key id; - uses Configurable5QISetGrp; - leaf fiveQIValue { + grouping FiveQICharacteristicsGrp{ + description "Represents the FiveQICharacteristics IOC."; + reference "3GPP TS 28.541; + +} + +list configurablel +leaf fiveQIValue { type uint32 { range 0..255 ; } @@ -96,8 +98,22 @@ module _3gpp-5gc-nrm-configurable5qiset { } units byte; } +} + + grouping FiveQiCharacteristicsSubtree { + list FiveQICharacteristics { + description "Represents the FiveQICharacterics IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses Five5QICharacteristicsGrp; + } + } + } + } } + grouping Configurable5QISetGrp { description "Represents the Configurable5QISet IOC."; list configurable5QIs { @@ -106,9 +122,9 @@ module _3gpp-5gc-nrm-configurable5qiset { attributes { uses FiveQICharacteristicsGrp; } - } - } - + } +} + grouping Configurable5QISetSubtree { list Configurable5QISet { @@ -120,7 +136,8 @@ module _3gpp-5gc-nrm-configurable5qiset { container attributes { uses Configurable5QISetGrp; } - } + uses FiveQICharacteristicsSubtree ; + } } augment "/subnet3gpp:SubNetwork" { @@ -130,4 +147,4 @@ module _3gpp-5gc-nrm-configurable5qiset { augment "/me3gpp:ManagedElement" { uses Configurable5QISetSubtree; } -} \ No newline at end of file +} -- GitLab From e30a539ca9cbc916cac23fde6f69295bd4380d58 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 19:28:30 +0200 Subject: [PATCH 04/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 4588d8119..aadce5706 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -24,10 +24,11 @@ module _3gpp-5gc-nrm-dynamic5qiset { key id; leaf id {} attributes { - uses Conf5QIs3gpp:FiveQICharacteristicsGrp; - } - } - } + uses Conf5QIs3gpp:FiveQICharacteristicsGrp; + } + uses Conf5QIs3gpp:FiveQICharacteristicsSubtree; + } + } grouping Dynamic5QISetSubtree { description "Helps augmenting Dynamic5QISet into multiple places."; @@ -49,9 +50,8 @@ module _3gpp-5gc-nrm-dynamic5qiset { augment "/me3gpp:ManagedElement" { uses Dynamic5QISetSubtree; } - augment "/dyn5QIs3gpp:Dynamic5QISetGrp" { uses Conf5QIs3gpp:FiveQICharacteristicsGrp; } -} \ No newline at end of file +} -- GitLab From 0f449c6a784dbba940b684dcc355c70a9aa6ce27 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:24:10 +0200 Subject: [PATCH 05/23] 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 d888c30ee..441d449ac 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -39,7 +39,7 @@ module _3gpp-5gc-nrm-configurable5qiset { grouping FiveQICharacteristicsGrp{ description "Represents the FiveQICharacteristics IOC."; - reference "3GPP TS 28.541; + reference "3GPP TS 28.541"; } -- GitLab From b7216c5a4e3e7a3fc5865aecb2620857ff281af2 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:26:10 +0200 Subject: [PATCH 06/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index aadce5706..35c65dde2 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -20,7 +20,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { grouping Dynamic5QISetGrp { description "Represents the Dynamic5QISet IOC."; - list { + list attributes { key id; leaf id {} attributes { -- GitLab From e270d21ef99762bdb33dae19d7edac8345293e80 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:28:10 +0200 Subject: [PATCH 07/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 35c65dde2..f5605e212 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -20,7 +20,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { grouping Dynamic5QISetGrp { description "Represents the Dynamic5QISet IOC."; - list attributes { + list dynamic5QIs { key id; leaf id {} attributes { -- GitLab From b9c092e2848c5402179d95fd7e04443ded136f07 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:29:40 +0200 Subject: [PATCH 08/23] 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 441d449ac..e43d08690 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -43,7 +43,7 @@ module _3gpp-5gc-nrm-configurable5qiset { } -list configurablel +list configurableFiveQIs { leaf fiveQIValue { type uint32 { range 0..255 ; -- GitLab From 35f01c46700855f39e6e32e5cee64900094ec1e5 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:33:10 +0200 Subject: [PATCH 09/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index e43d08690..05587d876 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -37,14 +37,14 @@ module _3gpp-5gc-nrm-configurable5qiset { } } - grouping FiveQICharacteristicsGrp{ + grouping FiveQICharacteristicsGrp { description "Represents the FiveQICharacteristics IOC."; reference "3GPP TS 28.541"; } list configurableFiveQIs { -leaf fiveQIValue { + leaf fiveQIValue { type uint32 { range 0..255 ; } -- GitLab From 3c9fda42949a5a6881662f3ad74054d535cb2cca Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:38:43 +0200 Subject: [PATCH 10/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 05587d876..de2279317 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -101,18 +101,15 @@ list configurableFiveQIs { } grouping FiveQiCharacteristicsSubtree { + description "Represents the FiveQICharacterics IOC."; list FiveQICharacteristics { - description "Represents the FiveQICharacterics IOC."; key id; uses top3gpp:Top_Grp; container attributes { uses Five5QICharacteristicsGrp; - } - } - } - } - } - + } + } +} grouping Configurable5QISetGrp { description "Represents the Configurable5QISet IOC."; -- GitLab From c3b9ccae21660702c42daa32ae841481d0be97a6 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:41:22 +0200 Subject: [PATCH 11/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index de2279317..5f3afd4b1 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -44,6 +44,7 @@ module _3gpp-5gc-nrm-configurable5qiset { } list configurableFiveQIs { + key id; leaf fiveQIValue { type uint32 { range 0..255 ; @@ -106,7 +107,7 @@ list configurableFiveQIs { key id; uses top3gpp:Top_Grp; container attributes { - uses Five5QICharacteristicsGrp; + uses FiveQICharacteristicsGrp; } } } -- GitLab From 814266125d207a43b554371414eff546dde7f274 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:43:03 +0200 Subject: [PATCH 12/23] 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 5f3afd4b1..3f8b8f824 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -44,7 +44,7 @@ module _3gpp-5gc-nrm-configurable5qiset { } list configurableFiveQIs { - key id; + key fiveQIValue; leaf fiveQIValue { type uint32 { range 0..255 ; -- GitLab From f6e996785b17bf43eb65f60fd452a702d8e7f747 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:47:44 +0200 Subject: [PATCH 13/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 3f8b8f824..8ad9beb55 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -116,7 +116,6 @@ list configurableFiveQIs { description "Represents the Configurable5QISet IOC."; list configurable5QIs { key id; - leaf id {} attributes { uses FiveQICharacteristicsGrp; } -- GitLab From 288d442e97a9331f1960bddefee2df8cc9ef84ec Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:50:06 +0200 Subject: [PATCH 14/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 8ad9beb55..2cc0a8418 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -116,6 +116,7 @@ list configurableFiveQIs { description "Represents the Configurable5QISet IOC."; list configurable5QIs { key id; + uses top3gpp:Top_Grp; attributes { uses FiveQICharacteristicsGrp; } -- GitLab From ecfe225062ee5328be806786df573e61ee398dcd Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:52:49 +0200 Subject: [PATCH 15/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 2cc0a8418..98d9312a1 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -117,7 +117,7 @@ list configurableFiveQIs { list configurable5QIs { key id; uses top3gpp:Top_Grp; - attributes { + container attributes { uses FiveQICharacteristicsGrp; } } @@ -134,7 +134,6 @@ list configurableFiveQIs { container attributes { uses Configurable5QISetGrp; } - uses FiveQICharacteristicsSubtree ; } } -- GitLab From 9c078b3724cba7e31b6a44006c4cbccbe6eb7c75 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:55:20 +0200 Subject: [PATCH 16/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index f5605e212..23e243911 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -22,11 +22,11 @@ module _3gpp-5gc-nrm-dynamic5qiset { description "Represents the Dynamic5QISet IOC."; list dynamic5QIs { key id; - leaf id {} - attributes { - uses Conf5QIs3gpp:FiveQICharacteristicsGrp; - } - uses Conf5QIs3gpp:FiveQICharacteristicsSubtree; + uses top3gpp:Top_Grp; + container attributes { + uses Conf5QIs3gpp:FiveQICharacteristicsGrp; + } + uses Conf5QIs3gpp:FiveQICharacteristicsSubtree; } } -- GitLab From cbc15c40b90299e9ba9f55b47ce354fd68bba167 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 20:58:10 +0200 Subject: [PATCH 17/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 23e243911..d022e26ed 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -21,13 +21,12 @@ module _3gpp-5gc-nrm-dynamic5qiset { grouping Dynamic5QISetGrp { description "Represents the Dynamic5QISet IOC."; list dynamic5QIs { - key id; - uses top3gpp:Top_Grp; - container attributes { - uses Conf5QIs3gpp:FiveQICharacteristicsGrp; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses Conf5QIs3gpp:FiveQICharacteristicsGrp; } - uses Conf5QIs3gpp:FiveQICharacteristicsSubtree; - } + } } grouping Dynamic5QISetSubtree { -- GitLab From 9b9daef27a0c4b90d4df151f03426734b775b074 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 21:05:16 +0200 Subject: [PATCH 18/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index d022e26ed..9c6bddd55 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -49,8 +49,4 @@ module _3gpp-5gc-nrm-dynamic5qiset { augment "/me3gpp:ManagedElement" { uses Dynamic5QISetSubtree; } - augment "/dyn5QIs3gpp:Dynamic5QISetGrp" { - uses Conf5QIs3gpp:FiveQICharacteristicsGrp; - } - } -- GitLab From fb8fcad38230e906b6c88684368089e24bf8f7f0 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 21:09:55 +0200 Subject: [PATCH 19/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 98d9312a1..5a73069db 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -41,9 +41,9 @@ module _3gpp-5gc-nrm-configurable5qiset { description "Represents the FiveQICharacteristics IOC."; reference "3GPP TS 28.541"; -} + } -list configurableFiveQIs { + list configurableFiveQIs { key fiveQIValue; leaf fiveQIValue { type uint32 { -- GitLab From 447af4d6f614ca0382908a997b387c119f729b18 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 21:18:16 +0200 Subject: [PATCH 20/23] Update _3gpp-5gc-nrm-configurable5qiset.yang --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 5a73069db..860b28809 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -38,9 +38,8 @@ module _3gpp-5gc-nrm-configurable5qiset { } grouping FiveQICharacteristicsGrp { - description "Represents the FiveQICharacteristics IOC."; - reference "3GPP TS 28.541"; - + description "Represents the FiveQICharacteristics IOC."; + reference "3GPP TS 28.541"; } list configurableFiveQIs { -- GitLab From 59879661c448c1558ac5dcd93709f8512a67b4cb Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 21:18:59 +0200 Subject: [PATCH 21/23] 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 860b28809..d0931e319 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -104,9 +104,9 @@ module _3gpp-5gc-nrm-configurable5qiset { description "Represents the FiveQICharacterics IOC."; list FiveQICharacteristics { key id; - uses top3gpp:Top_Grp; - container attributes { - uses FiveQICharacteristicsGrp; + uses top3gpp:Top_Grp; + container attributes { + uses FiveQICharacteristicsGrp; } } } -- GitLab From 5768601160e3772f87864fc305b59edb2b9d4b97 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 21:21:52 +0200 Subject: [PATCH 22/23] 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 d0931e319..6d3d7a27a 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -103,10 +103,10 @@ module _3gpp-5gc-nrm-configurable5qiset { grouping FiveQiCharacteristicsSubtree { description "Represents the FiveQICharacterics IOC."; list FiveQICharacteristics { - key id; - uses top3gpp:Top_Grp; - container attributes { - uses FiveQICharacteristicsGrp; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses FiveQICharacteristicsGrp; } } } -- GitLab From 563ecaa5450562c36316345fc23c076f4ab91134 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 10 May 2021 21:23:04 +0200 Subject: [PATCH 23/23] Update _3gpp-5gc-nrm-dynamic5qiset.yang --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 9c6bddd55..185e46f83 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -23,10 +23,10 @@ module _3gpp-5gc-nrm-dynamic5qiset { list dynamic5QIs { key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses Conf5QIs3gpp:FiveQICharacteristicsGrp; } - } + } } grouping Dynamic5QISetSubtree { -- GitLab