Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 117752,
    "url": "http://patches.dpdk.org/api/patches/117752/?format=api",
    "web_url": "http://patches.dpdk.org/project/dts/patch/20221009234243.17428-3-zhiminx.huang@intel.com/",
    "project": {
        "id": 3,
        "url": "http://patches.dpdk.org/api/projects/3/?format=api",
        "name": "DTS",
        "link_name": "dts",
        "list_id": "dts.dpdk.org",
        "list_email": "dts@dpdk.org",
        "web_url": "",
        "scm_url": "git://dpdk.org/tools/dts",
        "webscm_url": "http://git.dpdk.org/tools/dts/",
        "list_archive_url": "https://inbox.dpdk.org/dts",
        "list_archive_url_format": "https://inbox.dpdk.org/dts/{}",
        "commit_url_format": ""
    },
    "msgid": "<20221009234243.17428-3-zhiminx.huang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dts/20221009234243.17428-3-zhiminx.huang@intel.com",
    "date": "2022-10-09T23:42:43",
    "name": "[V1,2/2] tests/ice_dcf_qos:modify the command according to the dpdk changed",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "d83ef9f3e2fc24ae747dfa713b487191b5ed8256",
    "submitter": {
        "id": 1685,
        "url": "http://patches.dpdk.org/api/people/1685/?format=api",
        "name": "Huang, ZhiminX",
        "email": "zhiminx.huang@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dts/patch/20221009234243.17428-3-zhiminx.huang@intel.com/mbox/",
    "series": [
        {
            "id": 25065,
            "url": "http://patches.dpdk.org/api/series/25065/?format=api",
            "web_url": "http://patches.dpdk.org/project/dts/list/?series=25065",
            "date": "2022-10-09T23:42:41",
            "name": "ice_dcf_qos:modify the command according to the dpdk changed",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/25065/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/117752/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/117752/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dts-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 80C7AA0543;\n\tSun,  9 Oct 2022 17:32:27 +0200 (CEST)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7B4244113F;\n\tSun,  9 Oct 2022 17:32:27 +0200 (CEST)",
            "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n by mails.dpdk.org (Postfix) with ESMTP id 70E6740042\n for <dts@dpdk.org>; Sun,  9 Oct 2022 17:32:25 +0200 (CEST)",
            "from orsmga007.jf.intel.com ([10.7.209.58])\n by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Oct 2022 08:32:25 -0700",
            "from unknown (HELO localhost.localdomain) ([10.239.252.93])\n by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Oct 2022 08:32:23 -0700"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1665329545; x=1696865545;\n h=from:to:cc:subject:date:message-id:in-reply-to: references;\n bh=Ba3zoTHIua21PY37bDfsU3e6XXp84d+jsMP1FJZIhH4=;\n b=iorFY9WvXEUbnKXxw4XdaTy6Gcnved1/2lC/rcxAwOPvAB3zL0qusuNI\n zqx3DCNj1p8kKvAo8FWtqAJwy35qVes58Gnf0LicSyOaqgwVdgS6ou3tx\n 6oFagMW9W1oT9f4/yisTJMNICzvP5JTZCvKSjaN4goZNCqnTeWzNNJnA0\n Xj7J7JcwAlX7OxNvaecgKnnaqdwbqu9AuwX1blXNwkQhV5ap3qfpDxn5q\n rTdAMOye2ac3N6JHk0lhhowBCfvljNjHCTlRWjwAuTZxFh97zGF3uhsgE\n eqO5w4t0zR+UuREz7ehY9EB+4D7jE//4Ql7IEhkezWDFi/fNP4CYoVd4B A==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6500,9779,10495\"; a=\"305089822\"",
            "E=Sophos;i=\"5.95,171,1661842800\"; d=\"scan'208\";a=\"305089822\"",
            "E=McAfee;i=\"6500,9779,10495\"; a=\"620781420\"",
            "E=Sophos;i=\"5.95,171,1661842800\"; d=\"scan'208\";a=\"620781420\""
        ],
        "From": "Zhimin Huang <zhiminx.huang@intel.com>",
        "To": "dts@dpdk.org",
        "Cc": "Zhimin Huang <zhiminx.huang@intel.com>",
        "Subject": "[dts][PATCH V1 2/2] tests/ice_dcf_qos:modify the command according to\n the dpdk changed",
        "Date": "Mon, 10 Oct 2022 07:42:43 +0800",
        "Message-Id": "<20221009234243.17428-3-zhiminx.huang@intel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20221009234243.17428-1-zhiminx.huang@intel.com>",
        "References": "<20221009234243.17428-1-zhiminx.huang@intel.com>",
        "X-BeenThere": "dts@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "test suite reviews and discussions <dts.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dts/>",
        "List-Post": "<mailto:dts@dpdk.org>",
        "List-Help": "<mailto:dts-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dts-bounces@dpdk.org"
    },
    "content": "1.according to dpdk 5779a8894d154bf0b6b1c13ce5ce5961e1dfc29d.\nit's add shaper profile id check,if we do not need to do anything for the exact node,\nthe shaper profile id should be -1, not 0 or any other numbers.\n2.optimized start testpmd function to adapt the latest dts framework.\n3.abs() should set variable.\n\nSigned-off-by: Zhimin Huang <zhiminx.huang@intel.com>\n---\n tests/TestSuite_ice_dcf_qos.py | 885 +++++++++++++++++----------------\n 1 file changed, 443 insertions(+), 442 deletions(-)",
    "diff": "diff --git a/tests/TestSuite_ice_dcf_qos.py b/tests/TestSuite_ice_dcf_qos.py\nindex f1890b4d..8dfce3f4 100644\n--- a/tests/TestSuite_ice_dcf_qos.py\n+++ b/tests/TestSuite_ice_dcf_qos.py\n@@ -181,11 +181,11 @@ class TestICEDcfQos(TestCase):\n             return False\n         bias = 10\n         if unit == \"MBps\":\n-            return (100 * (real_bps / 8 / 1e6 - _expected) / _expected) < abs(bias)\n+            return abs(100 * (real_bps / 8 / 1e6 - _expected) / _expected) < bias\n         elif unit == \"-MBps\":\n             return real_bps / 8 / 1e6 < _expected\n         elif unit in [\"Gbps\", \"rGbps\"]:\n-            return (100 * (real_bps / 1e9 - _expected) / _expected) < abs(bias)\n+            return abs(100 * (real_bps / 1e9 - _expected) / _expected) < bias\n         return True\n \n     def get_custom_nic_port(self, nic_name, num=None):\n@@ -421,12 +421,13 @@ class TestICEDcfQos(TestCase):\n         self.is_pmd_on = False\n \n     def testpmd_start(self, vfs_group):\n-        allow_list = []\n+        port_list = []\n+        port_options = {}\n         for vfs in vfs_group:\n             for idx, vf in enumerate(vfs):\n-                addr = f\"{vf},cap=dcf\" if idx == 0 else vf\n-                allow_list.append(addr)\n-        eal_param = \" \".join(allow_list)\n+                port_list.append(vf)\n+                if idx == 0:\n+                    port_options[vf] = \"cap=dcf\"\n         param = (\"{xq} \" \"{nb-cores} \" \"{topo}\").format(\n             **{\n                 \"xq\": \"--txq=8 --rxq=8\",\n@@ -435,7 +436,7 @@ class TestICEDcfQos(TestCase):\n             }\n         )\n         self.pmd_output.start_testpmd(\n-            cores=\"1S/9C/1T\", param=param, **{\"ports\": allow_list}\n+            cores=\"1S/9C/1T\", param=param, ports=port_list, port_options=port_options\n         )\n         self.is_pmd_on = True\n \n@@ -490,18 +491,18 @@ class TestICEDcfQos(TestCase):\n                 \"port tm hierarchy commit 0 no\",\n                 self.check_error_output if commit_check else None,\n             ],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\n                 \"port tm hierarchy commit 1 no\",\n                 self.check_error_output if commit_check else None,\n@@ -534,18 +535,18 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 no\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 no\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -599,18 +600,18 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 no\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 no\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -660,29 +661,29 @@ class TestICEDcfQos(TestCase):\n                 \"add port tm leaf node 2 2 800 0 1 2 1 0 0xffffffff 0 0\",\n                 \"add port tm leaf node 2 3 800 0 1 2 1 0 0xffffffff 0 0\",\n                 [\"port tm hierarchy commit 2 yes\", self.check_error_output],\n-                \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-                \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-                \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+                \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n                 [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n-                \"add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0\",\n-                \"add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0\",\n-                \"add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+                \"add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n                 [\"port tm hierarchy commit 3 yes\", self.check_error_output],\n                 \"port start all\",\n                 \"set fwd mac\",\n@@ -767,29 +768,29 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 2 2 800 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 2 3 800 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 2 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 3 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -857,31 +858,31 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 2 4 700 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 2 5 700 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 2 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 3 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 3 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 3 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -966,31 +967,31 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 7 700 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 8 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 2 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 2 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 2 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 2 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 2 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 2 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 2 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -1021,7 +1022,7 @@ class TestICEDcfQos(TestCase):\n         results = self.check_traffic(stream_configs, traffic_tasks)\n         self.testpmd_close()\n \n-        expected = [\n+        queue_mapping = [\n             ((1, 1), range(2)),\n             ((1, 1), range(2)),\n             ((1, 1), range(2, 4)),\n@@ -1089,53 +1090,53 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 3 4 800 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 3 5 800 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 3 no\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 no\", self.check_error_output],\n-            \"add port tm nonleaf node 4 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 4 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 4 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 4 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 4 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 4 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 4 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 4 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 4 no\", self.check_error_output],\n-            \"add port tm nonleaf node 2 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 2 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 2 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 2 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 2 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 2 no\", self.check_error_output],\n-            \"add port tm nonleaf node 5 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 5 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 5 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 5 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 5 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 5 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 5 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 5 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 5 no\", self.check_error_output],\n         ]\n         self.pmd_con(cmds)\n@@ -1221,57 +1222,57 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 3 7 700 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 3 8 700 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 3 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 2 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 2 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 2 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 2 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 2 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 2 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 2 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 2 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 2 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 2 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 4 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 4 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 4 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 4 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 4 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 4 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 5 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 4 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 4 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 4 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 4 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 4 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 4 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 4 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 5 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 4 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 4 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 5 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 5 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 5 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 5 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 5 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 5 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 5 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 5 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 5 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 5 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 5 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 5 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 5 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -1347,23 +1348,23 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 14 200 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 15 200 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 500 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 400 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 300 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 200 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 600 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 500 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 400 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 300 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 200 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 500 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 400 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 300 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 200 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 600 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 500 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 400 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 300 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 200 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -1421,23 +1422,23 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 14 200 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 15 200 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 500 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 400 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 300 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 200 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 600 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 500 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 400 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 300 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 200 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 500 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 400 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 300 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 200 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 600 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 500 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 400 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 300 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 200 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -1473,16 +1474,16 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 0 900 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 1 900 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 900 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 900 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -1579,41 +1580,41 @@ class TestICEDcfQos(TestCase):\n                 \"add port tm leaf node 2 14 200 0 1 2 1 0 0xffffffff 0 0\",\n                 \"add port tm leaf node 2 15 200 0 1 2 1 0 0xffffffff 0 0\",\n                 [\"port tm hierarchy commit 2 yes\", self.check_error_output],\n-                \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-                \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 500 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 400 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 300 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 1 200 1000 0 1 1 0 1 0 0\",\n-                \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 1 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 3 600 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 4 500 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 5 400 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 6 300 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 1 7 200 0 1 2 0 0 0xffffffff 0 0\",\n+                \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 500 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 400 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 300 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 1 200 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 1 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 3 600 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 4 500 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 5 400 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 6 300 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 1 7 200 0 1 2 -1 0 0xffffffff 0 0\",\n                 [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n-                \"add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0\",\n-                \"add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 800 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 700 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 600 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 500 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 400 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 300 1000 0 1 1 0 1 0 0\",\n-                \"add port tm nonleaf node 3 200 1000 0 1 1 0 1 0 0\",\n-                \"add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 1 800 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 2 700 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 3 600 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 4 500 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 5 400 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 6 300 0 1 2 0 0 0xffffffff 0 0\",\n-                \"add port tm leaf node 3 7 200 0 1 2 0 0 0xffffffff 0 0\",\n+                \"add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 800 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 700 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 600 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 500 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 400 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 300 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm nonleaf node 3 200 1000 0 1 1 -1 1 0 0\",\n+                \"add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 1 800 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 2 700 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 3 600 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 4 500 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 5 400 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 6 300 0 1 2 -1 0 0xffffffff 0 0\",\n+                \"add port tm leaf node 3 7 200 0 1 2 -1 0 0xffffffff 0 0\",\n                 [\"port tm hierarchy commit 3 yes\", self.check_error_output],\n                 \"port start all\",\n                 \"set fwd mac\",\n@@ -1699,16 +1700,16 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 0 900 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 1 900 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 900 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 900 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n             \"add port tm node shaper profile 2 1 1000000 0 1000000000 0 0 0\",\n             \"add port tm nonleaf node 2 1000 -1 0 1 0 -1 1 0 0\",\n@@ -1716,16 +1717,16 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 2 0 900 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 2 1 900 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 2 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 3 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 3 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 3 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 4 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 5 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 6 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 3 7 900 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 3 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 3 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 3 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 4 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 5 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 6 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 3 7 900 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 3 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -1771,18 +1772,18 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 no\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 no\", self.check_error_output],\n             \"port start all\",\n         ]\n@@ -2176,17 +2177,17 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 2 800000 0 1 2 1 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 3 800000 0 1 2 1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -2244,17 +2245,17 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n             \"port tm hierarchy commit 1 yes\",\n         ]\n         outputs = self.pmd_con(cmds)\n@@ -2264,19 +2265,19 @@ class TestICEDcfQos(TestCase):\n         ]\n         self.check_output(expected, outputs[-1])\n         cmds = [\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 8 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 8 700 0 1 2 -1 0 0xffffffff 0 0\",\n         ]\n         outputs = self.pmd_con(cmds)\n         expected = \"num strict priorities field (node params): SP priority not supported (error 27)\"\n@@ -2318,17 +2319,17 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 no\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             \"port tm hierarchy commit 1 yes\",\n         ]\n         outputs = self.pmd_con(cmds)\n@@ -2338,18 +2339,18 @@ class TestICEDcfQos(TestCase):\n         ]\n         self.check_output(expected, outputs[-1])\n         cmds = [\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             \"port tm hierarchy commit 1 yes\",\n         ]\n         outputs = self.pmd_con(cmds)\n@@ -2402,23 +2403,23 @@ class TestICEDcfQos(TestCase):\n         self.check_output(expected, outputs[-1])\n         cmds = [\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 600 1000 0 1 1 0 1 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 600 1000 0 1 1 -1 1 0 0\",\n         ]\n         outputs = self.pmd_con(cmds)\n         expected = \"node id: too many TCs (error 33)\"\n         self.check_output(expected, outputs[-1])\n         cmds = [\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 600 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 600 0 1 2 -1 0 0xffffffff 0 0\",\n         ]\n         outputs = self.pmd_con(cmds)\n         expected = \"parent node id: parent not exist (error 19)\"\n@@ -2441,15 +2442,15 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 no\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 800 0 1 2 -1 0 0xffffffff 0 0\",\n         ]\n         outputs = self.pmd_con(cmds)\n         expected = \"node id: node id already used (error 33)\"\n@@ -2472,18 +2473,18 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 yes\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 800 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 800 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 yes\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -2538,18 +2539,18 @@ class TestICEDcfQos(TestCase):\n             \"add port tm leaf node 0 4 700 0 1 2 2 0 0xffffffff 0 0\",\n             \"add port tm leaf node 0 5 700 0 1 2 2 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 0 no\", self.check_error_output],\n-            \"add port tm nonleaf node 1 1000 -1 0 1 0 0 1 0 0\",\n-            \"add port tm nonleaf node 1 900 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 800 1000 0 1 1 0 1 0 0\",\n-            \"add port tm nonleaf node 1 700 1000 0 1 1 0 1 0 0\",\n-            \"add port tm leaf node 1 0 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 1 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 2 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 3 900 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 4 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 5 800 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 6 700 0 1 2 0 0 0xffffffff 0 0\",\n-            \"add port tm leaf node 1 7 700 0 1 2 0 0 0xffffffff 0 0\",\n+            \"add port tm nonleaf node 1 1000 -1 0 1 0 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 900 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 800 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm nonleaf node 1 700 1000 0 1 1 -1 1 0 0\",\n+            \"add port tm leaf node 1 0 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 1 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 2 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 3 900 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 4 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 5 800 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 6 700 0 1 2 -1 0 0xffffffff 0 0\",\n+            \"add port tm leaf node 1 7 700 0 1 2 -1 0 0xffffffff 0 0\",\n             [\"port tm hierarchy commit 1 no\", self.check_error_output],\n             \"port start all\",\n             \"set fwd mac\",\n@@ -3112,7 +3113,7 @@ class TestICEDcfQos(TestCase):\n             self.vf_destroy()\n \n         try:\n-            self.pf_preset(num=1)\n+            self.pf_preset()\n             self.vf_init()\n             self.vf_create(*[[self.nic_100g], 2])\n             vfs_group = [info.get(\"vfs_pci\") for _, info in self.vf_ports_info.items()]\n",
    "prefixes": [
        "V1",
        "2/2"
    ]
}