Add tests for headroom pool wm

Signed-off-by: Neetha John <[email protected]>
sonic-net · Nov 17, 2020 · 250673a · 250673a
1 parent a6e7c96
commit 250673a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/tests/mock_tables/counters_db.json b/tests/mock_tables/counters_db.json
@@ -990,7 +990,8 @@
         "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "2000"
     },
     "USER_WATERMARKS:oid:0x18000000000b66": {
-        "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "3000"
+        "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "3000",
+        "SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES": "432640"
     },
     "PERSISTENT_WATERMARKS:oid:0x18000000000b64": {
         "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "2000"
@@ -999,7 +1000,8 @@
         "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "3000"
     },
     "PERSISTENT_WATERMARKS:oid:0x18000000000b66": {
-        "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "4000"
+        "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "4000",
+        "SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES": "863616"
     },
     "CRM:ACL_STATS:INGRESS:VLAN":{
         "crm_stats_acl_table_used":"0",

diff --git a/tests/watermarkstat_test.py b/tests/watermarkstat_test.py
@@ -36,6 +36,9 @@ def test_show_queue_multicast_wm(self):
     def test_show_buffer_pool_wm(self):
         self.executor(testData['show_buffer_pool_wm'])
 
+    def test_show_headroom_pool_wm(self):
+        self.executor(testData['show_hdrm_pool_wm'])
+
     def test_show_pg_shared_peristent_wm(self):
         self.executor(testData['show_pg_pwm_shared'])
 
@@ -51,6 +54,9 @@ def test_show_queue_multicast_persistent_wm(self):
     def test_show_buffer_pool_persistent_wm(self):
         self.executor(testData['show_buffer_pool_pwm'])
 
+    def test_show_headroom_pool_persistent_wm(self):
+        self.executor(testData['show_hdrm_pool_pwm'])
+
     def executor(self, testcase):
         runner = CliRunner()
 

diff --git a/tests/wm_input/wm_test_vectors.py b/tests/wm_input/wm_test_vectors.py
@@ -79,6 +79,20 @@
 ingress_lossless_pool     4000
 """
 
+show_hdrm_pool_wm_output="""\
+Headroom pool maximum occupancy:
+                 Pool    Bytes
+---------------------  -------
+ingress_lossless_pool   432640
+"""
+
+show_hdrm_pool_persistent_wm_output="""\
+Headroom pool maximum occupancy:
+                 Pool    Bytes
+---------------------  -------
+ingress_lossless_pool   863616
+"""
+
 testData = {
              'show_pg_wm_shared' :  [ {'cmd' : ['priority-group', 'watermark', 'shared'],
                                        'rc_output': show_pg_wm_shared_output
@@ -119,5 +133,13 @@
              'show_buffer_pool_pwm' :  [ {'cmd' : ['buffer_pool', 'persistent-watermark'],
                                           'rc_output': show_buffer_pool_persistent_wm_output
                                          }
-                                       ]
+                                       ],
+             'show_hdrm_pool_wm' :  [ {'cmd' : ['headroom-pool', 'watermark'],
+                                       'rc_output': show_hdrm_pool_wm_output
+                                      }
+                                    ],
+             'show_hdrm_pool_pwm' :  [ {'cmd' : ['headroom-pool', 'persistent-watermark'],
+                                        'rc_output': show_hdrm_pool_persistent_wm_output
+                                       }
+                                     ]
            }