Skip to content
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

Merged
merged 3 commits into from
Aug 22, 2023

Conversation

SuvarnaMeenakshi
Copy link
Contributor

@SuvarnaMeenakshi SuvarnaMeenakshi commented Jul 25, 2023

platform

Signed-off-by: Suvarna Meenakshi [email protected]
(cherry picked from commit 38cb1337201d5f2d9f9f1c3fa9f438d907e41be0)

Description of PR

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012
  • 202205

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?

  1. Modified to get interfaces with queue configuration from all namespaces.
  2. 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'
  1. Remove skip of supervisor node.
  2. 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.

./run_tests.sh -n vms-kvm-t0 -d vlab-01 -c snmp/test_snmp_queue.py  -f vtestbed.yaml -i ../ansible/veos_vtb -e "--skip_sanity --disable_loganalyzer" -u
=== Running tests in groups ===
Running: pytest snmp/test_snmp_queue.py --inventory ../ansible/veos_vtb --host-pattern vlab-01 --testbed vms-kvm-t0 --testbed_file vtestbed.yaml --log-cli-level warning --log-file-level debug --kube_master unset --showlocals --assert plain --show-capture no -rav --allow_recover --ignore=ptftests --ignore=acstests --ignore=saitests --ignore=scripts --ignore=k8s --ignore=sai_qualify --junit-xml=logs/tr.xml --log-file=logs/test.log --skip_sanity --disable_loganalyzer
/usr/local/lib/python2.7/dist-packages/ansible/parsing/vault/__init__.py:44: CryptographyDeprecationWarning: Python 2 is no longer supported by the Python core team. Support for it is now deprecated in cryptography, and will be removed in the next release.
  from cryptography.exceptions import InvalidSignature
===================================================================================================================== test session starts ======================================================================================================================
..                                                                                                                                                                                         

snmp/test_snmp_queue.py::test_snmp_queues[vlab-01] PASSED                                                                                                                                                                                                [100%]

---------------------------------------------------------------------------------------------------- generated xml file: /data/sonic-mgmt/tests/logs/tr.xml ----------------------------------------------------------------------------------------------------
================================================================================================================== 1 passed in 18.02 seconds ===================================================================================================================
INFO:root:Can not get Allure report URL. Please check logs

Verified on packet and voq chassis.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

platform

Signed-off-by: Suvarna Meenakshi <[email protected]>
(cherry picked from commit 38cb1337201d5f2d9f9f1c3fa9f438d907e41be0)
abdosi
abdosi previously approved these changes Aug 2, 2023
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 "")
Copy link
Contributor

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?

def run_sonic_db_cli_cmd(self, sonic_db_cmd):

Copy link
Contributor Author

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]>
qiluo-msft
qiluo-msft previously approved these changes Aug 9, 2023
Signed-off-by: Suvarna Meenakshi <[email protected]>
@SuvarnaMeenakshi
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@SuvarnaMeenakshi
Copy link
Contributor Author

@qiluo-msft can re-review, after the previous approval, made a fix in the log message.

@mssonicbld
Copy link
Collaborator

@SuvarnaMeenakshi PR conflicts with 202205 branch

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Aug 28, 2023
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.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #9663

mssonicbld pushed a commit that referenced this pull request Aug 28, 2023
#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.
SuvarnaMeenakshi added a commit to SuvarnaMeenakshi/sonic-mgmt that referenced this pull request Sep 14, 2023
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)
wangxin pushed a commit that referenced this pull request Sep 15, 2023
#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)
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Jan 25, 2024
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants