From d8efed8592e88ffbe8da66e5c7659f3f45e6b9ed Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:30:54 +0000 Subject: [PATCH 1/3] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index cd2a69cb7..b2dd6b67d 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -13,7 +13,7 @@ module _3gpp-common-trace { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Trace handling - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-04-06 { reference "CR-0342"; } revision 2024-01-29 { reference "CR-0316"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } revision 2023-11-03 { reference CR-0302 ; } @@ -1303,6 +1304,14 @@ module _3gpp-common-trace { uses types3gpp:PLMNId; } + leaf-list listOfTraceMetrics { + when '../jobType = "TRACE_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + type string; + description "Specifies the messages to be reported."; + reference "Clause 10 of 3GPP TS 32.422"; + } + leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; -- GitLab From 6c3b5477bd1bbcb2af10c33383dc0e8e5d6ffea7 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:50:20 +0000 Subject: [PATCH 2/3] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index b2dd6b67d..1ccb0a23a 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1285,7 +1285,8 @@ module _3gpp-common-trace { } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the - TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE level measurement collection, or any combination + TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE + level measurement collection, or any combination of Trace, immediate MDT and 5GC UE level measurement collection. The attribute is applicable for Trace, MDT, RCEF and RLF reporting, and 5GC UE level measurement collection."; @@ -1437,7 +1438,8 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "Trace config"; max-elements 1; @@ -1452,7 +1454,8 @@ module _3gpp-common-trace { + ' or ../jobType = "RCEF_REPORT_ONLY"' + ' or ../jobType = "LOGGED_MBSFN_MDT"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "MDT config"; max-elements 1; @@ -1464,7 +1467,8 @@ module _3gpp-common-trace { when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "5GC UE level measurements config"; max-elements 1; @@ -1544,10 +1548,11 @@ module _3gpp-common-trace { be applied. In case of Immediate MDT only, Logged MDT only, RLF reports only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of - UE measurements only, the configuration parameters of attribute ueMeasConfig - shall be applied. In case of any combination of Trace, Immediate MDT, - Trace and UE measurements, the configuration parameters of the corresponding - attributes traceConfig, mdtConfig and ueMeasConfig are applicable. + UE measurements only, the configuration parameters of attribute + ueMeasConfig shall be applied. In case of any combination of Trace, + Immediate MDT, Trace and UE measurements, the configuration parameters + of the corresponding attributes traceConfig, mdtConfig and ueMeasConfig + are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From 0cba192c308885817fb201a76ea3eef95d6d3122 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:56:36 +0000 Subject: [PATCH 3/3] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 1ccb0a23a..767532053 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1546,13 +1546,13 @@ module _3gpp-common-trace { The attribute jobType specifies the kind of data to collect. In case of Trace only, the configuration parameters of attribute traceConfig shall be applied. In case of Immediate MDT only, Logged MDT only, RLF reports - only, RCEF reports only and Logged MBSFN MDT, the configuration parameters - of attribute mdtConfig or a subset of these shall be applied. In case of - UE measurements only, the configuration parameters of attribute - ueMeasConfig shall be applied. In case of any combination of Trace, - Immediate MDT, Trace and UE measurements, the configuration parameters - of the corresponding attributes traceConfig, mdtConfig and ueMeasConfig - are applicable. + only, RCEF reports only and Logged MBSFN MDT, the configuration + parameters of attribute mdtConfig or a subset of these shall be + applied. In case of UE measurements only, the configuration parameters + of attribute ueMeasConfig shall be applied. In case of any combination + of Trace, Immediate MDT, Trace and UE measurements, the configuration + parameters of the corresponding attributes traceConfig, mdtConfig and + ueMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab