T5307: QoS - traffic-class-map services #3492
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HollyGurza
requested review from
dmbaturin,
sarthurdev,
zdc,
jestabro,
sever-sever and
c-po
|
What happens if you use both (old/new) syntaxes that overlap? |
All matches from No matter whether use both or only one syntax, validating and applying matches will work the same as if they were created through the old syntax |
|
Conflicting files |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
fett0
approved these changes
May 27, 2024
There was a problem hiding this comment.
I've tested it in my lab ,it seems to be correct . we can add multiple `match-group' and combine them with the old syntax , here there is an example adding a new match-group :
set qos policy shaper VyOS-HTB class 10 bandwidth '30%'
set qos policy shaper VyOS-HTB class 10 description 'dscp_EF_ipprec_5_GETS'
set qos policy shaper VyOS-HTB class 10 match CS4 ip dscp 'CS4'
set qos policy shaper VyOS-HTB class 10 match-group 'Streaming-Video'
set qos policy shaper VyOS-HTB class 10 priority '1'
set qos policy shaper VyOS-HTB class 10 queue-type 'fair-queue'
set qos policy shaper VyOS-HTB class 20 bandwidth '30%'
set qos policy shaper VyOS-HTB class 20 description 'dscp_AF4x_ipprec_4'
set qos policy shaper VyOS-HTB class 20 match ef ip dscp 'EF'
set qos policy shaper VyOS-HTB class 20 priority '2'
set qos policy shaper VyOS-HTB class 20 queue-type 'fair-queue'
set qos policy shaper VyOS-HTB class 30 bandwidth '10%'
set qos policy shaper VyOS-HTB class 30 description 'MC'
set qos policy shaper VyOS-HTB class 30 match-group 'Mission-Critical'
set qos policy shaper VyOS-HTB class 30 priority '3'
set qos policy shaper VyOS-HTB class 30 queue-type 'fair-queue'
set qos policy shaper VyOS-HTB default bandwidth '20%'
set qos policy shaper VyOS-HTB default queue-type 'fq-codel'
set qos traffic-match-group Mission-Critical match AF31 ip dscp 'AF31'
set qos traffic-match-group Mission-Critical match AF32 ip dscp 'AF42'
set qos traffic-match-group Mission-Critical match CS3 ip dscp 'CS3'
set qos traffic-match-group Streaming-Video match AF11 ip dscp 'AF11'
set qos traffic-match-group Streaming-Video match AF41 ip dscp 'AF41'
set qos traffic-match-group Streaming-Video match AF43 ip dscp 'AF43'
they are applied on tc-filter when we check it :
vyos@vyos# sudo tc filter show dev eth0
filter parent 1: protocol all pref 1 u32 chain 0
filter parent 1: protocol all pref 1 u32 chain 0 fh 800: ht divisor 1
filter parent 1: protocol all pref 1 u32 chain 0 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:a not_in_hw
match 00800000/00ff0000 at 0
filter parent 1: protocol all pref 1 u32 chain 0 fh 800::801 order 2049 key ht 800 bkt 0 flowid 1:a not_in_hw
match 00280000/00ff0000 at 0
filter parent 1: protocol all pref 1 u32 chain 0 fh 800::802 order 2050 key ht 800 bkt 0 flowid 1:a not_in_hw
match 00880000/00ff0000 at 0
filter parent 1: protocol all pref 1 u32 chain 0 fh 800::803 order 2051 key ht 800 bkt 0 flowid 1:a not_in_hw
match 00980000/00ff0000 at 0
filter parent 1: protocol all pref 1 u32 chain 0 fh 800::804 order 2052 key ht 800 bkt 0 flowid 1:a not_in_hw
match 00980000/00ff0000 at 0
action order 1: police 0x1 rate 300Mbit burst 15300b mtu 2Kb action reclassify overhead 0b
ref 1 bind 1
filter parent 1: protocol all pref 2 u32 chain 0
filter parent 1: protocol all pref 2 u32 chain 0 fh 801: ht divisor 1
filter parent 1: protocol all pref 2 u32 chain 0 fh 801::800 order 2048 key ht 801 bkt 0 flowid 1:14 not_in_hw
match 00b80000/00ff0000 at 0
filter parent 1: protocol all pref 2 u32 chain 0 fh 801::801 order 2049 key ht 801 bkt 0 flowid 1:14 not_in_hw
match 00b80000/00ff0000 at 0
action order 1: police 0x2 rate 300Mbit burst 15300b mtu 2Kb action reclassify overhead 0b
ref 1 bind 1
filter parent 1: protocol all pref 3 u32 chain 0
filter parent 1: protocol all pref 3 u32 chain 0 fh 802: ht divisor 1
filter parent 1: protocol all pref 3 u32 chain 0 fh 802::800 order 2048 key ht 802 bkt 0 flowid 1:1e not_in_hw
match 00680000/00ff0000 at 0
filter parent 1: protocol all pref 3 u32 chain 0 fh 802::801 order 2049 key ht 802 bkt 0 flowid 1:1e not_in_hw
match 00900000/00ff0000 at 0
filter parent 1: protocol all pref 3 u32 chain 0 fh 802::802 order 2050 key ht 802 bkt 0 flowid 1:1e not_in_hw
match 00600000/00ff0000 at 0
filter parent 1: protocol all pref 3 u32 chain 0 fh 802::803 order 2051 key ht 802 bkt 0 flowid 1:1e not_in_hw
match 00600000/00ff0000 at 0
action order 1: police 0x3 rate 100Mbit burst 15337b mtu 2Kb action reclassify overhead 0b
ref 1 bind 1
I would like to suggest to merge it only 1.5, so, users can feel comfortable with this new structure and wait for proper documentation.
sever-sever
reviewed
May 27, 2024
interface-definitions/qos.xml.in
Outdated
| <constraint> | ||
| <regex>[^-].*</regex> | ||
| </constraint> | ||
| <constraintErrorMessage>Match group name cannot start with hyphen (-)</constraintErrorMessage> |
sever-sever
reviewed
May 27, 2024
interface-definitions/qos.xml.in
Outdated
| <constraint> | ||
| <regex>[^-].*</regex> | ||
| </constraint> | ||
| <constraintErrorMessage>Match queue name cannot start with hyphen (-)</constraintErrorMessage> |
There was a problem hiding this comment.
I got this message from original match node and just keep it structure
added new syntax to work with class match filters in QoS policy
sever-sever
approved these changes
May 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
added new syntax to work with class match filters in QoS policy
Change Summary
Types of changes
Related Task(s)
Related PR(s)
Component(s) name
QoS
Proposed changes
Implemented the ability to create named match group and use this in QoS policy classes
Old match syntax is kept and tc filters from the
matchnode are created first then tc filters from thematch-groupnodenew syntax to work with group:
Every policy class or traffic match group can contain several groups
Every group can contain several matches
Match in the group configured the same as match in the class excluded nodes
etherinterfaceHow to test
Create policy using old syntax:
delete existing policy
create same policy using new syntax
compare tc filters after old and new syntax
new:
old:
Smoketest result
Checklist: