Commit 2900685c authored by lengyelb's avatar lengyelb
Browse files

Locally rebased and merged !1464

parent 627bf07f
Loading
Loading
Loading
Loading
Loading
+8 −44
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ module _3gpp-common-qmcjob {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2024-11-05 { reference CR-0480; }
  revision 2024-04-04 { reference CR-0334; } 
  revision 2023-09-18 { reference CR-0271 ; } 
  revision 2023-02-14 { reference "CR-0234"; }
@@ -50,12 +51,8 @@ module _3gpp-common-qmcjob {
    list areaScope {
      key "idx";
      leaf idx { type uint32 ; }
      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 or Tracking Area for QMC.          
        Cell, TA, LA, RA are mutually exclusive.";
      reference "Clause 5.10.2 of 3GPP TS 32.422";
        
      description "It defines the area scope of QoE, which is specified
       in clause 5.4 of TS 28.405.";   
      uses trace3gpp:AreaScopeGrp;      
    }

@@ -182,12 +179,15 @@ module _3gpp-common-qmcjob {
       producer. For details of Management Based Activation of QoE Measurement 
       Collection see clause 4.5 and for details of Signalling Based 
       Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. 
       The attributes areaScope and pLMNTarget are only relevant when 
       The attribute  pLMNTarget is only relevant when 
       Management Based Activation is used and the attribute qoETarget is 
       only relevant when Signalling Based Activation is used. All other 
       attributes are common for both Management Based Activation and 
       Signalling Based Activation.

       The areaScope attribute defines the area scope of QoE, which is 
       specified in clause 5.4 of TS 28.405.

       When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer 
       shall delete the corresponding QMCJob instance. 
       NOTE:  If the reporting is ongoing, when a request to delete a QMCJob 
@@ -198,43 +198,7 @@ module _3gpp-common-qmcjob {
       jobId can be used to associate  multiple QMCJob instances. For example, 
       it is possible to configure the same jobId value for multiple QMCJob 
       instances required to produce the data (e.g. Streaming services and 
       MTSI reports) for a specific network analysis.
       The QoE Measurement Collection provides capability for collecting QoE 
       information from:
       - UEs which are in the specified area in case of Management Based 
       Activation or 
       - an individual UE in case of Signalling Based Activation.
       The QoE Measurement Collection enables collection of application layer 
       from the UE for specified end user service type. The supported service 
       types are:
       - Streaming services, see TS 26.247. 
       - MTSI services, see TS 26.114.
       - VR services, see TS 26.118.
       A QMCJob instance represents the job for collecting QoE measurements 
       according to the job parameters. For details of the QoE measurement 
       collection configuration parameters see clause 5 of TS 28.405. A QMCJob 
       instance can be name-contained by SubNetwork or ManagedElement. 
       A QMC Job is activated by creating a QMCJob object instance in the 
       MnS producer. For details of Management Based Activation of QoE 
       Measurement Collection see clause 4.5 and for details of Signalling 
       Based Activation of QoE Measurement Collection see 
       clause 4.6 of TS 28.405. The attributes areaScope and pLMNTarget are 
       only relevant when Management Based Activation is used and the 
       attribute qoETarget is only relevant when Signalling Based Activation 
       is used. All other attributes are common for both Management Based 
       Activation and Signalling Based Activation.

       When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer 
       shall delete the corresponding QMCJob instance. 
       NOTE:  If the reporting is ongoing, when a request to delete a QMCJob 
       instance is received, the reporting does not end. The QMCJob instance 
       is deleted, when the last reporting for the QMC Job expires.

       The jobId attribute presents the job identifier of a QMCJob instance. 
       The jobId can be used to associate  multiple QMCJob instances. 
       example, it is possible to configure the same jobId value for multiple 
       QMCJob instances required to produce the data (e.g. Streaming services 
       and MTSI reports) for a specific network analysis.";
       MTSI reports) for a specific network analysis.";
      key id;
      uses top3gpp:Top_Grp;
      container attributes {
+30 −38
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ module _3gpp-common-trace {
  prefix "trace3gpp";

  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-common-yang-types {prefix types3gpp; }
  import _3gpp-common-yang-extensions {prefix yext3gpp; }
  import ietf-inet-types { prefix inet; }
  import _3gpp-common-files { prefix files3gpp; }
  import _3gpp-common-yang-types { prefix types3gpp; }
  import _3gpp-5g-common-yang-types {prefix types5g3gpp; }

  organization "3GPP SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -25,6 +26,7 @@ module _3gpp-common-trace {
      Integration Reference Point (IRP);
      Information Service (IS)" ;

  revision 2024-11-07 { reference "CR-0480"; }
  revision 2024-10-01 { reference "CR-0457"; }
  revision 2024-08-13 { reference "CR-0387 CR-0377"; } 
  revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; }
@@ -107,10 +109,7 @@ module _3gpp-common-trace {
  }
  
  grouping AreaScopeGrp {
    description "Represents the AreaScope dataType.
      This <<dataType>> defines the area scope of MDT and QoE.
      The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422.
      The Area Scope for QoE is specified in clause 5.4 of TS 28.405.";    
    description "This <<dataType>> defines an area scope.";

    choice AreaScopeChoice {
      leaf-list eutraCellIdList {
@@ -134,6 +133,15 @@ 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";
        key idx;
@@ -1431,14 +1439,10 @@ module _3gpp-common-trace {
    description "Defines the configuration parameters of IOC 
     TraceJob which are specific for MDT. The attribute 
     anonymizationOfMdtData specifies the level of anonymization 
     of MDT data.  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. In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY the 
     optional attribute areaScope allows to specify the eNB or list 
     of eNBs or gNB or list of gNBs where the reports should be 
     collected.  The optional attribute sensorInformation allows to 
     specify  the sensor information to include.  Based on the value 
     of MDT data.  The attribute areaScope defines the area scope
     of MDT, which is specified in clause 5.10.2 of TS 32.422.
     The optional attribute sensorInformation allows to specify  
     the sensor information to include.  Based on the value 
     configured for attribute jobType in IOC TraceJob, the attributes 
     immediateMdtConfig or loggedMdtConfig are available: In case of 
     IMMEDIATE_MDT_ONLY or IMMEDIATE_MDT_AND_TRACE the attribute 
@@ -1459,21 +1463,9 @@ module _3gpp-common-trace {
   list areaScope {
      key "idx";
      leaf idx { type uint32 ; }
      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.

        List of NPN IDs for management based MDT.
  
        Cell, TA, LA, RA are mutually exclusive.
         
        This attribute shall be present if MDT is supported.";
        reference "Clause 5.10.2 of 3GPP TS 32.422";
        
      description "It specifies the area where data shall be collected. ";
      min-elements 0;
      max-elements 1;        
      uses AreaScopeGrp;      
    }

@@ -1552,8 +1544,8 @@ module _3gpp-common-trace {
      type uint32;
      mandatory true;
      units milliseconds;
      description "It specifies the Granularity period used to produce 5GC UE level 
        measurements. The period is defined in milliseconds (ms).";
      description "It specifies the Granularity period used to produce 5GC UE 
        level measurements. The period is defined in milliseconds (ms).";
    }

    leaf nfTypeToMeasure {
@@ -1738,22 +1730,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";
    }
@@ -1874,10 +1866,10 @@ module _3gpp-common-trace {
        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 ueCoreMeasConfig 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 
        ueCoreMeasConfig are applicable. 
        of attribute ueCoreMeasConfig 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 ueCoreMeasConfig are applicable. 

        Creation and deletion of TraceJob instances by MnS consumers is 
        optional; when not supported, the TraceJob instances may be created