From 0a8176856e1c80c2f91e7206c5181817da5b2f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 17:32:25 +0000 Subject: [PATCH 01/10] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 88 ++++++++++++++++------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 460ea4b21..bee77a31b 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -24,7 +24,8 @@ module _3gpp-common-trace { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)" ; - + + revision 2025-08-07 { reference "CR-xxxx" ; } revision 2025-05-06 { reference "CR-0531 CR-0535" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } @@ -114,47 +115,58 @@ module _3gpp-common-trace { This <> defines an area scope"; choice AreaScopeChoice { - leaf-list eutraCellIdList { - type string; - min-elements 1; - max-elements 32; - description "List of E-UTRAN cells identified by E-UTRAN-CGI"; - } - - leaf-list nrCellIdList { - type string; - min-elements 1; - max-elements 32; - description "List of NR cells identified by NG-RAN CGI"; + case eutran-only { + leaf-list eutraCellIdList { + type types3gpp:EutraCellId; + min-elements 1; + max-elements 32; + description "List of E-UTRAN cells identified by E-UTRAN-CGI"; + } } - - leaf-list tacList { - type types3gpp:Tac; - min-elements 1; - max-elements 8; - description "Tracking Area Code list"; + case tac { + leaf-list tacList { + type types3gpp:Tac; + min-elements 1; + max-elements 8; + description "Tracking Area Code list"; + } + leaf-list cAGIdList { + type string + max-elements 256; + description "It identifies a CAG list containing up to + 256 CAG-identifiers per UE or up to 12 CAG-identifiers + per cell, see TS 38.331 [38]. CAG ID is used to combine + with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal + range with size 32 bit."; + } } - - list taiList { - description "Tracking Area Identity list"; - key idx; - min-elements 1; - max-elements 8; - leaf idx { type string; } - uses types3gpp:TaiGrp; + case else { + list nPNIdentityList { + description "list of NPN IDs of in NR. It is either + a list of PNI-NPNs identified by CAG ID with + associated plmn-Identity or a list of SNPN + identified by Network ID with associated plmn-Identity"; + key idx; + min-elements 1; + uses types3gpp:NpnIdGrp; + leaf idx { type string; } + } + leaf-list nrCellIdList { + must 'not(../taiList)'; + type types3gpp:NrCellId; + max-elements 32; + description "List of NR cells identified by NG-RAN CGI"; + } + list taiList { + must 'not(../nrCellIdList)'; + description "Tracking Area Identity list"; + key idx; + max-elements 8; + leaf idx { type string; } + uses types3gpp:TaiGrp; + } } } - - list nPNIdentityList { - description "It defines which NPNs that can be served by the NR cell, - and which CAG IDs or NIDs can be supported by the NR cell for - corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell. - (NPN-Identity referring to TS 38.331)."; - key idx; - min-elements 1; - uses NpnIdGrp; - leaf idx { type string; } - } } grouping NpnIdGrp { -- GitLab From 58979d136775cc5bc8248d4ed267618193e26537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 17:36:48 +0000 Subject: [PATCH 02/10] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bee77a31b..57e88b6cb 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -131,7 +131,7 @@ module _3gpp-common-trace { description "Tracking Area Code list"; } leaf-list cAGIdList { - type string + type string; max-elements 256; description "It identifies a CAG list containing up to 256 CAG-identifiers per UE or up to 12 CAG-identifiers -- GitLab From 9e6750e8585b0fff5acc4a947e3953561008c631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 17:39:27 +0000 Subject: [PATCH 03/10] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 57e88b6cb..96ab2031d 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -117,7 +117,7 @@ module _3gpp-common-trace { choice AreaScopeChoice { case eutran-only { leaf-list eutraCellIdList { - type types3gpp:EutraCellId; + type string; min-elements 1; max-elements 32; description "List of E-UTRAN cells identified by E-UTRAN-CGI"; @@ -153,7 +153,7 @@ module _3gpp-common-trace { } leaf-list nrCellIdList { must 'not(../taiList)'; - type types3gpp:NrCellId; + type string; max-elements 32; description "List of NR cells identified by NG-RAN CGI"; } -- GitLab From 670afe860584bd98cfe0a94241cef78112d3810f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 17:42:32 +0000 Subject: [PATCH 04/10] Edit _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index e8bd963e1..01dddb918 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2025-08-07 { reference CR-XXXX; } revision 2025-02-18 { reference CR-0511; } revision 2025-02-06 { reference CR-0507; } revision 2024-05-18 { reference CR-0359; } @@ -277,6 +278,43 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } + + grouping NpnIdGrp { + description "Represents the NPN supported by the <> using this + <> as one of its attributes in case of the cell is a + NPN-only cell."; + + list plmnId { + key "mcc mnc"; + min-elements 1; + description "It specifies the PLMN Id of the NPN network."; + uses types3gpp:PLMNId; + } + + choice npnidChoice { + leaf-list cAGIdList { + type CagId; + max-elements 256; + description "It identifies a CAG list containing up to 12 + CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, + see TS 38.331. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is + a hexadecimal range with size 32 bit"; + } + + leaf-list nIDList { + type Nid; + max-elements 16; + description "It identifies a list of NIDs containing up to 16 NIDs, see + TS 38.331. NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + } + } + } + + + + typedef TenthOfDegrees { type uint16 { -- GitLab From c3e97848983ce81c8382e53df9db52300625d823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 17:50:24 +0000 Subject: [PATCH 05/10] Edit _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 01dddb918..d6dd906a4 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -293,7 +293,9 @@ module _3gpp-common-yang-types { choice npnidChoice { leaf-list cAGIdList { - type CagId; + type string { + pattern '^[A-Fa-f0-9]{8}$'; + } max-elements 256; description "It identifies a CAG list containing up to 12 CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, @@ -303,7 +305,9 @@ module _3gpp-common-yang-types { } leaf-list nIDList { - type Nid; + type string { + pattern '^[A-Fa-f0-9]{11}$'; + } max-elements 16; description "It identifies a list of NIDs containing up to 16 NIDs, see TS 38.331. NID is used to combine with PLMN ID to identify an SNPN. -- GitLab From 72606b7fe57f8c308680379095c383f05a57d18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 14 Aug 2025 12:15:16 +0000 Subject: [PATCH 06/10] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 96ab2031d..decccd88f 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2025-08-07 { reference "CR-xxxx" ; } + revision 2025-08-06 { reference "CR-xxxx" ; } revision 2025-05-06 { reference "CR-0531 CR-0535" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } -- GitLab From a24bd3b096f834212b21495e22d368f381cb051c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 14 Aug 2025 12:15:36 +0000 Subject: [PATCH 07/10] Edit _3gpp-common-trace.yang -- GitLab From bc288450c16da16e5e6c43d8b79ae1beb35ef035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 14 Aug 2025 12:15:56 +0000 Subject: [PATCH 08/10] Edit _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index d6dd906a4..74a09f602 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,7 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2025-08-07 { reference CR-XXXX; } + revision 2025-08-06 { reference CR-XXXX; } revision 2025-02-18 { reference CR-0511; } revision 2025-02-06 { reference CR-0507; } revision 2024-05-18 { reference CR-0359; } -- GitLab From 0392a3d48967e248d2dde0919e114b69abf7dcbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 14 Aug 2025 18:41:45 +0000 Subject: [PATCH 09/10] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index decccd88f..32d8f89f1 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2025-08-06 { reference "CR-xxxx" ; } + revision 2025-08-06 { reference "CR-0563" ; } revision 2025-05-06 { reference "CR-0531 CR-0535" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } -- GitLab From c28826f3bb62d3c6d40dd3eff2665be25987a867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 14 Aug 2025 18:42:02 +0000 Subject: [PATCH 10/10] Edit _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 74a09f602..0e6b88255 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,7 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2025-08-06 { reference CR-XXXX; } + revision 2025-08-06 { reference CR-0563; } revision 2025-02-18 { reference CR-0511; } revision 2025-02-06 { reference CR-0507; } revision 2024-05-18 { reference CR-0359; } -- GitLab