Commit 1d489cfc authored by lengyelb's avatar lengyelb
Browse files

Locally merged merge_requests/522 due to merge conflicts; CR0233 S5-233141

parent abc3946d
Loading
Loading
Loading
Loading
Loading
+7 −19
Original line number Diff line number Diff line
@@ -614,16 +614,6 @@ module _3gpp-common-trace {
      uses trace3gpp:TraceReferenceGrp ;    
    }

    leaf traceRecordingSessionReference {
      type string;
      mandatory true;
      config false;
      description "An identifier, which identifies the Trace Recording Session. 
        The attribute is applicable for both Trace and MDT.
        See the clause 5.7 of 3GPP TS 32.422 for additional details on the 
        allowed values.";
    }
    
    leaf jobId {
      type string;
      yext3gpp:inVariant;
@@ -1223,17 +1213,15 @@ module _3gpp-common-trace {
        4.1.2.1.2 of TS 32.422.

        When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer 
        shall delete the corresponding TraceJob instance. For details of 
        management Trace Job deactivation see clauses 4.1.3.8 to 4.1.3.11 and 
        4.1.4.10 to 4.1.4.13  of TS 32.422.
        shall delete the corresponding TraceJob instance. 
        
        For details of management Trace Job activation/deactivation see clause
        4.1.1.1.2 of TS 32.422.

        The attribute traceReference specifies a globally unique ID and 
        identifies a Trace session. One Trace Session may be activated to 
        multiple Network Elements.

        The attribute traceRecordingSessionReference identifies a Trace 
        Recording Session within a Trace Session. Two different trace sessions 
        could e.g. be caused by two different trigger events.
        multiple Network Elements. The traceReference is populated by the
        consumer that makes the request for a Trace Session.

        The jobId attribute presents the job identifier of a TraceJob instance. 
        The jobId can be used to associate  multiple TraceJob instances. 
@@ -1258,7 +1246,7 @@ module _3gpp-common-trace {

        The attribute jobType specifies the kind of data to collect. Dependent 
        on the selected type various parameters shall be available. The 
        attributes jobType, traceReference, traceRecordingSessionReference, 
        attributes jobType, traceReference,  
        traceCollectionEntityIPAddress, traceTarget and traceReportingFormat 
        are mandatory for all job types. If streaming reporting is selected 
        for traceReportingFormat, traceReportingConsumerUri shall be present