From 83d06df0b5f64b013eec36b71c737289ba88266d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 17 Feb 2023 17:44:27 +0000
Subject: [PATCH 1/2] Update TS28623_GenericNrm.yaml

---
 OpenAPI/TS28623_GenericNrm.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 98ceba531..431a4c56d 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -194,7 +194,7 @@ components:
              - FILE_BASED_LOC_SET_BY_PRODUCER
              - FILE_BASED_LOC_SET_BY_CONSUMER
              - STREAM_BASED 
-        monitorGranularityPeriods:
+        reportingPeriods:
           type: array
           items:
             type: integer
-- 
GitLab


From c9ae41a6a400d0d5927531eeaab3e5dc961abcd2 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 2 Mar 2023 23:52:01 +0000
Subject: [PATCH 2/2] Update _3gpp-common-measurements.yang

---
 yang-models/_3gpp-common-measurements.yang | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang
index 72c892906..558e8a86f 100755
--- a/yang-models/_3gpp-common-measurements.yang
+++ b/yang-models/_3gpp-common-measurements.yang
@@ -55,6 +55,7 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2023-02-16 { reference "CR-0240"; }
   revision 2022-11-04 { reference "CR-0212 CR-0194"; }
   revision 2022-10-24 { reference CR-0196; }
   revision 2022-09-30 { reference CR-0191; }
@@ -195,6 +196,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 {
@@ -206,13 +209,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.";
       }
     }
   }
@@ -320,6 +323,7 @@ module _3gpp-common-measurements {
       min-elements 1;
       leaf idx { type uint32 ; }
       uses ThresholdInfoGrp;
+      description "List of threshold info.";
     }
 
     leaf monitorGranularityPeriod {
@@ -457,6 +461,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 is 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
@@ -488,6 +495,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 multiple of a supported granularity period for the 
+      measurements being monitored.
 
       Each threshold is identified with a number (key) called thresholdLevel.
       A threshold is defined using the attributes thresholdValue ,
@@ -527,4 +536,4 @@ module _3gpp-common-measurements {
       }
     }
   }
-}
\ No newline at end of file
+}
-- 
GitLab