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: Fixed duplicated sequence# in scheduler policy #1100

Merged
merged 7 commits into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(1),
sequence: uint32(6),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -873,7 +873,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(1),
sequence: uint32(5),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE0",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -882,7 +882,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(1),
sequence: uint32(4),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -891,7 +891,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(1),
sequence: uint32(3),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF2",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -900,7 +900,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(1),
sequence: uint32(2),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -909,7 +909,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(0),
sequence: uint32(1),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(1),
sequence: uint32(6),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1007,7 +1007,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(1),
sequence: uint32(5),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE0",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1016,7 +1016,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(1),
sequence: uint32(4),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1025,7 +1025,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(1),
sequence: uint32(3),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF2",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1034,7 +1034,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(1),
sequence: uint32(2),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1043,7 +1043,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(0),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(1),
sequence: uint32(6),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -454,7 +454,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(1),
sequence: uint32(5),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE0",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -463,7 +463,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(1),
sequence: uint32(4),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -472,7 +472,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(1),
sequence: uint32(3),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF2",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -481,7 +481,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(1),
sequence: uint32(2),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -490,7 +490,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(0),
sequence: uint32(1),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ Verify QoS policy feature configuration.

Queue | Priority | Sequence | Weight
----- | -------- | -------- | ------
BE0 | not set | 1 | 1
BE1 | not set | 1 | 2
AF1 | not set | 1 | 4
AF2 | not set | 1 | 8
AF3 | not set | 1 | 16
AF4 | STRICT | 0 | 100
BE1 | not set | 6 | 1
BE0 | not set | 5 | 2
AF1 | not set | 4 | 4
AF2 | not set | 3 | 8
AF3 | not set | 2 | 16
AF4 | STRICT | 1 | 100
NC1 | STRICT | 0 | 200

* Validate that the following values can be configured
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGrpoup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(1),
sequence: uint32(6),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -395,7 +395,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGrpoup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(1),
sequence: uint32(5),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE0",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -404,7 +404,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGrpoup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(1),
sequence: uint32(4),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -413,7 +413,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGrpoup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(1),
sequence: uint32(3),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF2",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -422,7 +422,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGrpoup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(1),
sequence: uint32(2),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -431,7 +431,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGrpoup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(0),
sequence: uint32(1),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(1),
sequence: uint32(6),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1427,7 +1427,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(1),
sequence: uint32(5),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE0",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1436,7 +1436,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(1),
sequence: uint32(4),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1445,7 +1445,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(1),
sequence: uint32(3),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF2",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1454,7 +1454,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(1),
sequence: uint32(2),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -1463,7 +1463,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGrpoup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(0),
sequence: uint32(1),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down