2727 sys .path .insert (0 , modules_path )
2828 sys .path .insert (0 , tests_path )
2929 import mock_tables .dbconnector # lgtm [py/unused-import]
30+
31+ if os .environ ["UTILITIES_UNIT_TESTING_IS_SUP" ] == "1" :
32+ import mock
33+ device_info .is_supervisor = mock .MagicMock (return_value = True )
34+
3035 if os .environ ["UTILITIES_UNIT_TESTING_TOPOLOGY" ] == "multi_asic" :
3136 import mock_tables .mock_multi_asic
3237 mock_tables .dbconnector .load_namespace_config ()
@@ -231,9 +236,10 @@ class Queuestat(object):
231236 self .voq_stats = {}
232237
233238 for ip in redis_ips :
234- asic_counters_db = Redis (host = ip , db = swsscommon .COUNTERS_DB , decode_responses = True )
239+ asic_counters_db = SonicV2Connector ()
240+ asic_counters_db .connect_host (db_name = asic_counters_db .COUNTERS_DB , host = ip )
235241 try :
236- counters_voq_name_map = asic_counters_db .hgetall ( COUNTERS_VOQ_NAME_MAP )
242+ counters_voq_name_map = asic_counters_db .get_all ( asic_counters_db . COUNTERS_DB , COUNTERS_VOQ_NAME_MAP )
237243 if counters_voq_name_map is None :
238244 continue
239245 for voq in counters_voq_name_map :
@@ -242,7 +248,7 @@ class Queuestat(object):
242248 for counter_name in counter_bucket_dict :
243249 self .voq_stats .setdefault (sysPort , {}).setdefault (idx , {}).setdefault (counter_name , 0 )
244250 oid = counters_voq_name_map [voq ]
245- counter_data = asic_counters_db .hget ( "COUNTERS:" + oid , counter_name )
251+ counter_data = asic_counters_db .get ( asic_counters_db . COUNTERS_DB , "COUNTERS:" + oid , counter_name )
246252 if counter_data is not None :
247253 self .voq_stats [sysPort ][idx ][counter_name ] += int (counter_data )
248254
@@ -474,7 +480,7 @@ class Queuestat(object):
474480 cache_ns = '-' + self .namespace + '-'
475481 cnstat_fqn_file_name = cnstat_fqn_file + cache_ns + port
476482
477-
483+
478484 json_output = {}
479485 json_output [port ] = {}
480486 if os .path .isfile (cnstat_fqn_file_name ):
0 commit comments