From f6594e4c7f556f42d892bdc7be4cd74e23f57810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:08:08 +0000 Subject: [PATCH 01/14] Edit _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index e060a1203..e9d680e56 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -319,7 +319,7 @@ module _3gpp-common-yang-types { choice npnidChoice { leaf-list cAGIdList { - type string; + 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, @@ -329,7 +329,7 @@ module _3gpp-common-yang-types { } leaf-list nIDList { - type string; + 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. @@ -991,6 +991,26 @@ module _3gpp-common-yang-types { } } + typedef Nid { + description "This represents the Network Identifier, which + together with a PLMN ID is used to identify a SNPN."; + type string { + pattern '^[A-Fa-f0-9]{11}$'; + } + reference "3GPP TS 23.003 and 3GPP TS 23.501 clause 5.3.2.1."; + } + + typedef CagId { + description "This represents the identifier of a Closed Access + Group (CAG), which together with a PLMN ID is used to + identify a PNI-NPN."; + type string { + pattern '^[A-Fa-f0-9]{8}$'; + } + reference "3GPP TS 23.003 and 3GPP TS 23.501."; + } + + /* DistinguishedName pattern is built up based on the EBNF in 32.300 clause 7.3 EBNF of DN String Representation -- GitLab From 5bc71755cd50a9fdb507d8531baf6921d6cab3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:11:18 +0000 Subject: [PATCH 02/14] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bec576ffc..f8327c246 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -136,14 +136,7 @@ module _3gpp-common-trace { description "Tracking Area Code list"; } - list sliceIdList { - description "Network Slice Id list"; - key idx; - uses types5g3gpp:PLMNInfo; - min-elements 1; - max-elements 16384; - leaf idx { type string; } - } + list taiList { description "Tracking Area Identity list"; @@ -153,15 +146,24 @@ module _3gpp-common-trace { leaf idx { type string; } uses types3gpp:TaiGrp; } + + 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; } + } } - 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"; + list sliceIdList { + description "Network Slice Id list"; key idx; + uses types5g3gpp:PLMNInfo; min-elements 1; - uses types3gpp:NpnIdGrp; + max-elements 16384; leaf idx { type string; } } } -- GitLab From 4e04576743e82e598df9190a444633e9fbff0712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:22:42 +0000 Subject: [PATCH 03/14] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 91 +++++++++++++++++------------ 1 file changed, 53 insertions(+), 38 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index f8327c246..b29584e06 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -115,47 +115,62 @@ module _3gpp-common-trace { description "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"; - } - - leaf-list tacList { - type types3gpp:Tac; - min-elements 1; - max-elements 8; - description "Tracking Area Code list"; - } - - - list taiList { - description "Tracking Area Identity list"; - key idx; - min-elements 1; - max-elements 8; - leaf idx { type string; } - uses types3gpp:TaiGrp; + case eutran-only { + leaf-list eutraCellIdList { + type string; + min-elements 1; + max-elements 32; + description "List of E-UTRAN cells identified by E-UTRAN-CGI"; + } } - - 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; } + case tac { + leaf-list tacList { + mandatory true; + 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."; + } } + + case else + list nPNIdentityList { + mandatory true; + 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 string; + min-elements 1; + 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; + min-elements 1; + max-elements 8; + leaf idx { type string; } + uses types3gpp:TaiGrp; + } } list sliceIdList { -- GitLab From ca6418bc6bab30edd6f0b8771cf0df1016452feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:24:57 +0000 Subject: [PATCH 04/14] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index b29584e06..e77dc2886 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -143,7 +143,7 @@ module _3gpp-common-trace { } } - case else + case else { list nPNIdentityList { mandatory true; description "list of NPN IDs of in NR. It is either @@ -171,6 +171,7 @@ module _3gpp-common-trace { leaf idx { type string; } uses types3gpp:TaiGrp; } + } } list sliceIdList { -- GitLab From 4d854e7e9f946d5da9faea59532c47f85710838e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:26:37 +0000 Subject: [PATCH 05/14] 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 e77dc2886..d5a0fc010 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -156,14 +156,14 @@ module _3gpp-common-trace { leaf idx { type string; } } leaf-list nrCellIdList { - must 'not(../taiList)' + must 'not(../taiList)'; type string; min-elements 1; max-elements 32; description "List of NR cells identified by NG-RAN CGI"; } list taiList { - must 'not(../nrCellIdList)' + must 'not(../nrCellIdList)'; description "Tracking Area Identity list"; key idx; min-elements 1; -- GitLab From 1bd5a16f0cb86b6869602a12d3fbda6efa9cad00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:34:40 +0000 Subject: [PATCH 06/14] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 -- 1 file changed, 2 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d5a0fc010..e0cdaeb0f 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -126,7 +126,6 @@ module _3gpp-common-trace { } case tac { leaf-list tacList { - mandatory true; type types3gpp:Tac; min-elements 1; max-elements 8; @@ -145,7 +144,6 @@ module _3gpp-common-trace { case else { list nPNIdentityList { - mandatory true; 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 -- GitLab From 40b14239a4fdb3464fffa1c0eabe3ad9a07cd678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:42:01 +0000 Subject: [PATCH 07/14] Edit _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 37 +++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index e9d680e56..8469de958 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-02-19 { reference CR-0512; } revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } @@ -304,6 +304,39 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } + + + typedef EutraCellId { + type string { + pattern '^[A-Fa-f0-9]{7}$'; + } + description "28-bit string identifying an E-UTRA Cell Id + as specified in clause 9.3.1.9 of 3GPP TS 38.413 + in hexadecimal representation. Each character in the + string shall take a value of "0" to "9", "a" to "f" + or "A" to "F" and shall represent 4 bits. + The most significant character representing the 4 most + significant bits of the Cell Id shall appear first in the + string, and the character representing the 4 least + significant bit of the Cell Id shall appear last in the + string."; + } + + typedef NrCellId { + type string { + pattern '^[A-Fa-f0-9]{9}$'; + } + description "36-bit string identifying an NR Cell Id + as specified in clause 9.3.1.7 of 3GPP TS 38.413 + in hexadecimal representation. Each character in the + string shall take a value of "0" to "9", "a" to "f" + or "A" to "F" and shall represent 4 bits. + The most significant character representing the 4 most + significant bits of the Cell Id shall appear first in the + string, and the character representing the 4 least + significant bit of the Cell Id shall appear last in the + string."; + } grouping NpnIdGrp { description "Represents the NPN supported by the <> using this @@ -316,6 +349,8 @@ module _3gpp-common-yang-types { description "It specifies the PLMN Id of the NPN network."; uses types3gpp:PLMNId; } + + choice npnidChoice { leaf-list cAGIdList { -- GitLab From 42430f193126df4ead34c0a4f95da6f6b8dcaee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:48:28 +0000 Subject: [PATCH 08/14] Edit _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 8469de958..ba2fb21cf 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -313,8 +313,8 @@ module _3gpp-common-yang-types { description "28-bit string identifying an E-UTRA Cell Id as specified in clause 9.3.1.9 of 3GPP TS 38.413 in hexadecimal representation. Each character in the - string shall take a value of "0" to "9", "a" to "f" - or "A" to "F" and shall represent 4 bits. + string shall take a value of '0' to '9', 'a' to 'f' + or 'A' to 'F' and shall represent 4 bits. The most significant character representing the 4 most significant bits of the Cell Id shall appear first in the string, and the character representing the 4 least @@ -329,8 +329,8 @@ module _3gpp-common-yang-types { description "36-bit string identifying an NR Cell Id as specified in clause 9.3.1.7 of 3GPP TS 38.413 in hexadecimal representation. Each character in the - string shall take a value of "0" to "9", "a" to "f" - or "A" to "F" and shall represent 4 bits. + string shall take a value of '0' to '9', 'a' to 'f' + or 'A' to 'F' and shall represent 4 bits. The most significant character representing the 4 most significant bits of the Cell Id shall appear first in the string, and the character representing the 4 least @@ -349,8 +349,6 @@ module _3gpp-common-yang-types { description "It specifies the PLMN Id of the NPN network."; uses types3gpp:PLMNId; } - - choice npnidChoice { leaf-list cAGIdList { -- GitLab From f9818f5392c8c54bc0c923386813de408b553d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:52:29 +0000 Subject: [PATCH 09/14] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index e0cdaeb0f..e632a0829 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2025-08-07 { reference "CR-xxxx" ; } revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } @@ -118,7 +119,7 @@ module _3gpp-common-trace { case eutran-only { leaf-list eutraCellIdList { - type string; + uses types3gpp:EutranCellId; min-elements 1; max-elements 32; description "List of E-UTRAN cells identified by E-UTRAN-CGI"; @@ -132,7 +133,7 @@ module _3gpp-common-trace { description "Tracking Area Code list"; } leaf-list cAGIdList { - type string; + type types3gpp:CagId; max-elements 256; description "It identifies a CAG list containing up to 256 CAG-identifiers per UE or up to 12 CAG-identifiers @@ -155,8 +156,7 @@ module _3gpp-common-trace { } leaf-list nrCellIdList { must 'not(../taiList)'; - type string; - min-elements 1; + uses types3gpp:NrCellId; max-elements 32; description "List of NR cells identified by NG-RAN CGI"; } @@ -164,7 +164,6 @@ module _3gpp-common-trace { must 'not(../nrCellIdList)'; description "Tracking Area Identity list"; key idx; - min-elements 1; max-elements 8; leaf idx { type string; } uses types3gpp:TaiGrp; -- GitLab From f01c27b768aa1b32efc537e16c26d5cb89bfa542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:53:58 +0000 Subject: [PATCH 10/14] Edit _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index e632a0829..548618bd4 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -119,7 +119,7 @@ module _3gpp-common-trace { case eutran-only { leaf-list eutraCellIdList { - uses types3gpp:EutranCellId; + type types3gpp:EutranCellId; min-elements 1; max-elements 32; description "List of E-UTRAN cells identified by E-UTRAN-CGI"; @@ -156,7 +156,7 @@ module _3gpp-common-trace { } leaf-list nrCellIdList { must 'not(../taiList)'; - uses types3gpp:NrCellId; + type types3gpp:NrCellId; max-elements 32; description "List of NR cells identified by NG-RAN CGI"; } @@ -166,7 +166,7 @@ module _3gpp-common-trace { key idx; max-elements 8; leaf idx { type string; } - uses types3gpp:TaiGrp; + type types3gpp:TaiGrp; } } } -- GitLab From 36a4361596d2b26ab08b85c51b430dbc9a92a1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:55:22 +0000 Subject: [PATCH 11/14] 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 548618bd4..1d229a596 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -119,7 +119,7 @@ module _3gpp-common-trace { case eutran-only { leaf-list eutraCellIdList { - type types3gpp:EutranCellId; + type types3gpp:EutraCellId; min-elements 1; max-elements 32; description "List of E-UTRAN cells identified by E-UTRAN-CGI"; -- GitLab From f36e979a05d09c14d37919daa931ab58d89830c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 13 Aug 2025 10:57:48 +0000 Subject: [PATCH 12/14] 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 1d229a596..89d65ec8d 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -166,7 +166,7 @@ module _3gpp-common-trace { key idx; max-elements 8; leaf idx { type string; } - type types3gpp:TaiGrp; + uses types3gpp:TaiGrp; } } } -- GitLab From a0345cafada00bd5d9c012b49c6c42ad5033f43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 14 Aug 2025 18:24:10 +0000 Subject: [PATCH 13/14] 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 89d65ec8d..84303d5f8 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-07 { reference "CR-0562" ; } revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } -- GitLab From 9b626fd8f41e38ada4a2528d25b6e9e00460092f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 14 Aug 2025 18:24:25 +0000 Subject: [PATCH 14/14] 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 ba2fb21cf..040e26d1f 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-07 { reference CR-0562; } revision 2025-02-19 { reference CR-0512; } revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } -- GitLab