From 612b2ccfc0d5b646a80cd8f168b0a9afedc2d38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 06:12:37 +0000 Subject: [PATCH 01/15] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 59 ++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 2375d4200..11e62ec77 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -22,6 +22,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-11-05 { reference "CR-0XXX";} revision 2023-11-04 { reference "CR-0292 CR-0300"; } revision 2023-02-16 { reference "CR-0231"; } revision 2023-02-14 { reference "CR-0235"; } @@ -598,22 +599,20 @@ module _3gpp-common-trace { } leaf-list MDTAreaScope { - type string; - description "specifies MDT area scope when activates an MDT job. - - For RLF and RCEF reporting it specifies the eNB or list of eNBs where the - RLF or RCEF reports should be collected. - + key: "idx"; + min-elements 1 + max-elements 1 + + description "it specifies the area where data shall be collected. + List of eNB/list of gNB/eNB/gNB for RLF or RCEF List of cells/TA/LA/RA for signaling based MDT or management based Logged MDT. List of cells for management based Immediate MDT. - Cell, TA, LA, RA are mutually exclusive. - - One or list of eNBs for RLF and RCEFreporting"; - reference "Clause 5.10.2 of 3GPP TS 32.422"; + Cell, TA, LA, RA are mutually exclusive"; + uses AreaScopeGrp; } leaf MDTCollectionPeriodRrmLte { @@ -1014,6 +1013,46 @@ module _3gpp-common-trace { } } + grouping AreaScopeGrp { + description "Represents the AreaScope dataType. This <> defines the area scope of MDT. + The Area Scope parameter in LTE and NR is either: + - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. Maximum 32 CGI can be defined. + - list of Tracking Area, identified by TAC. Maximum of 8 TAC can be defined. + - list of Tracking Area Identity, identified by TAC with associated plmn-Identity perTAC. + "; + 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; + } + } + + grouping TraceSubtree { description "Contains classes that manage Tracing. Should be used in all classes (or classes inheriting from) -- GitLab From 1a579b9182aab6ffbc4e6ff31fd8105d5100453f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 06:31:15 +0000 Subject: [PATCH 02/15] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 11e62ec77..7a90e69ad 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1051,6 +1051,7 @@ module _3gpp-common-trace { uses types3gpp:TaiGrp; } } + } grouping TraceSubtree { -- GitLab From 4c0ab02baa3253548ffa73568fb17e4e613b06ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 06:35:07 +0000 Subject: [PATCH 03/15] Update _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 7a90e69ad..7a3684ed1 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -599,7 +599,7 @@ module _3gpp-common-trace { } leaf-list MDTAreaScope { - key: "idx"; + key "idx"; min-elements 1 max-elements 1 -- GitLab From 386364e1d12ac0ed4a70038b6de7877abe8eef6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 06:37:11 +0000 Subject: [PATCH 04/15] Update _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 7a3684ed1..b1ec4802a 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -600,8 +600,8 @@ module _3gpp-common-trace { leaf-list MDTAreaScope { key "idx"; - min-elements 1 - max-elements 1 + min-elements 1; + max-elements 1; description "it specifies the area where data shall be collected. List of eNB/list of gNB/eNB/gNB for RLF or RCEF -- GitLab From 451bf447d5ebda5e5fde872f9bd00e338d36c75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 06:47:32 +0000 Subject: [PATCH 05/15] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index b1ec4802a..1ec6cc881 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1013,13 +1013,18 @@ module _3gpp-common-trace { } } - grouping AreaScopeGrp { - description "Represents the AreaScope dataType. This <> defines the area scope of MDT. + grouping AreaScopeGrp { + description "Represents the AreaScope dataType. + This <> defines the area scope of MDT. The Area Scope parameter in LTE and NR is either: - - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. Maximum 32 CGI can be defined. - - list of Tracking Area, identified by TAC. Maximum of 8 TAC can be defined. - - list of Tracking Area Identity, identified by TAC with associated plmn-Identity perTAC. - "; + - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. + Maximum 32 CGI can be defined. + - list of Tracking Area, identified by TAC. + Maximum of 8 TAC can be defined. + - list of Tracking Area Identity, identified by TAC with + associated plmn-Identity perTAC-List containing the + PLMN identity for each TAC. Maximum of 8 TAI can be defined."; + choice AreaScopeChoice { leaf-list eutraCellIdList { type string; -- GitLab From 36acad121cf27059d852f70eaccfeade93c43510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 06:54:17 +0000 Subject: [PATCH 06/15] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 1ec6cc881..f629fa756 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -534,22 +534,22 @@ module _3gpp-common-trace { ManagedEntity playing a role of ServinGWFunction. In case of signaling based Trace/MDT, the traceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the MDTAreaScope attribute + be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute shall be able to carry a list of (cell or E-UtranCell or NRCellDU or TA/LA/RA). In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the MDTAreaScope attribute shall carry a list of + shall be null value, the areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU). In case of management based Logged MDT, the traceTarget attribute shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The MDTAreaScope + on the specified eNB or RNC or gNB in traceTarget. The areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or TA/LA/RA). In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the MDTAreaScope attribute shall carry + attribute shall be null value, the areaScope attribute shall carry one or list of eNBs/gNBs"; reference "3GPP TS 32.422"; } @@ -565,7 +565,7 @@ module _3gpp-common-trace { } leaf MDTAnonymizationOfData { - when ../MDTAreaScope ; + when ../areaScope ; type enumeration { enum NO_IDENTITY; enum TAC_OF_IMEI; @@ -575,7 +575,7 @@ module _3gpp-common-trace { reference "3GPP TS 32.422 clause 5.10.12."; } - list MDTAreaConfigurationForNeighCell { + list AreaConfigurationForNeighCell { when '../jobType = "LOGGED_MDT_ONLY"'; key "idx"; min-elements 1; @@ -598,11 +598,7 @@ module _3gpp-common-trace { } } - leaf-list MDTAreaScope { - key "idx"; - min-elements 1; - max-elements 1; - + list areaScope { description "it specifies the area where data shall be collected. List of eNB/list of gNB/eNB/gNB for RLF or RCEF @@ -612,6 +608,10 @@ module _3gpp-common-trace { List of cells for management based Immediate MDT. Cell, TA, LA, RA are mutually exclusive"; + key idx; + min-elements 1; + max-elements 1; + leaf idx {type string; } uses AreaScopeGrp; } @@ -1133,7 +1133,7 @@ module _3gpp-common-trace { triggered periodic reporting), - MDTMeasurementQuantity (conditional for 1F event reporting). - For this case the optional attribute MDTAreaScope allows to specify + For this case the optional attribute areaScope allows to specify the area in terms of cells or Tracking Area/Routing Area/Location area where the MDT data collection shall take place and the optional attributes MDTPositioningMethod, MDTSensorInformation allow to @@ -1149,12 +1149,12 @@ module _3gpp-common-trace { MDTLoggingDuration, MDTReportType, MDTEventListForTriggeredMeasurements. - For this case the optional attribute MDTAreaScope allows to specify + For this case the optional attribute areaScope allows to specify the area in terms of cells or Tracking Area/Routing Area/Location area where the MDT data collection shall take place, the optional attribute MDTPLMNList allows to specify the PLMNs where measurement collection, status indication and log reporting is allowed, the optional attribute - MDTAreaConfigurationForNeighCell allows to specify the area for + areaConfigurationForNeighCell allows to specify the area for which UE is requested to perform measurements logging for neighbour cells which have list of frequencies and the optional attribute MDTSensorInformation allows to specify the sensor information to @@ -1162,7 +1162,7 @@ module _3gpp-common-trace { - In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY additionally the attribute traceTarget shall be available, the optional attribute - MDTAreaScope allows to specify the eNB or list of eNBs or gNB or + areaScope allows to specify the eNB or list of eNBs or gNB or list of gNBs where the reports should be collected. - In case of LOGGED_MBSFN_MDT additionally the following attributes -- GitLab From def463cb1bf11c5ca3cf8377cf795b64dfb12cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Tue, 5 Nov 2024 07:04:02 +0000 Subject: [PATCH 07/15] Update _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index b19148cbe..61cbd6687 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -519,4 +519,23 @@ module _3gpp-common-yang-types { } units dB; } + + + grouping TaiGrp { + description "This <> defines a Tracking Area Identity (TAI) + as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 + and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN + identifier (PLMN-Id, which is composed of the MCC and MNC) and + the Tracking Area Code (TAC). "; + list plmnId { + description "PLMN Identity."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + leaf tac { type Tac; } + } + } \ No newline at end of file -- GitLab From 95715675c3ccbc391ac424f9ffb8c595c073d9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 18:24:05 +0000 Subject: [PATCH 08/15] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index f629fa756..3b0142541 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -599,15 +599,7 @@ module _3gpp-common-trace { } list areaScope { - description "it specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF - - List of cells/TA/LA/RA for signaling based MDT or management based Logged - MDT. - - List of cells for management based Immediate MDT. - - Cell, TA, LA, RA are mutually exclusive"; + description "it specifies the area where data shall be collected"; key idx; min-elements 1; max-elements 1; -- GitLab From 6499aaf972a1120c88161f0ce4c671aa32643c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 18:32:17 +0000 Subject: [PATCH 09/15] Update _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 61cbd6687..abcae41de 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -13,6 +13,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; + revision 2024-11-08 {reference: "CR0XXX"} revision 2021-11-01 { reference "CR-0141"; } revision 2020-11-06 { description "Removed incorrect S-NSSAI definitions."; -- GitLab From a3847ef8a162eade5c00f6b270494e8679e20f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 18:33:39 +0000 Subject: [PATCH 10/15] Update _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 3b0142541..e252c2fe9 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -22,7 +22,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-11-05 { reference "CR-0XXX";} + revision 2024-11-05 { reference "CR-0XXX"; } revision 2023-11-04 { reference "CR-0292 CR-0300"; } revision 2023-02-16 { reference "CR-0231"; } revision 2023-02-14 { reference "CR-0235"; } -- GitLab From 96344215eb9b1b02adc266329952679fdfaa6407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 18:37:46 +0000 Subject: [PATCH 11/15] Update _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 abcae41de..e490859d0 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -13,7 +13,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; - revision 2024-11-08 {reference: "CR0XXX"} + revision 2024-11-08 { reference: "CR0XXX"; } revision 2021-11-01 { reference "CR-0141"; } revision 2020-11-06 { description "Removed incorrect S-NSSAI definitions."; -- GitLab From 8b225ea9ad568e3dae41becddb8ee8a7a4bf4a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 6 Nov 2024 18:40:02 +0000 Subject: [PATCH 12/15] Update _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 e490859d0..bd254c4f7 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -13,7 +13,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; - revision 2024-11-08 { reference: "CR0XXX"; } + revision 2024-11-05 { reference "CR-0XXX"; } revision 2021-11-01 { reference "CR-0141"; } revision 2020-11-06 { description "Removed incorrect S-NSSAI definitions."; -- GitLab From 791aff9c3e10a48344a419d59525697ec839619c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 8 Nov 2024 13:21:06 +0000 Subject: [PATCH 13/15] Update _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 e252c2fe9..00cf84d0b 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -22,7 +22,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-11-05 { reference "CR-0XXX"; } + revision 2024-11-05 { reference "CR-0468"; } revision 2023-11-04 { reference "CR-0292 CR-0300"; } revision 2023-02-16 { reference "CR-0231"; } revision 2023-02-14 { reference "CR-0235"; } -- GitLab From e378a488bb629057753f93d715c6c04413259928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 8 Nov 2024 13:21:19 +0000 Subject: [PATCH 14/15] Update _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 bd254c4f7..aa4d3b4ea 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -13,7 +13,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; - revision 2024-11-05 { reference "CR-0XXX"; } + revision 2024-11-05 { reference "CR-0468"; } revision 2021-11-01 { reference "CR-0141"; } revision 2020-11-06 { description "Removed incorrect S-NSSAI definitions."; -- GitLab From 4e230ca43b3e5bcc633a1acd63009370010ca360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 21 Nov 2024 17:53:55 +0000 Subject: [PATCH 15/15] Update _3gpp-common-trace.yang to set min-elements 0 --- 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 00cf84d0b..94028e544 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -601,7 +601,7 @@ module _3gpp-common-trace { list areaScope { description "it specifies the area where data shall be collected"; key idx; - min-elements 1; + min-elements 0; max-elements 1; leaf idx {type string; } uses AreaScopeGrp; -- GitLab