Address community review comments

Eliminate oldest events if the number of events exceed the threshold Signed-off-by: Stephen Sun <stephens@nvidia.com>
sonic-net · Jan 16, 2024 · bcc233a · bcc233a
1 parent b249390
commit bcc233a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md
@@ -392,7 +392,8 @@ ASIC/SDK health event related configuration is defined in **SUPPRESS_ASIC_SDK_HE
     "notice": {
         "categories": [
             "asic_hw"
-        ]
+        ],
+        "max_events": "1000"
     },
     "warning": {
         "categories": [

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/suppress_asic_sdk_health_event.json b/src/sonic-yang-models/tests/yang_model_tests/tests/suppress_asic_sdk_health_event.json
@@ -12,8 +12,12 @@
         "desc": "Load suppress ASIC/SDK health event list for notice.",
         "eStrKey": "InvalidValue"
     },
-    "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST_INVALID_CATEGORY": {
-        "desc": "Load MUX_TUNNEL missing name.",
+    "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST_NEGATIVE_MAX_EVENTS": {
+        "desc": "Load suppress ASIC/SDK health event list missing name.",
+        "eStrKey": "InvalidValue"
+    },
+    "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST_INVALID_MAX_EVENTS": {
+        "desc": "Load suppress ASIC/SDK health event list missing name.",
         "eStrKey": "InvalidValue"
     }
 }
diff --git a/...sonic-yang-models/tests/yang_model_tests/tests_config/suppress_asic_sdk_health_event.json b/...sonic-yang-models/tests/yang_model_tests/tests_config/suppress_asic_sdk_health_event.json
@@ -31,7 +31,8 @@
                 "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST": [
                     {
                         "severity": "notice",
-                        "categories": ["software","firmware","cpu_hw","asic_hw"]
+                        "categories": ["software","firmware","cpu_hw","asic_hw"],
+                        "max_events": "100"
                     }
                 ]
             }
@@ -62,5 +63,31 @@
                 ]
             }
         }
+    },
+
+    "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST_NEGATIVE_MAX_EVENTS": {
+        "sonic-suppress-asic-sdk-health-event:sonic-suppress-asic-sdk-health-event": {
+            "sonic-suppress-asic-sdk-health-event:SUPPRESS_ASIC_SDK_HEALTH_EVENT": {
+                "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST": [
+                    {
+                        "severity": "notice",
+                        "max_events": "-1"
+                    }
+                ]
+            }
+        }
+    },
+
+    "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST_INVALID_MAX_EVENTS": {
+        "sonic-suppress-asic-sdk-health-event:sonic-suppress-asic-sdk-health-event": {
+            "sonic-suppress-asic-sdk-health-event:SUPPRESS_ASIC_SDK_HEALTH_EVENT": {
+                "SUPPRESS_ASIC_SDK_HEALTH_EVENT_LIST": [
+                    {
+                        "severity": "notice",
+                        "max_events": "NaN"
+                    }
+                ]
+            }
+        }
     }
 }
diff --git a/src/sonic-yang-models/yang-models/sonic-suppress-asic-sdk-health-event.yang b/src/sonic-yang-models/yang-models/sonic-suppress-asic-sdk-health-event.yang
@@ -39,6 +39,10 @@ module sonic-suppress-asic-sdk-health-event {
                     description "Severity of the ASIC/SDK health event to suppress";
                 }
 
+                leaf max_events {
+                    type uint32;
+                }
+
                 leaf-list categories {
                     type enumeration {
                         enum software;