From bd6b362953b567447fddf4eed85aa6fed130ace1 Mon Sep 17 00:00:00 2001 From: sezhang2 Date: Fri, 10 Feb 2023 12:46:46 -0800 Subject: [PATCH] QoS: Fixed duplicated sequence# in scheduler policy (#1100) * Update qos_policy_config_test.go * Update README.md * Update README.md * Update mixed_sp_wrr_traffic_test.go * Update one_sp_queue_traffic_test.go * Update two_sp_queue_traffic_test.go * Update qos_output_queue_counters_test.go --- .../mixed_sp_wrr_traffic_test.go | 12 ++++++------ .../one_sp_queue_traffic_test.go | 12 ++++++------ .../qos_output_queue_counters_test.go | 12 ++++++------ .../qos/ate_tests/qos_policy_config_test/README.md | 12 ++++++------ .../qos_policy_config_test/qos_policy_config_test.go | 12 ++++++------ .../two_sp_queue_traffic_test.go | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/feature/experimental/qos/ate_tests/mixed_sp_wrr_traffic_test/mixed_sp_wrr_traffic_test.go b/feature/experimental/qos/ate_tests/mixed_sp_wrr_traffic_test/mixed_sp_wrr_traffic_test.go index 51c6dd75b69..ea1759b141b 100644 --- a/feature/experimental/qos/ate_tests/mixed_sp_wrr_traffic_test/mixed_sp_wrr_traffic_test.go +++ b/feature/experimental/qos/ate_tests/mixed_sp_wrr_traffic_test/mixed_sp_wrr_traffic_test.go @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/feature/experimental/qos/ate_tests/one_sp_queue_traffic_test/one_sp_queue_traffic_test.go b/feature/experimental/qos/ate_tests/one_sp_queue_traffic_test/one_sp_queue_traffic_test.go index 67f7b9ecbbc..470d46d89f9 100644 --- a/feature/experimental/qos/ate_tests/one_sp_queue_traffic_test/one_sp_queue_traffic_test.go +++ b/feature/experimental/qos/ate_tests/one_sp_queue_traffic_test/one_sp_queue_traffic_test.go @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/feature/experimental/qos/ate_tests/qos_output_queue_counters_test/qos_output_queue_counters_test.go b/feature/experimental/qos/ate_tests/qos_output_queue_counters_test/qos_output_queue_counters_test.go index e260420e523..aac68d06143 100644 --- a/feature/experimental/qos/ate_tests/qos_output_queue_counters_test/qos_output_queue_counters_test.go +++ b/feature/experimental/qos/ate_tests/qos_output_queue_counters_test/qos_output_queue_counters_test.go @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/feature/experimental/qos/ate_tests/qos_policy_config_test/README.md b/feature/experimental/qos/ate_tests/qos_policy_config_test/README.md index e2530aabde8..9735ddb3750 100644 --- a/feature/experimental/qos/ate_tests/qos_policy_config_test/README.md +++ b/feature/experimental/qos/ate_tests/qos_policy_config_test/README.md @@ -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 diff --git a/feature/experimental/qos/ate_tests/qos_policy_config_test/qos_policy_config_test.go b/feature/experimental/qos/ate_tests/qos_policy_config_test/qos_policy_config_test.go index e65bd456a08..66e70a46e22 100644 --- a/feature/experimental/qos/ate_tests/qos_policy_config_test/qos_policy_config_test.go +++ b/feature/experimental/qos/ate_tests/qos_policy_config_test/qos_policy_config_test.go @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/feature/experimental/qos/ate_tests/two_sp_queue_traffic_test/two_sp_queue_traffic_test.go b/feature/experimental/qos/ate_tests/two_sp_queue_traffic_test/two_sp_queue_traffic_test.go index a9eea05a817..4cd4f885c05 100644 --- a/feature/experimental/qos/ate_tests/two_sp_queue_traffic_test/two_sp_queue_traffic_test.go +++ b/feature/experimental/qos/ate_tests/two_sp_queue_traffic_test/two_sp_queue_traffic_test.go @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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,