-
Notifications
You must be signed in to change notification settings - Fork 730
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[snmp][multi-asic]: Fix test_snmp_queue to support multi-asic platform #9115
Conversation
platform Signed-off-by: Suvarna Meenakshi <[email protected]> (cherry picked from commit 38cb1337201d5f2d9f9f1c3fa9f438d907e41be0)
tests/snmp/test_snmp_queue.py
Outdated
q_keys = redis_get_keys(duthost, "CONFIG_DB", "QUEUE|*") | ||
for asic_id in duthost.get_asic_ids(): | ||
namespace = duthost.get_namespace_from_asic_id(asic_id) | ||
sonic_db_cmd = "sonic-db-cli {}".format("-n " + namespace if namespace else "") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SonicAsic
class already function to run sonic-db-cli on a given asic. Use it directly?
sonic-mgmt/tests/common/devices/sonic_asic.py
Line 156 in 21784ae
def run_sonic_db_cli_cmd(self, sonic_db_cmd): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Modified as per comment
Modify test case to check for interface name in snmp_interfaces result. Signed-off-by: Suvarna Meenakshi <[email protected]>
Signed-off-by: Suvarna Meenakshi <[email protected]>
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
@qiluo-msft can re-review, after the previous approval, made a fix in the log message. |
@SuvarnaMeenakshi PR conflicts with 202205 branch |
sonic-net#9115) What is the motivation for this PR? test_snmp_queue was modified to get keys "QUEUE|*" from config_db in sonic-net#6744. This has to be modified to get keys from all namespace config_db on mulit-asic platform. Currently, test tries to retrieve from host config_db and skips the test for multi-asic platform. Test is currently skipped for supervisor node, but should not be skipped for supervisor node of packet chassis. How did you do it? Modified to get interfaces with queue configuration from all namespaces. The test case was not checking the right field in snmp_interfaces SNMP result. Test case was checking for "description" of each interface, from description, interface name was extracted and checked if the interface name is present in QUEUE table. This check will always be false and pytest fail condition was never hit. The test case was always incorrectly passing. (Pdb) snmp_facts['snmp_interfaces']['117']['description'] u'ARISTA02T1:Ethernet1' for k, v in list(snmp_facts['snmp_interfaces'].items()): if "Ethernet" in v['description']: intf = v['description'].split(':') # 'ARISTA*:Ethernet*' if len(intf) == 2: if intf[1] in q_interfaces and 'queues' not in v: -- intf[1] in q_interfaces will always be false pytest.fail( "port %s does not have queue counters" % v['name']) -- will never hit this condition intf[1] will always be Ethernet1 which is the interface of the neighbor Modified test to use 'name' which gives the interface alias instead of interface name present in 'description' (Pdb) snmp_facts['snmp_interfaces']['117']['name'] u'fortyGigE0/116' Remove skip of supervisor node. On voq chassis LC, QUEUE configuration will include hostname and asic namespace as queue configuration is created on system port. Test is modified to get the interface name for voq chassis. "QUEUE": { "<hostname>|asic0|Ethernet0|0": { "scheduler": "scheduler.0" }, How did you verify/test it? Verified on single asic VS testbed.
Cherry-pick PR to 202305: #9663 |
#9115) What is the motivation for this PR? test_snmp_queue was modified to get keys "QUEUE|*" from config_db in #6744. This has to be modified to get keys from all namespace config_db on mulit-asic platform. Currently, test tries to retrieve from host config_db and skips the test for multi-asic platform. Test is currently skipped for supervisor node, but should not be skipped for supervisor node of packet chassis. How did you do it? Modified to get interfaces with queue configuration from all namespaces. The test case was not checking the right field in snmp_interfaces SNMP result. Test case was checking for "description" of each interface, from description, interface name was extracted and checked if the interface name is present in QUEUE table. This check will always be false and pytest fail condition was never hit. The test case was always incorrectly passing. (Pdb) snmp_facts['snmp_interfaces']['117']['description'] u'ARISTA02T1:Ethernet1' for k, v in list(snmp_facts['snmp_interfaces'].items()): if "Ethernet" in v['description']: intf = v['description'].split(':') # 'ARISTA*:Ethernet*' if len(intf) == 2: if intf[1] in q_interfaces and 'queues' not in v: -- intf[1] in q_interfaces will always be false pytest.fail( "port %s does not have queue counters" % v['name']) -- will never hit this condition intf[1] will always be Ethernet1 which is the interface of the neighbor Modified test to use 'name' which gives the interface alias instead of interface name present in 'description' (Pdb) snmp_facts['snmp_interfaces']['117']['name'] u'fortyGigE0/116' Remove skip of supervisor node. On voq chassis LC, QUEUE configuration will include hostname and asic namespace as queue configuration is created on system port. Test is modified to get the interface name for voq chassis. "QUEUE": { "<hostname>|asic0|Ethernet0|0": { "scheduler": "scheduler.0" }, How did you verify/test it? Verified on single asic VS testbed.
sonic-net#9115) What is the motivation for this PR? test_snmp_queue was modified to get keys "QUEUE|*" from config_db in sonic-net#6744. This has to be modified to get keys from all namespace config_db on mulit-asic platform. Currently, test tries to retrieve from host config_db and skips the test for multi-asic platform. Test is currently skipped for supervisor node, but should not be skipped for supervisor node of packet chassis. How did you do it? Modified to get interfaces with queue configuration from all namespaces. The test case was not checking the right field in snmp_interfaces SNMP result. Test case was checking for "description" of each interface, from description, interface name was extracted and checked if the interface name is present in QUEUE table. This check will always be false and pytest fail condition was never hit. The test case was always incorrectly passing. (Pdb) snmp_facts['snmp_interfaces']['117']['description'] u'ARISTA02T1:Ethernet1' for k, v in list(snmp_facts['snmp_interfaces'].items()): if "Ethernet" in v['description']: intf = v['description'].split(':') # 'ARISTA*:Ethernet*' if len(intf) == 2: if intf[1] in q_interfaces and 'queues' not in v: -- intf[1] in q_interfaces will always be false pytest.fail( "port %s does not have queue counters" % v['name']) -- will never hit this condition intf[1] will always be Ethernet1 which is the interface of the neighbor Modified test to use 'name' which gives the interface alias instead of interface name present in 'description' (Pdb) snmp_facts['snmp_interfaces']['117']['name'] u'fortyGigE0/116' Remove skip of supervisor node. On voq chassis LC, QUEUE configuration will include hostname and asic namespace as queue configuration is created on system port. Test is modified to get the interface name for voq chassis. "QUEUE": { "<hostname>|asic0|Ethernet0|0": { "scheduler": "scheduler.0" }, How did you verify/test it? Verified on single asic VS testbed. (cherry picked from commit 8123ab7)
#9115) (#9973) Cherry-pick of #9115 What is the motivation for this PR? test_snmp_queue was modified to get keys "QUEUE|*" from config_db in #6744. This has to be modified to get keys from all namespace config_db on mulit-asic platform. Currently, test tries to retrieve from host config_db and skips the test for multi-asic platform. Test is currently skipped for supervisor node, but should not be skipped for supervisor node of packet chassis. How did you do it? Modified to get interfaces with queue configuration from all namespaces. The test case was not checking the right field in snmp_interfaces SNMP result. Test case was checking for "description" of each interface, from description, interface name was extracted and checked if the interface name is present in QUEUE table. This check will always be false and pytest fail condition was never hit. The test case was always incorrectly passing. (Pdb) snmp_facts['snmp_interfaces']['117']['description'] u'ARISTA02T1:Ethernet1' for k, v in list(snmp_facts['snmp_interfaces'].items()): if "Ethernet" in v['description']: intf = v['description'].split(':') # 'ARISTA*:Ethernet*' if len(intf) == 2: if intf[1] in q_interfaces and 'queues' not in v: -- intf[1] in q_interfaces will always be false pytest.fail( "port %s does not have queue counters" % v['name']) -- will never hit this condition intf[1] will always be Ethernet1 which is the interface of the neighbor Modified test to use 'name' which gives the interface alias instead of interface name present in 'description' (Pdb) snmp_facts['snmp_interfaces']['117']['name'] u'fortyGigE0/116' Remove skip of supervisor node. On voq chassis LC, QUEUE configuration will include hostname and asic namespace as queue configuration is created on system port. Test is modified to get the interface name for voq chassis. "QUEUE": { "<hostname>|asic0|Ethernet0|0": { "scheduler": "scheduler.0" }, How did you verify/test it? Verified on single asic VS testbed. (cherry picked from commit 8123ab7)
sonic-net#9115) What is the motivation for this PR? test_snmp_queue was modified to get keys "QUEUE|*" from config_db in sonic-net#6744. This has to be modified to get keys from all namespace config_db on mulit-asic platform. Currently, test tries to retrieve from host config_db and skips the test for multi-asic platform. Test is currently skipped for supervisor node, but should not be skipped for supervisor node of packet chassis. How did you do it? Modified to get interfaces with queue configuration from all namespaces. The test case was not checking the right field in snmp_interfaces SNMP result. Test case was checking for "description" of each interface, from description, interface name was extracted and checked if the interface name is present in QUEUE table. This check will always be false and pytest fail condition was never hit. The test case was always incorrectly passing. (Pdb) snmp_facts['snmp_interfaces']['117']['description'] u'ARISTA02T1:Ethernet1' for k, v in list(snmp_facts['snmp_interfaces'].items()): if "Ethernet" in v['description']: intf = v['description'].split(':') # 'ARISTA*:Ethernet*' if len(intf) == 2: if intf[1] in q_interfaces and 'queues' not in v: -- intf[1] in q_interfaces will always be false pytest.fail( "port %s does not have queue counters" % v['name']) -- will never hit this condition intf[1] will always be Ethernet1 which is the interface of the neighbor Modified test to use 'name' which gives the interface alias instead of interface name present in 'description' (Pdb) snmp_facts['snmp_interfaces']['117']['name'] u'fortyGigE0/116' Remove skip of supervisor node. On voq chassis LC, QUEUE configuration will include hostname and asic namespace as queue configuration is created on system port. Test is modified to get the interface name for voq chassis. "QUEUE": { "<hostname>|asic0|Ethernet0|0": { "scheduler": "scheduler.0" }, How did you verify/test it? Verified on single asic VS testbed.
platform
Signed-off-by: Suvarna Meenakshi [email protected]
(cherry picked from commit 38cb1337201d5f2d9f9f1c3fa9f438d907e41be0)
Description of PR
Summary:
Fixes # (issue)
Type of change
Back port request
Approach
What is the motivation for this PR?
test_snmp_queue was modified to get keys "QUEUE|*" from config_db in #6744.
This has to be modified to get keys from all namespace config_db on mulit-asic platform.
Currently, test tries to retrieve from host config_db and skips the test for multi-asic platform.
Test is currently skipped for supervisor node, but should not be skipped for supervisor node of packet chassis.
How did you do it?
This check will always be false and pytest fail condition was never hit. The test case was always incorrectly passing.
Modified test to use 'name' which gives the interface alias instead of interface name present in 'description'
How did you verify/test it?
Verified on single asic VS testbed.
Verified on packet and voq chassis.
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation