[dts] [PATCH V1] tests/ice_enable_basic_hqos_on_pf: optimize testplan and modify scripts

[dts] [PATCH V1] tests/ice_enable_basic_hqos_on_pf: optimize testplan and modify scripts

[Jiale Song]

the testplan was designed based on a maximum speed of 8.25Gbps, but the
actual tested maximum speed was 9.5Gbps. Optimize the testplan, limit
the node Rate limiting to 8.25Gbps, and modify relevant test cases.

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/ice_enable_basic_hqos_on_pf_test_plan.rst | 6 ++++--
 tests/TestSuite_ice_enable_basic_hqos_on_pf.py       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test_plans/ice_enable_basic_hqos_on_pf_test_plan.rst b/test_plans/ice_enable_basic_hqos_on_pf_test_plan.rst
index e82ebd84..6a96c7c0 100644
--- a/test_plans/ice_enable_basic_hqos_on_pf_test_plan.rst
+++ b/test_plans/ice_enable_basic_hqos_on_pf_test_plan.rst
@@ -97,7 +97,7 @@ IXIA Sends 8 streams(1-8) with different pkt size(64/128/256/512/1024/1518/512/1
 Stream2 has UP1, stream3 has UP2, other streams has UP0.
 Linerate is 100Gbps, each stream occupied 12.5%Max linerate.
 The 10Gbps cable limited TX rate of NIC-2,Port-1 to 10Gbps.
-Check the actual TX throughput of ens802f0(86:00.0) is about 8.25Gbps.
+Check the actual TX throughput of ens802f0(86:00.0) is about 9.5Gbps.
 When check the throughput ratio of each queue group and queue,
 stop the forward, and check the TX-packets ratio of queues.
 The TX-packets ratio of queues is same as TX throughput ratio of queues.
@@ -264,11 +264,12 @@ Test Steps
       testpmd> add port tm node shaper profile 1 3 300 0 10000000 0 0 0
       testpmd> add port tm node shaper profile 1 4 300 0 20000000 0 0 0
       testpmd> add port tm node shaper profile 1 5 200 0 400000000 0 0 0
+      testpmd> add port tm node shaper profile 1 6 200 0 731000000 0 0 0
       testpmd> add port tm nonleaf node 1 1000000 -1 0 1 0 -1 1 0 0
       testpmd> add port tm nonleaf node 1 900000 1000000 0 1 1 -1 1 0 0
       testpmd> add port tm nonleaf node 1 800000 900000 0 1 2 -1 1 0 0
       testpmd> add port tm nonleaf node 1 700000 800000 0 1 3 1 1 0 0
-      testpmd> add port tm nonleaf node 1 600000 800000 7 1 3 -1 1 0 0
+      testpmd> add port tm nonleaf node 1 600000 800000 7 1 3 6 1 0 0
       testpmd> add port tm leaf node 1 0 700000 0 1 4 -1 0 0xffffffff 0 0
       testpmd> add port tm leaf node 1 1 700000 0 2 4 -1 0 0xffffffff 0 0
       testpmd> add port tm leaf node 1 2 700000 0 3 4 -1 0 0xffffffff 0 0
@@ -295,6 +296,7 @@ Test Steps
       testpmd> stop
 
    Check the TX throughput of queue group 0 is limited to 2.4Gbps.
+   Check the TX throughput of queue group 1 is limited to 5.85Gbps.
    The TX throughput of queue 0-3 is 1:2:3:4.
    The throughput of queue 4 is limited to 80Mbps,
    queue 5 is limited to 80Mbps,
diff --git a/tests/TestSuite_ice_enable_basic_hqos_on_pf.py b/tests/TestSuite_ice_enable_basic_hqos_on_pf.py
index 61f4c239..9f8d1735 100644
--- a/tests/TestSuite_ice_enable_basic_hqos_on_pf.py
+++ b/tests/TestSuite_ice_enable_basic_hqos_on_pf.py
@@ -561,11 +561,12 @@ class TestICEEnableBasicHqosOnPF(TestCase):
             "add port tm node shaper profile {} 3 300 0 10000000 0 0 0",
             "add port tm node shaper profile {} 4 300 0 20000000 0 0 0",
             "add port tm node shaper profile {} 5 200 0 400000000 0 0 0",
+            "add port tm node shaper profile {} 6 200 0 731000000 0 0 0",
             "add port tm nonleaf node {} 1000000 -1 0 1 0 -1 1 0 0",
             "add port tm nonleaf node {} 900000 1000000 0 1 1 -1 1 0 0",
             "add port tm nonleaf node {} 800000 900000 0 1 2 -1 1 0 0",
             "add port tm nonleaf node {} 700000 800000 0 1 3 1 1 0 0",
-            "add port tm nonleaf node {} 600000 800000 7 1 3 -1 1 0 0",
+            "add port tm nonleaf node {} 600000 800000 7 1 3 6 1 0 0",
             "add port tm leaf node {} 0 700000 0 1 4 -1 0 0xffffffff 0 0",
             "add port tm leaf node {} 1 700000 0 2 4 -1 0 0xffffffff 0 0",
             "add port tm leaf node {} 2 700000 0 3 4 -1 0 0xffffffff 0 0",
@@ -593,6 +594,7 @@ class TestICEEnableBasicHqosOnPF(TestCase):
         expected = [[1, 2, 3, 4], [0, 0, 0, 0, 0, 0, 0, 0]]
         expected_queue = [
             [[0, 1, 2, 3], 2.4, "Gbps"],
+            [[4, 5, 6, 7, 8, 9, 10, 11], 5.85, "Gbps"],
             [4, 80, "Mbps"],
             [5, 80, "Mbps"],
             [6, 800, "Mbps"],
-- 
2.25.1