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: T6035: QoS policy shaper queue-type random-detect requires limit avpkt (backport #3297) #3305

Merged
merged 1 commit into from
Apr 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 13, 2024

Added params for configuration red on the shaper policy

Change Summary

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

Proposed changes

How to test

example from task:

set qos policy shaper QOS bandwidth 100mbit
set qos policy shaper QOS default bandwidth 100%
set qos policy shaper QOS default burst 10
set qos policy shaper QOS default queue-type random-detect
set qos interface eth1 egress QOS

example with additional params and non default policy:

set qos interface eth0 egress qos-shaper-eth0
set qos policy shaper qos-shaper-eth0 bandwidth 100mbit
set qos policy shaper qos-shaper-eth0 default bandwidth 100%
set qos policy shaper qos-shaper-eth0 default burst 100
set qos policy shaper qos-shaper-eth0 default queue-type random-detect
set qos policy shaper qos-shaper-eth0 class 2 bandwidth 50mbit
set qos policy shaper qos-shaper-eth0 class 2 match 10 ip destination address 192.0.2.8/32
set qos policy shaper qos-shaper-eth0 class 2 queue-type random-detect
set qos policy shaper qos-shaper-eth0 default queue-limit 1024
set qos policy shaper qos-shaper-eth0 default average-packet 1024
set qos policy shaper qos-shaper-eth0 default maximum-threshold 32
set qos policy shaper qos-shaper-eth0 default minimum-threshold 16
set qos policy shaper qos-shaper-eth0 class 2 queue-limit 1024
set qos policy shaper qos-shaper-eth0 class 2 average-packet 512
set qos policy shaper qos-shaper-eth0 class 2 maximum-threshold 32
set qos policy shaper qos-shaper-eth0 class 2 minimum-threshold 16
set qos policy shaper qos-shaper-eth0 class 2 mark-probability 20

Smoketest result

vyos@vyos:~$ python3 /usr/libexec/vyos/tests/smoke/cli/test_qos.py 
test_01_cake (__main__.TestQoS.test_01_cake) ... ok
test_02_drop_tail (__main__.TestQoS.test_02_drop_tail) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_03_fair_queue (__main__.TestQoS.test_03_fair_queue) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_04_fq_codel (__main__.TestQoS.test_04_fq_codel) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_05_limiter (__main__.TestQoS.test_05_limiter) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_06_network_emulator (__main__.TestQoS.test_06_network_emulator) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_07_priority_queue (__main__.TestQoS.test_07_priority_queue) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_08_random_detect (__main__.TestQoS.test_08_random_detect) ... skipped 'tc returns invalid JSON here - needs iproute2 fix'
test_09_rate_control (__main__.TestQoS.test_09_rate_control) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_10_round_robin (__main__.TestQoS.test_10_round_robin) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_11_shaper (__main__.TestQoS.test_11_shaper) ... ok
test_12_shaper_with_red_queue (__main__.TestQoS.test_12_shaper_with_red_queue) ... ok

----------------------------------------------------------------------
Ran 12 tests in 37.756s

OK (skipped=1)

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

This is an automatic backport of pull request #3297 done by [Mergify](https://mergify.com).

… avpkt

Added params for configuration red on the shaper policy

(cherry picked from commit 31cd75a)
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Apr 13, 2024
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team April 13, 2024 11:11
@c-po c-po merged commit 8034e76 into sagitta Apr 13, 2024
5 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-3297 branch April 13, 2024 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sagitta VyOS 1.4 LTS
Development

Successfully merging this pull request may close these issues.

3 participants