Loading yang-models/_3gpp-common-trace.yang +7 −0 Original line number Diff line number Diff line Loading @@ -1600,6 +1600,7 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; <<<<<<< HEAD description "Specifies the metrics to be reported."; reference "Clause 10 of 3GPP TS 32.422"; } Loading @@ -1614,6 +1615,12 @@ module _3gpp-common-trace { values."; } ======= description "Specifies the messages to be reported."; reference "Clause 10 of 3GPP TS 32.422"; } >>>>>>> d8efed85 (Update file _3gpp-common-trace.yang) leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; Loading Loading
yang-models/_3gpp-common-trace.yang +7 −0 Original line number Diff line number Diff line Loading @@ -1600,6 +1600,7 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; <<<<<<< HEAD description "Specifies the metrics to be reported."; reference "Clause 10 of 3GPP TS 32.422"; } Loading @@ -1614,6 +1615,12 @@ module _3gpp-common-trace { values."; } ======= description "Specifies the messages to be reported."; reference "Clause 10 of 3GPP TS 32.422"; } >>>>>>> d8efed85 (Update file _3gpp-common-trace.yang) leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; Loading