Commit abc3946d authored by lengyelb's avatar lengyelb
Browse files

Locally merged merge_requests/529 due to merge conflicts; CR0240 S5-233114

parent d9016074
Loading
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ module _3gpp-common-measurements {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2023-02-18 { reference "CR-0240"; }
  revision 2023-02-14 { reference "CR-0234"; }
  revision 2022-11-04 { reference "CR-0212 CR-0194"; }
  revision 2022-10-24 { reference CR-0196; }
@@ -196,6 +197,8 @@ module _3gpp-common-measurements {
          range 1..max ;
        }
        units seconds;
        description "Granularity periods supported for the associated 
          measurement types. The period is defined in seconds.";
      }

      leaf-list reportingMethods {
@@ -207,13 +210,13 @@ module _3gpp-common-measurements {
        min-elements 1;
      }

      leaf-list monitorGranularityPeriods {
      leaf-list reportingPeriods  {
        type uint32 {
          range 1..max ;
        }
        units seconds;
        description "Granularity periods supported for the monitoring of
          associated measurement types for thresholds";
        description "Reporting periods supported for the associated 
          measurement types. The period is defined in seconds.";
      }
    }
  }
@@ -321,6 +324,7 @@ module _3gpp-common-measurements {
      min-elements 1;
      leaf idx { type uint32 ; }
      uses ThresholdInfoGrp;
      description "List of threshold info.";
    }

    leaf monitorGranularityPeriod {
@@ -458,6 +462,9 @@ module _3gpp-common-measurements {
      A threshold monitor checks for threshold crossings of performance metric
      values and generates a notification when that happens.

      The ThresholdMonitor shall be used only when NRM based threshold 
      monitoring is supported.
      
      To activate threshold monitoring, a MnS consumer needs to create a
      ThresholdMonitor instance on the MnS producer. For ultimate deactivation
      of threshold monitoring, the MnS consumer should delete the monitor to
@@ -489,6 +496,8 @@ module _3gpp-common-measurements {
      Multiple thresholds can be defined for multiple performance metric sets
      in a single monitor using thresholdInfoList. The attribute
      monitorGranularityPeriod defines the granularity period to be applied.
      The value is a supported GP for the measurements being monitored.  
      Threshold crossing behaviour is as defined in [54], Annex F.

      Each threshold is identified with a number (key) called thresholdLevel.
      A threshold is defined using the attributes thresholdValue ,