Skip to content

Commit 63d2f5a

Browse files
[snmp][multi-asic]: Fix test_snmp_queue to support multi-asic
platform Signed-off-by: Suvarna Meenakshi <[email protected]> (cherry picked from commit 38cb1337201d5f2d9f9f1c3fa9f438d907e41be0)
1 parent 67c28eb commit 63d2f5a

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

tests/snmp/test_snmp_queue.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import pytest
22
from tests.common.helpers.snmp_helpers import get_snmp_facts
3-
from tests.common.helpers.sonic_db import redis_get_keys
43

54
pytestmark = [
65
pytest.mark.topology('any'),
@@ -11,14 +10,20 @@
1110
def test_snmp_queues(duthosts, enum_rand_one_per_hwsku_hostname, localhost, creds_all_duts,
1211
collect_techsupport_all_duts):
1312
duthost = duthosts[enum_rand_one_per_hwsku_hostname]
14-
if duthost.is_supervisor_node():
15-
pytest.skip("interfaces not present on supervisor node")
13+
q_keys = []
14+
1615
hostip = duthost.host.options['inventory_manager'].get_host(
1716
duthost.hostname).vars['ansible_host']
1817

19-
q_keys = redis_get_keys(duthost, "CONFIG_DB", "QUEUE|*")
18+
for asic_id in duthost.get_asic_ids():
19+
namespace = duthost.get_namespace_from_asic_id(asic_id)
20+
sonic_db_cmd = "sonic-db-cli {}".format("-n " + namespace if namespace else "")
21+
q_keys_ns = duthost.shell('{} CONFIG_DB KEYS "QUEUE|*"'.format(sonic_db_cmd),
22+
module_ignore_errors=False)['stdout_lines']
23+
if q_keys_ns:
24+
q_keys.extend(q_keys_ns)
2025

21-
if q_keys is None:
26+
if not q_keys:
2227
pytest.skip("No queues configured on interfaces")
2328

2429
q_interfaces = set()

0 commit comments

Comments
 (0)