Fix the switch level Voq counter to use switch_id Oid instead of counter name for PACKET_INTEGRITY counter (#3769)

What I did
Changed the switch level Voq counter to use switch_id Oid instead of counter name for PACKET_INTEGRITY counter

How I did it
Changed the orchagent to use switch level Voq counter to use Switch_id Oid instead of counter name for PACKET_INTEGRITY counter. So updated the corresponding changes in sonic-utilities.

How to verify it
Verified with show drop count and mock test

Signed-off-by: saksarav <[email protected]>

Author: saksarav-nokia

scripts/dropstat

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
 
 #####################################################################
 #
@@ -51,7 +51,7 @@ DEBUG_COUNTER_PORT_STAT_MAP = 'COUNTERS_DEBUG_NAME_PORT_STAT_MAP'
 DEBUG_COUNTER_SWITCH_STAT_MAP = 'COUNTERS_DEBUG_NAME_SWITCH_STAT_MAP'
 COUNTERS_PORT_NAME_MAP = 'COUNTERS_PORT_NAME_MAP'
 COUNTER_TABLE_PREFIX = 'COUNTERS:'
-SWITCH_LEVEL_COUNTER_PREFIX = 'SWITCH_STD_DROP_COUNTER-'
+SWITCH_LEVEL_COUNTER_PREFIX = 'SWITCH_ID'
 
 # ASIC_DB Tables
 ASIC_SWITCH_INFO_PREFIX = 'ASIC_STATE:SAI_OBJECT_TYPE_SWITCH:'
@@ -89,6 +89,7 @@ std_port_headers_map = {
 std_switch_description_header = ['DEVICE']
 
 std_switch_dflt_drop_headers= [ 'SWITCH-ID']
+std_switch_drop_counters = ['SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP']
 std_switch_drop_headers_map = {
     'SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP':    'PKT_INTEGRITY_ERR'
 }
@@ -198,9 +199,9 @@ class DropStat(object):
         counters = self.get_configured_counters(DEBUG_COUNTER_SWITCH_STAT_MAP, True)
         if not counters:
             return
-        switch_id = self.get_switch_id()
-        switch_std_stats = self.get_counts(counters, switch_id)
 
+        switch_id = self.get_switch_id()
+        switch_std_stats = self.get_counts(std_switch_drop_counters, switch_id)
         if not switch_std_stats:
             return
 
@@ -211,10 +212,9 @@ class DropStat(object):
            row = [cfg_switch_id]
 
         headers = std_switch_dflt_drop_headers
-        for cntr in counters:
-            if cntr in std_switch_drop_headers_map:
-               row.append(switch_std_stats.get(cntr, 0) - switch_std_drop_ckpt.get(cntr, 0))
-               headers.append(std_switch_drop_headers_map[cntr])
+        for cntr in std_switch_drop_counters:
+             row.append(switch_std_stats.get(cntr, 0) - switch_std_drop_ckpt.get(cntr, 0))
+             headers.append(std_switch_drop_headers_map[cntr])
         if row:
             print(tabulate([row], headers, tablefmt='simple', stralign='right'))
             print('')

tests/mock_tables/counters_db.json

@@ -2145,7 +2145,7 @@
     "COUNTERS_DEBUG_NAME_SWITCH_STAT_MAP": {
         "DEBUG_1": "SAI_SWITCH_STAT_OUT_DROP_REASON_RANGE_BASE",
         "lowercase_counter": "SAI_SWITCH_STAT_OUT_CONFIGURED_DROP_REASONS_1_DROPPED_PKTS",
-        "SWITCH_STD_DROP_COUNTER-SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP": "SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP"
+        "SWITCH_ID": "0x21000000000000"
     },
     "COUNTERS:oid:0x1500000000035a": {
         "PFC_WD_ACTION": "drop",