From 010156a11b9dcdd54ab9f6a21c36f51be0966f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 11:24:09 +0000 Subject: [PATCH 01/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang to add new data types --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 64 +++++++++++++++++-- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 839cb879c..95ba4ce73 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-11-05 { reference "CR-XXXX"; } revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } @@ -95,28 +96,33 @@ module _3gpp-nr-nrm-gnbcucpfunction { } leaf-list x2BlockList { - type string; description "List of nodes to which X2 connections are prohibited."; + key idx; + uses GeNBIdGrp; } leaf-list x2AllowList { - type string; description "List of nodes to which X2 connections are enforced."; + key idx; + uses GeNBIdGrp; } leaf-list xnBlockList { - type string; description "List of nodes to which Xn connections are prohibited."; + key idx; + uses GgNBIdGrp; } leaf-list xnAllowList { - type string; description "List of nodes to which X2 connections are enforced."; + key idx; + uses GgNBIdGrp; } leaf-list xnHOBlockList { - type string; description "List of nodes to which handovers over Xn are prohibited."; + key idx; + uses GgNBIdGrp; } leaf configurable5QISetRef { @@ -126,8 +132,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { } leaf-list x2HOBlockList { - type string; description "List of nodes to which handovers over X2 are prohibited."; + key idx; + uses GeNBIdGrp; } leaf dynamic5QISetRef { @@ -220,6 +227,51 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } + grouping GgNBIdGrp { + description "Represents the properties of a global gNB ID (GgNBId)."; + + leaf plmnId { + type types3GPP:PLMNId; + min-elements 1; + max-elements 1; + description "This attribute represents a PLMN Identity"; + } + + leaf gnbIdLength { + type int32 {range 22…32}; + min-elements 1; + max-elements 1; + description " This indicates the number of bits for encoding the gNB ID. See "Global gNB ID" in subclause 9.3.1.6 of TS 38.413"; + } + + leaf gnbId { + type int32 {range 0….429467295}; + min-elements 1; + max-elements 1; + description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + See "gNB Identifier (gNB ID)" of subclause 8.2 of TS 38.300. See "Global gNB ID" in subclause 9.3.1.6 of TS 38.413.”; + } + } + + + grouping GeNBIdGrp { + description "Represents the properties of a global eNB ID (GeNBId)"; + + leaf plmnId { + type types3GPP:PLMNId; + min-elements 1; + max-elements 1; + description "This attribute represents a PLMN Identity"; + } + leaf enbId { + type int32 {range 0….4194303} + min-elemetns 1; + max-elements 1; + description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB + cells. See "eNB Identifier (gNB ID)" of subclause 8.2 of TS 36.300. See "Global eNB ID" in subclause 9.2.1.37 of TS 36.413.”; + } + } + augment "/me3gpp:ManagedElement" { list GNBCUCPFunction { -- GitLab From 3f77d21f67ebdc072532ded374926782d418d2d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 16:48:30 +0000 Subject: [PATCH 02/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 95ba4ce73..8deb33739 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -95,33 +95,38 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; } - leaf-list x2BlockList { + list x2BlockList { description "List of nodes to which X2 connections are prohibited."; key idx; + leaf idx {type uint32;} uses GeNBIdGrp; } - leaf-list x2AllowList { + list x2AllowList { description "List of nodes to which X2 connections are enforced."; key idx; + leaf idx {type uint32;} uses GeNBIdGrp; } - leaf-list xnBlockList { + list xnBlockList { description "List of nodes to which Xn connections are prohibited."; key idx; + leaf idx {type uint32;} uses GgNBIdGrp; } - leaf-list xnAllowList { + list xnAllowList { description "List of nodes to which X2 connections are enforced."; key idx; + leaf idx {type uint32;} uses GgNBIdGrp; } - leaf-list xnHOBlockList { + list xnHOBlockList { description "List of nodes to which handovers over Xn are prohibited."; key idx; + leaf idx {type uint32;} uses GgNBIdGrp; } @@ -131,9 +136,10 @@ module _3gpp-nr-nrm-gnbcucpfunction { supports (is associated to)."; } - leaf-list x2HOBlockList { + list x2HOBlockList { description "List of nodes to which handovers over X2 are prohibited."; key idx; + leaf idx {type uint32;} uses GeNBIdGrp; } -- GitLab From 4bd6581c4b9db8f8448f6588461c70152f0782b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 16:53:20 +0000 Subject: [PATCH 03/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 8deb33739..fc6845db6 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -238,22 +238,19 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf plmnId { type types3GPP:PLMNId; - min-elements 1; - max-elements 1; + mandatory true; description "This attribute represents a PLMN Identity"; } leaf gnbIdLength { - type int32 {range 22…32}; - min-elements 1; - max-elements 1; + type int32 {range 22…32;} + mandatory true; description " This indicates the number of bits for encoding the gNB ID. See "Global gNB ID" in subclause 9.3.1.6 of TS 38.413"; } leaf gnbId { - type int32 {range 0….429467295}; - min-elements 1; - max-elements 1; + type int32 {range 0….429467295;} + mandatory true; description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. See "gNB Identifier (gNB ID)" of subclause 8.2 of TS 38.300. See "Global gNB ID" in subclause 9.3.1.6 of TS 38.413.”; } @@ -265,14 +262,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf plmnId { type types3GPP:PLMNId; - min-elements 1; - max-elements 1; + mandatory true; description "This attribute represents a PLMN Identity"; } leaf enbId { - type int32 {range 0….4194303} - min-elemetns 1; - max-elements 1; + type int32 {range 0….4194303;} + mandatory true; description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells. See "eNB Identifier (gNB ID)" of subclause 8.2 of TS 36.300. See "Global eNB ID" in subclause 9.2.1.37 of TS 36.413.”; } -- GitLab From 3dd6f1e128f3f04dafa41650f4a305e462cb082d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 16:56:28 +0000 Subject: [PATCH 04/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index fc6845db6..e2a7a4925 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -245,14 +245,14 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbIdLength { type int32 {range 22…32;} mandatory true; - description " This indicates the number of bits for encoding the gNB ID. See "Global gNB ID" in subclause 9.3.1.6 of TS 38.413"; + description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } leaf gnbId { type int32 {range 0….429467295;} mandatory true; description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. - See "gNB Identifier (gNB ID)" of subclause 8.2 of TS 38.300. See "Global gNB ID" in subclause 9.3.1.6 of TS 38.413.”; + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413.”; } } @@ -269,7 +269,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { type int32 {range 0….4194303;} mandatory true; description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB - cells. See "eNB Identifier (gNB ID)" of subclause 8.2 of TS 36.300. See "Global eNB ID" in subclause 9.2.1.37 of TS 36.413.”; + cells. See 'eNB Identifier (gNB ID)' of subclause 8.2 of TS 36.300. See 'Global eNB ID' in subclause 9.2.1.37 of TS 36.413.”; } } -- GitLab From 9f9cc9f11690810e78e0d3b46a1e8d09c4bcd42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:16:15 +0000 Subject: [PATCH 05/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index e2a7a4925..dd1904951 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -258,7 +258,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { grouping GeNBIdGrp { - description "Represents the properties of a global eNB ID (GeNBId)"; + description "Represents the properties of a global eNB ID (GeNBId)."; leaf plmnId { type types3GPP:PLMNId; -- GitLab From 82af68151f913a414c6b247606747fd703631ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:19:29 +0000 Subject: [PATCH 06/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index dd1904951..dda95cb2d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -251,8 +251,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbId { type int32 {range 0….429467295;} mandatory true; - description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. - See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413.”; + description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413.”; } } -- GitLab From dcbbc2375ae0b36827d00e8e515ed6cb0d388191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:24:32 +0000 Subject: [PATCH 07/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index dda95cb2d..74667744c 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -256,21 +256,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { } - grouping GeNBIdGrp { - description "Represents the properties of a global eNB ID (GeNBId)."; - - leaf plmnId { - type types3GPP:PLMNId; - mandatory true; - description "This attribute represents a PLMN Identity"; - } - leaf enbId { - type int32 {range 0….4194303;} - mandatory true; - description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB - cells. See 'eNB Identifier (gNB ID)' of subclause 8.2 of TS 36.300. See 'Global eNB ID' in subclause 9.2.1.37 of TS 36.413.”; - } - } augment "/me3gpp:ManagedElement" { -- GitLab From f824d09f010db4c0e087d915d3baaba811de0d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:29:20 +0000 Subject: [PATCH 08/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 74667744c..cc58d4759 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -251,10 +251,25 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbId { type int32 {range 0….429467295;} mandatory true; - description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413.”; + description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. See 'gNB dentifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413.”; } } + grouping GeNBIdGrp { + description "Represents the properties of a global eNB ID (GeNBId)."; + + leaf plmnId { + type types3GPP:PLMNId; + mandatory true; + description "This attribute represents a PLMN Identity"; + } + leaf enbId { + type int32 {range 0….4194303;} + mandatory true; + description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB + cells. See 'eNB Identifier (gNB ID)' of subclause 8.2 of TS 36.300. See 'Global eNB ID' in subclause 9.2.1.37 of TS 36.413.”; + } + } augment "/me3gpp:ManagedElement" { -- GitLab From 33f650b4d4a36685d3df0c92f046d0d8902850cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:36:59 +0000 Subject: [PATCH 09/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index cc58d4759..7b5ebc3b2 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -251,7 +251,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbId { type int32 {range 0….429467295;} mandatory true; - description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. See 'gNB dentifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413.”; + description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.”; } } -- GitLab From ae5cd5227d7f4e156fd470bd404a1efd020f1d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:43:37 +0000 Subject: [PATCH 10/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7b5ebc3b2..ab9159585 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -249,9 +249,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { } leaf gnbId { - type int32 {range 0….429467295;} - mandatory true; - description " It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.”; + description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) + is part of the NR Cell Identifier (NCI) of the gNB cells."; + reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + mandatory true; + type int64 { range "0..4294967295"; } + } } } @@ -264,10 +267,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This attribute represents a PLMN Identity"; } leaf enbId { - type int32 {range 0….4194303;} + type int32 {range "0 ..4194303";} mandatory true; description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB - cells. See 'eNB Identifier (gNB ID)' of subclause 8.2 of TS 36.300. See 'Global eNB ID' in subclause 9.2.1.37 of TS 36.413.”; + cells."; + reference "eNB ID in TS 36.300. Global eNB Id in TS 36.413.”; } } -- GitLab From 020f09b7e66e5fbada88889f9e7cddd45c507424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:46:03 +0000 Subject: [PATCH 11/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ab9159585..ae8031216 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -271,11 +271,10 @@ module _3gpp-nr-nrm-gnbcucpfunction { mandatory true; description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells."; - reference "eNB ID in TS 36.300. Global eNB Id in TS 36.413.”; + reference "eNB ID in TS 36.300. Global eNB ID in TS 36.413.”; } } - augment "/me3gpp:ManagedElement" { list GNBCUCPFunction { -- GitLab From 3fcde52e7dc9cd72b5e5e4a579ab82b2cee29deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:49:37 +0000 Subject: [PATCH 12/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ae8031216..eb69c40c3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -255,7 +255,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { mandatory true; type int64 { range "0..4294967295"; } } - } } grouping GeNBIdGrp { @@ -267,11 +266,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This attribute represents a PLMN Identity"; } leaf enbId { - type int32 {range "0 ..4194303";} - mandatory true; description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells."; - reference "eNB ID in TS 36.300. Global eNB ID in TS 36.413.”; + reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413.”; + type int32 {range "0 ..4194303";} + mandatory true; } } -- GitLab From ffe9a83502d007078a97282b76b2e6a3c074f2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 19:52:33 +0000 Subject: [PATCH 13/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index eb69c40c3..67184967f 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -266,11 +266,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This attribute represents a PLMN Identity"; } leaf enbId { - description " It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB + description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells."; - reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413.”; - type int32 {range "0 ..4194303";} + reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413."; mandatory true; + type int32 {range "0..4194303";} } } -- GitLab From 2b3084d883bf328ca636f1285fb49b6d92eae879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 20:01:31 +0000 Subject: [PATCH 14/23] 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 67184967f..b2f4cb2e3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -237,7 +237,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Represents the properties of a global gNB ID (GgNBId)."; leaf plmnId { - type types3GPP:PLMNId; + type types3gpp:PLMNId; mandatory true; description "This attribute represents a PLMN Identity"; } @@ -261,7 +261,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Represents the properties of a global eNB ID (GeNBId)."; leaf plmnId { - type types3GPP:PLMNId; + type types3gpp:PLMNId; mandatory true; description "This attribute represents a PLMN Identity"; } -- GitLab From f648d79b208f36f7aee2ac6d10ded60d321e282a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 20:12:22 +0000 Subject: [PATCH 15/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index b2f4cb2e3..a4f7181ff 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -238,7 +238,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf plmnId { type types3gpp:PLMNId; - mandatory true; + mandatory true; description "This attribute represents a PLMN Identity"; } -- GitLab From 86e17f90413e54d28ffd917f5e44d5adf560fb56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 20:18:31 +0000 Subject: [PATCH 16/23] 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 a4f7181ff..ae6d9c731 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -237,7 +237,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Represents the properties of a global gNB ID (GgNBId)."; leaf plmnId { - type types3gpp:PLMNId; + uses types3gpp:PLMNId; mandatory true; description "This attribute represents a PLMN Identity"; } @@ -261,7 +261,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Represents the properties of a global eNB ID (GeNBId)."; leaf plmnId { - type types3gpp:PLMNId; + uses types3gpp:PLMNId; mandatory true; description "This attribute represents a PLMN Identity"; } -- GitLab From 1e079dfb8111155b228808caa734ad8886bbdcc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 20:20:14 +0000 Subject: [PATCH 17/23] 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 ae6d9c731..a4f7181ff 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -237,7 +237,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Represents the properties of a global gNB ID (GgNBId)."; leaf plmnId { - uses types3gpp:PLMNId; + type types3gpp:PLMNId; mandatory true; description "This attribute represents a PLMN Identity"; } @@ -261,7 +261,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Represents the properties of a global eNB ID (GeNBId)."; leaf plmnId { - uses types3gpp:PLMNId; + type types3gpp:PLMNId; mandatory true; description "This attribute represents a PLMN Identity"; } -- GitLab From 1345ec0c6ab5f72ee1f94838a5c381d2f36261de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 20:22:55 +0000 Subject: [PATCH 18/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index a4f7181ff..41b81e122 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -236,11 +236,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { grouping GgNBIdGrp { description "Represents the properties of a global gNB ID (GgNBId)."; - leaf plmnId { - type types3gpp:PLMNId; - mandatory true; - description "This attribute represents a PLMN Identity"; - } + uses types3gpp:PLMNId; leaf gnbIdLength { type int32 {range 22…32;} @@ -259,11 +255,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { grouping GeNBIdGrp { description "Represents the properties of a global eNB ID (GeNBId)."; - - leaf plmnId { - type types3gpp:PLMNId; - mandatory true; - description "This attribute represents a PLMN Identity"; + uses types3gpp:PLMNId; } leaf enbId { description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB -- GitLab From 41da540e253cffe8a41ca33df9e846a4b362b118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 20:24:32 +0000 Subject: [PATCH 19/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 41b81e122..9560cbbbe 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -256,7 +256,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { grouping GeNBIdGrp { description "Represents the properties of a global eNB ID (GeNBId)."; uses types3gpp:PLMNId; - } + leaf enbId { description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells."; -- GitLab From 783f2cac6e248d14d5c4b8bf683301bcd58e8800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 05:33:17 +0000 Subject: [PATCH 20/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 9560cbbbe..07d5c5e31 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -239,7 +239,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; leaf gnbIdLength { - type int32 {range 22…32;} + type int32 {range "22..32";} mandatory true; description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } -- GitLab From 2718f073d011b37b29b89f3c8bbad6640119189d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 05:44:48 +0000 Subject: [PATCH 21/23] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 1e03291af..f40a8be70 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -8,6 +8,7 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; -- GitLab From b4820d44575bcb21595b58757024ccb62c6661ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 06:46:00 +0000 Subject: [PATCH 22/23] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index f40a8be70..1e03291af 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -8,7 +8,6 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; -- GitLab From 590fd754353b3ab10cca64ad9e1e91ae72967aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 8 Nov 2024 13:04:53 +0000 Subject: [PATCH 23/23] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 07d5c5e31..be16f5071 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-05 { reference "CR-XXXX"; } + revision 2024-11-05 { reference "CR-1443"; } revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } -- GitLab