Commit cc2ea733 authored by lengyelb's avatar lengyelb
Browse files

Merge branch '28.623_Rel18_CR0342_Add_trace_message_support_yang' into... 

Merge branch '28.623_Rel18_CR0342_Add_trace_message_support_yang' into 'Integration_Rel18_SA5_154_YANG'

28.623 Rel18 CR0342 Add trace message attribute yang

See merge request !1106
parents fc5c0d82 0cba192c

yang-models/_3gpp-common-trace.yang

+25 −11
Original line number Diff line number Diff line
@@ -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 ; }
@@ -1284,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.";
@@ -1303,6 +1305,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;
@@ -1428,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;
@@ -1443,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;
@@ -1455,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;
@@ -1533,12 +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