Commit e079e8b7 authored by scottma's avatar scottma Committed by sunse
Browse files

Update file _3gpp-common-trace.yang

parent 91a91b8d

yang-models/_3gpp-common-trace.yang

+0 −45
Original line number Diff line number Diff line
@@ -1724,7 +1724,6 @@ module _3gpp-common-trace { 
      reference "3GPP TS 32.422";

    }



<<<<<<< HEAD

    list traceConfig {

      when '../jobType = "TRACE_ONLY"'

      +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'
@@ -1736,19 +1735,6 @@ module _3gpp-common-trace { 
      max-elements 1;

      uses TraceConfigGrp;    

      leaf idx { type string; }

=======

   list traceConfig {      

     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"';  

     key idx;

     description "Trace config";

     max-elements 1;

     uses TraceConfigGrp;    

     leaf idx { type string; }

>>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang)

    }

    

    list mdtConfig {
@@ -1760,26 +1746,6 @@ module _3gpp-common-trace { 
        + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'

        + ' or ../jobType = 

        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"';

<<<<<<< HEAD

      key idx;

      description "MDT config";

      max-elements 1;       

      uses MdtConfigGrp;

      leaf idx { type string; }    

    }



    list ueMeasConfig { 

      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"';

      key idx;

      description "5GC UE level measurements config";

      max-elements 1;       

      uses UEMeasConfigGrp;

      leaf idx { type string; }    

=======

      key idx;

      description "MDT config";

      max-elements 1;
@@ -1798,7 +1764,6 @@ module _3gpp-common-trace { 
      max-elements 1;       

      uses UEMeasConfigGrp;

      leaf idx { type string; }    

>>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang)

    }

   

    list nPNTarget {
@@ -1872,7 +1837,6 @@ 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 

<<<<<<< HEAD

        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
@@ -1880,15 +1844,6 @@ module _3gpp-common-trace { 
        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. 

>>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang)



        Creation and deletion of TraceJob instances by MnS consumers is 

        optional; when not supported, the TraceJob instances may be created