diff mbox series

[V1,2/2] tests/ice_dcf_qos:modify the command according to the dpdk changed

Message ID 20221009234243.17428-3-zhiminx.huang@intel.com (mailing list archive)
State Accepted
Headers
Series ice_dcf_qos:modify the command according to the dpdk changed |

Checks

Context Check Description
ci/Intel-dts-format-test success Testing OK
ci/Intel-dts-pylama-test success Testing OK
ci/Intel-dts-doc-test success Testing OK
ci/Intel-dts-suite-test warning SKIPPED

Commit Message

Huang, ZhiminX Oct. 9, 2022, 11:42 p.m. UTC 
  1.according to dpdk 5779a8894d154bf0b6b1c13ce5ce5961e1dfc29d.
it's add shaper profile id check,if we do not need to do anything for the exact node,
the shaper profile id should be -1, not 0 or any other numbers.
2.optimized start testpmd function to adapt the latest dts framework.
3.abs() should set variable.

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 tests/TestSuite_ice_dcf_qos.py | 885 +++++++++++++++++----------------
 1 file changed, 443 insertions(+), 442 deletions(-)

Comments

Tu, Lijuan Oct. 10, 2022, 3:37 a.m. UTC | #1 
On Mon, 10 Oct 2022 07:42:43 +0800, Zhimin Huang <zhiminx.huang@intel.com> wrote:
> 1.according to dpdk 5779a8894d154bf0b6b1c13ce5ce5961e1dfc29d.
> it's add shaper profile id check,if we do not need to do anything for the exact node,
> the shaper profile id should be -1, not 0 or any other numbers.
> 2.optimized start testpmd function to adapt the latest dts framework.
> 3.abs() should set variable.
> 
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>

Acked-by: Lijuan Tu <lijuan.tu@intel.com>
Series applied, thanks
diff mbox series

Patch

diff --git a/tests/TestSuite_ice_dcf_qos.py b/tests/TestSuite_ice_dcf_qos.py
index f1890b4d..8dfce3f4 100644
--- a/tests/TestSuite_ice_dcf_qos.py
+++ b/tests/TestSuite_ice_dcf_qos.py
@@ -181,11 +181,11 @@  class TestICEDcfQos(TestCase):
             return False
         bias = 10
         if unit == "MBps":
-            return (100 * (real_bps / 8 / 1e6 - _expected) / _expected) < abs(bias)
+            return abs(100 * (real_bps / 8 / 1e6 - _expected) / _expected) < bias
         elif unit == "-MBps":
             return real_bps / 8 / 1e6 < _expected
         elif unit in ["Gbps", "rGbps"]:
-            return (100 * (real_bps / 1e9 - _expected) / _expected) < abs(bias)
+            return abs(100 * (real_bps / 1e9 - _expected) / _expected) < bias
         return True
 
     def get_custom_nic_port(self, nic_name, num=None):
@@ -421,12 +421,13 @@  class TestICEDcfQos(TestCase):
         self.is_pmd_on = False
 
     def testpmd_start(self, vfs_group):
-        allow_list = []
+        port_list = []
+        port_options = {}
         for vfs in vfs_group:
             for idx, vf in enumerate(vfs):
-                addr = f"{vf},cap=dcf" if idx == 0 else vf
-                allow_list.append(addr)
-        eal_param = " ".join(allow_list)
+                port_list.append(vf)
+                if idx == 0:
+                    port_options[vf] = "cap=dcf"
         param = ("{xq} " "{nb-cores} " "{topo}").format(
             **{
                 "xq": "--txq=8 --rxq=8",
@@ -435,7 +436,7 @@  class TestICEDcfQos(TestCase):
             }
         )
         self.pmd_output.start_testpmd(
-            cores="1S/9C/1T", param=param, **{"ports": allow_list}
+            cores="1S/9C/1T", param=param, ports=port_list, port_options=port_options
         )
         self.is_pmd_on = True
 
@@ -490,18 +491,18 @@  class TestICEDcfQos(TestCase):
                 "port tm hierarchy commit 0 no",
                 self.check_error_output if commit_check else None,
             ],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
             [
                 "port tm hierarchy commit 1 no",
                 self.check_error_output if commit_check else None,
@@ -534,18 +535,18 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 no", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 no", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -599,18 +600,18 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 no", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 no", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -660,29 +661,29 @@  class TestICEDcfQos(TestCase):
                 "add port tm leaf node 2 2 800 0 1 2 1 0 0xffffffff 0 0",
                 "add port tm leaf node 2 3 800 0 1 2 1 0 0xffffffff 0 0",
                 ["port tm hierarchy commit 2 yes", self.check_error_output],
-                "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-                "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-                "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+                "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+                "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+                "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
                 ["port tm hierarchy commit 1 yes", self.check_error_output],
-                "add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0",
-                "add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0",
-                "add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 2 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 3 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 4 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 5 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 6 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 7 800 0 1 2 0 0 0xffffffff 0 0",
+                "add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0",
+                "add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0",
+                "add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 2 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 3 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 4 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 5 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 6 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 7 800 0 1 2 -1 0 0xffffffff 0 0",
                 ["port tm hierarchy commit 3 yes", self.check_error_output],
                 "port start all",
                 "set fwd mac",
@@ -767,29 +768,29 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 2 2 800 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 2 3 800 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 2 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
-            "add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 3 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -857,31 +858,31 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 2 4 700 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 2 5 700 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 2 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
-            "add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 3 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 3 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 3 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -966,31 +967,31 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 7 700 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 0 8 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
-            "add port tm nonleaf node 2 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 2 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 2 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 2 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 2 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 2 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 2 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 2 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 2 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 2 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -1021,7 +1022,7 @@  class TestICEDcfQos(TestCase):
         results = self.check_traffic(stream_configs, traffic_tasks)
         self.testpmd_close()
 
-        expected = [
+        queue_mapping = [
             ((1, 1), range(2)),
             ((1, 1), range(2)),
             ((1, 1), range(2, 4)),
@@ -1089,53 +1090,53 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 3 4 800 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 3 5 800 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 3 no", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 no", self.check_error_output],
-            "add port tm nonleaf node 4 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 4 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 4 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 4 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 4 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 4 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 4 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 4 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 4 no", self.check_error_output],
-            "add port tm nonleaf node 2 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 2 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 2 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 2 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 2 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 2 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 2 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 2 no", self.check_error_output],
-            "add port tm nonleaf node 5 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 5 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 5 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 5 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 5 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 5 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 5 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 5 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 5 no", self.check_error_output],
         ]
         self.pmd_con(cmds)
@@ -1221,57 +1222,57 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 3 7 700 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 3 8 700 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 3 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
-            "add port tm nonleaf node 2 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 2 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 2 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 2 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 2 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 2 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 2 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 2 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 2 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 2 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 2 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 2 yes", self.check_error_output],
-            "add port tm nonleaf node 4 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 4 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 4 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 4 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 4 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 4 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 5 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 4 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 4 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 4 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 4 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 4 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 4 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 4 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 5 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 4 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 4 yes", self.check_error_output],
-            "add port tm nonleaf node 5 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 5 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 5 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 5 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 5 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 5 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 5 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 5 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 5 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 5 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 5 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 5 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 5 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -1347,23 +1348,23 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 14 200 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 0 15 200 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 500 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 400 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 300 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 200 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 600 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 500 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 400 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 300 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 200 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 500 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 400 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 300 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 200 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 600 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 500 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 400 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 300 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 200 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -1421,23 +1422,23 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 14 200 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 0 15 200 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 500 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 400 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 300 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 200 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 600 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 500 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 400 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 300 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 200 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 500 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 400 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 300 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 200 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 600 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 500 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 400 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 300 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 200 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -1473,16 +1474,16 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 0 900 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 0 1 900 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 900 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 900 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -1579,41 +1580,41 @@  class TestICEDcfQos(TestCase):
                 "add port tm leaf node 2 14 200 0 1 2 1 0 0xffffffff 0 0",
                 "add port tm leaf node 2 15 200 0 1 2 1 0 0xffffffff 0 0",
                 ["port tm hierarchy commit 2 yes", self.check_error_output],
-                "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-                "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 500 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 400 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 300 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 1 200 1000 0 1 1 0 1 0 0",
-                "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 1 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 3 600 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 4 500 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 5 400 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 6 300 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 1 7 200 0 1 2 0 0 0xffffffff 0 0",
+                "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+                "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 500 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 400 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 300 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 1 200 1000 0 1 1 -1 1 0 0",
+                "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 1 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 3 600 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 4 500 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 5 400 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 6 300 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 1 7 200 0 1 2 -1 0 0xffffffff 0 0",
                 ["port tm hierarchy commit 1 yes", self.check_error_output],
-                "add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0",
-                "add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 700 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 600 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 500 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 400 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 300 1000 0 1 1 0 1 0 0",
-                "add port tm nonleaf node 3 200 1000 0 1 1 0 1 0 0",
-                "add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 1 800 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 2 700 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 3 600 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 4 500 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 5 400 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 6 300 0 1 2 0 0 0xffffffff 0 0",
-                "add port tm leaf node 3 7 200 0 1 2 0 0 0xffffffff 0 0",
+                "add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0",
+                "add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 700 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 600 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 500 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 400 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 300 1000 0 1 1 -1 1 0 0",
+                "add port tm nonleaf node 3 200 1000 0 1 1 -1 1 0 0",
+                "add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 1 800 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 2 700 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 3 600 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 4 500 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 5 400 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 6 300 0 1 2 -1 0 0xffffffff 0 0",
+                "add port tm leaf node 3 7 200 0 1 2 -1 0 0xffffffff 0 0",
                 ["port tm hierarchy commit 3 yes", self.check_error_output],
                 "port start all",
                 "set fwd mac",
@@ -1699,16 +1700,16 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 0 900 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 0 1 900 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 900 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 900 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
             "add port tm node shaper profile 2 1 1000000 0 1000000000 0 0 0",
             "add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0",
@@ -1716,16 +1717,16 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 2 0 900 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 2 1 900 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 2 yes", self.check_error_output],
-            "add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 4 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 5 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 6 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 3 7 900 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 4 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 5 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 6 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 3 7 900 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 3 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -1771,18 +1772,18 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 no", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 no", self.check_error_output],
             "port start all",
         ]
@@ -2176,17 +2177,17 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 2 800000 0 1 2 1 0 0xffffffff 0 0",
             "add port tm leaf node 0 3 800000 0 1 2 1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -2244,17 +2245,17 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
             "port tm hierarchy commit 1 yes",
         ]
         outputs = self.pmd_con(cmds)
@@ -2264,19 +2265,19 @@  class TestICEDcfQos(TestCase):
         ]
         self.check_output(expected, outputs[-1])
         cmds = [
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 8 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 8 700 0 1 2 -1 0 0xffffffff 0 0",
         ]
         outputs = self.pmd_con(cmds)
         expected = "num strict priorities field (node params): SP priority not supported (error 27)"
@@ -2318,17 +2319,17 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 no", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
             "port tm hierarchy commit 1 yes",
         ]
         outputs = self.pmd_con(cmds)
@@ -2338,18 +2339,18 @@  class TestICEDcfQos(TestCase):
         ]
         self.check_output(expected, outputs[-1])
         cmds = [
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
             "port tm hierarchy commit 1 yes",
         ]
         outputs = self.pmd_con(cmds)
@@ -2402,23 +2403,23 @@  class TestICEDcfQos(TestCase):
         self.check_output(expected, outputs[-1])
         cmds = [
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0",
         ]
         outputs = self.pmd_con(cmds)
         expected = "node id: too many TCs (error 33)"
         self.check_output(expected, outputs[-1])
         cmds = [
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 600 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 600 0 1 2 -1 0 0xffffffff 0 0",
         ]
         outputs = self.pmd_con(cmds)
         expected = "parent node id: parent not exist (error 19)"
@@ -2441,15 +2442,15 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 no", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0",
         ]
         outputs = self.pmd_con(cmds)
         expected = "node id: node id already used (error 33)"
@@ -2472,18 +2473,18 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 yes", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 yes", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -2538,18 +2539,18 @@  class TestICEDcfQos(TestCase):
             "add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0",
             "add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0",
             ["port tm hierarchy commit 0 no", self.check_error_output],
-            "add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0",
-            "add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0",
-            "add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0",
-            "add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0",
-            "add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0",
+            "add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0",
+            "add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0",
+            "add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0",
+            "add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0",
+            "add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0",
             ["port tm hierarchy commit 1 no", self.check_error_output],
             "port start all",
             "set fwd mac",
@@ -3112,7 +3113,7 @@  class TestICEDcfQos(TestCase):
             self.vf_destroy()
 
         try:
-            self.pf_preset(num=1)
+            self.pf_preset()
             self.vf_init()
             self.vf_create(*[[self.nic_100g], 2])
             vfs_group = [info.get("vfs_pci") for _, info in self.vf_ports_info.items()]