Skip to content

Commit

Permalink
QoS: Rollback PR1100 for sequence# change in scheduler policy (#1167)
Browse files Browse the repository at this point in the history 
* Update mixed_sp_wrr_traffic_test.go

Rollback #1100 for sequence# change in scheduler policy

* Update one_sp_queue_traffic_test.go

* Update two_sp_queue_traffic_test.go

* Update qos_policy_config_test.go

* Update README.md

* Update qos_output_queue_counters_test.go
  • Loading branch information
@sezhang2
sezhang2 authored Feb 22, 2023
1 parent c7c6a33 commit f3e9a80
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
12 changes: 6 additions & 6 deletions feature/experimental/qos/ate_tests/mixed_sp_wrr_traffic_test/mixed_sp_wrr_traffic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(6),
sequence: uint32(1),
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) {
targetGroup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(5),
sequence: uint32(1),
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) {
targetGroup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(4),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(3),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(2),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(1),
sequence: uint32(0),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down
10 changes: 5 additions & 5 deletions feature/experimental/qos/ate_tests/one_sp_queue_traffic_test/one_sp_queue_traffic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(6),
sequence: uint32(1),
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) {
targetGroup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(5),
sequence: uint32(1),
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) {
targetGroup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(4),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(3),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(2),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand Down
12 changes: 6 additions & 6 deletions ...perimental/qos/ate_tests/qos_output_queue_counters_test/qos_output_queue_counters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(6),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -481,7 +481,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(5),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE0",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -490,7 +490,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(4),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -499,7 +499,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(3),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF2",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -508,7 +508,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(2),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -517,7 +517,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(1),
sequence: uint32(0),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down
12 changes: 6 additions & 6 deletions feature/experimental/qos/ate_tests/qos_policy_config_test/README.md
View file
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
----- | -------- | -------- | ------
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
BE1 | not set | 1 | 1
BE0 | not set | 1 | 2
AF1 | not set | 1 | 4
AF2 | not set | 1 | 8
AF3 | not set | 1 | 16
AF4 | STRICT | 0 | 100
NC1 | STRICT | 0 | 200

* Validate that the following values can be configured
Expand Down
12 changes: 6 additions & 6 deletions feature/experimental/qos/ate_tests/qos_policy_config_test/qos_policy_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGroup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(6),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -395,7 +395,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGroup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(5),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "BE0",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -404,7 +404,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGroup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(4),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF1",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -413,7 +413,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGroup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(3),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF2",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -422,7 +422,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGroup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(2),
sequence: uint32(1),
priority: oc.Scheduler_Priority_UNSET,
inputID: "AF3",
inputType: oc.Input_InputType_QUEUE,
Expand All @@ -431,7 +431,7 @@ func TestSchedulerPoliciesConfig(t *testing.T) {
targetGroup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(1),
sequence: uint32(0),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down
12 changes: 6 additions & 6 deletions feature/experimental/qos/ate_tests/two_sp_queue_traffic_test/two_sp_queue_traffic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
targetGroup string
}{{
desc: "scheduler-policy-BE1",
sequence: uint32(6),
sequence: uint32(1),
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) {
targetGroup: "target-group-BE1",
}, {
desc: "scheduler-policy-BE0",
sequence: uint32(5),
sequence: uint32(1),
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) {
targetGroup: "target-group-BE0",
}, {
desc: "scheduler-policy-AF1",
sequence: uint32(4),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF1",
}, {
desc: "scheduler-policy-AF2",
sequence: uint32(3),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF2",
}, {
desc: "scheduler-policy-AF3",
sequence: uint32(2),
sequence: uint32(1),
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) {
targetGroup: "target-group-AF3",
}, {
desc: "scheduler-policy-AF4",
sequence: uint32(1),
sequence: uint32(0),
priority: oc.Scheduler_Priority_STRICT,
inputID: "AF4",
inputType: oc.Input_InputType_QUEUE,
Expand Down

0 comments on commit f3e9a80

Please sign in to comment.