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

[qos] Headroom pool watermark test #2614

Merged
merged 4 commits into from
Jan 9, 2021

Conversation

neethajohn
Copy link
Contributor

@neethajohn neethajohn commented Dec 2, 2020

Description of PR

Depends on sonic-net/sonic-swss#1453

Type of change

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

Approach

What is the motivation for this PR?

Add tests for the headroom pool watermark feature

How did you verify/test it?

Ran the test on Th2 on an image with the headroom pool wm feature changes and it passed

================================================================================== test session starts ===================================================================================
platform linux2 -- Python 2.7.12, pytest-4.6.9, py-1.8.1, pluggy-0.13.1 -- /usr/bin/python
cachedir: .pytest_cache
ansible: 2.8.7
rootdir: /var/nejo/Networking-acs-sonic-mgmt
plugins: ansible-2.2.2
collected 904 items / 903 deselected / 1 selected                                                                                                                                        

qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolWatermark PASSED                                                                                                            [100%]

Copy link
Collaborator

@yxieca yxieca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add another PR to change asserts to pytest_asserts?

neethajohn added a commit to sonic-net/sonic-swss that referenced this pull request Dec 9, 2020
What I did
Added 'SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES' in the interested counters to be queried
Updated the the buffer lua script to update the headroom pool watermark counters
Updated watermark orch to act on headroom pool clear request

Why I did it
To expose the headroom pool watermark counters in SONiC

How I verified it
On platforms with headroom pool support, verified that headroom pool watermark counters are getting updated as expected
On platforms without headroom pool support, headroom pool watermark counters show as N/A
New sonic mgmt test added and it passed. sonic-net/sonic-mgmt#2614

Signed-off-by: Neetha John <nejo@microsoft.com>
arlakshm pushed a commit to arlakshm/sonic-swss that referenced this pull request Dec 15, 2020
What I did
Added 'SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES' in the interested counters to be queried
Updated the the buffer lua script to update the headroom pool watermark counters
Updated watermark orch to act on headroom pool clear request

Why I did it
To expose the headroom pool watermark counters in SONiC

How I verified it
On platforms with headroom pool support, verified that headroom pool watermark counters are getting updated as expected
On platforms without headroom pool support, headroom pool watermark counters show as N/A
New sonic mgmt test added and it passed. sonic-net/sonic-mgmt#2614

Signed-off-by: Neetha John <nejo@microsoft.com>
Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
neethajohn added a commit to sonic-net/sonic-swss that referenced this pull request Dec 23, 2020
Signed-off-by: Neetha John <nejo@microsoft.com>

Includes all the changes in #1453 along with fix for error msgs seen in syslog - Got invalid response type from redis 5
The error msg was due to incorrect return type in lua script.

What I did
Added 'SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES' in the interested counters to be queried
Updated the the buffer lua script to update the headroom pool watermark counters
Updated watermark orch to act on headroom pool clear request

Why I did it
To expose the headroom pool watermark counters in SONiC

How I verified it
On platforms with headroom pool support, verified that headroom pool watermark counters are getting updated as expected

admin@sonic:~$ show headroom-pool persistent-watermark 
Headroom pool maximum occupancy:
                 Pool    Bytes
---------------------  -------
ingress_lossless_pool   863616
On platforms without headroom pool support, headroom pool watermark counters show as N/A

admin@sonic:~$ show headroom-pool persistent-watermark 
Headroom pool maximum occupancy:
                 Pool    Bytes
---------------------  -------
ingress_lossless_pool      N/A
New sonic mgmt test added and it passed. sonic-net/sonic-mgmt#2614

Verified the error msg seen in syslog by enabling buffer pool watermark on vs docker. With the fix, build a new vs docker and verified that the msgs are no longer seen when buffer pool watermark is enabled.
Signed-off-by: Neetha John <nejo@microsoft.com>
Signed-off-by: Neetha John <nejo@microsoft.com>
Signed-off-by: Neetha John <nejo@microsoft.com>
Signed-off-by: Neetha John <nejo@microsoft.com>
@neethajohn
Copy link
Contributor Author

retest vs please

@neethajohn
Copy link
Contributor Author

retest this please

@neethajohn
Copy link
Contributor Author

retest vsimage please

@neethajohn neethajohn merged commit d504bfe into sonic-net:master Jan 9, 2021
@neethajohn neethajohn deleted the hdrm_pool_wm branch January 9, 2021 01:05
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.

2 participants