From 987c5432a4942e6ef8064ac7ca9ca63506af8ba4 Mon Sep 17 00:00:00 2001 From: Xincun Li Date: Wed, 17 Apr 2024 17:22:59 -0700 Subject: [PATCH 1/7] Rename the leaf nodes to lower case. --- src/sonic-yang-models/yang-models/sonic-port.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sonic-yang-models/yang-models/sonic-port.yang b/src/sonic-yang-models/yang-models/sonic-port.yang index 2036a1f2fdbe..c6ad4453dca2 100644 --- a/src/sonic-yang-models/yang-models/sonic-port.yang +++ b/src/sonic-yang-models/yang-models/sonic-port.yang @@ -39,21 +39,21 @@ module sonic-port{ } } - leaf numVoq { + leaf numvoq { description "The number of virtual output queue supportted on this port."; type string { length 1..16; } } - leaf coreId { + leaf coreid { description "The ASIC core where the port belongs to."; type string { length 1..16; } } - leaf corePortId { + leaf coreportid { description "The ASIC core port for this port."; type string { length 1..16; From 7d38e6aa3be695c2eb21ce7622a5b5fe34249159 Mon Sep 17 00:00:00 2001 From: Xincun Li Date: Thu, 18 Apr 2024 09:18:38 -0700 Subject: [PATCH 2/7] fix example --- src/sonic-yang-models/doc/Configuration.md | 18 +++++++++--------- .../tests/files/sample_config_db.json | 18 +++++++++--------- .../yang_model_tests/tests_config/port.json | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 2ffbba945f8b..0423b70a7da8 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -1811,9 +1811,9 @@ optional attributes. "laser_freq": "191300", "tx_power": "-27.3", "dom_polling": "enabled", - "coreId": "1", - "corePortId": "1", - "numVoq": "8" + "coreid": "1", + "coreportid": "1", + "numvoq": "8" }, "Ethernet1": { "index": "1", @@ -1827,9 +1827,9 @@ optional attributes. "laser_freq": "191300", "tx_power": "-27.3", "dom_polling": "enabled", - "coreId": "0", - "corePortId": "14", - "numVoq": "8" + "coreid": "0", + "coreportid": "14", + "numvoq": "8" }, "Ethernet63": { "index": "63", @@ -1841,9 +1841,9 @@ optional attributes. "laser_freq": "191300", "tx_power": "-27.3", "dom_polling": "disabled", - "coreId": "0", - "corePortId": "15", - "numVoq": "8" + "coreid": "0", + "coreportid": "15", + "numvoq": "8" } } } diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index 50ffc18b7b85..eed6f899f724 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -566,9 +566,9 @@ "PORT": { "Ethernet0": { "alias": "Eth1/1", - "coreId": "1", - "corePortId": "1", - "numVoq": "8", + "coreid": "1", + "coreportid": "1", + "numvoq": "8", "lanes": "65", "description": "", "speed": "11100", @@ -585,9 +585,9 @@ }, "Ethernet1": { "alias": "Eth1/2", - "coreId": "1", - "corePortId": "1", - "numVoq": "8", + "coreid": "1", + "coreportid": "1", + "numvoq": "8", "lanes": "66", "description": "", "speed": "11100", @@ -603,9 +603,9 @@ }, "Ethernet2": { "alias": "Eth1/3", - "coreId": "1", - "corePortId": "1", - "numVoq": "8", + "coreid": "1", + "coreportid": "1", + "numvoq": "8", "lanes": "67", "description": "", "speed": "11100", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json index 562aaf56c4a1..b17cb9896d61 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json @@ -285,9 +285,9 @@ { "name": "Ethernet8", "alias": "eth8", - "coreId": "1", - "corePortId": "1", - "numVoq": "8", + "coreid": "1", + "coreportid": "1", + "numvoq": "8", "lanes": "65", "speed": 25000, "autoneg": "on", @@ -305,9 +305,9 @@ { "name": "Ethernet8", "alias": "eth8", - "coreId": "1", - "corePortId": "1", - "numVoq": "8", + "coreid": "1", + "coreportid": "1", + "numvoq": "8", "lanes": "65", "speed": 25000, "autoneg": "on", @@ -325,9 +325,9 @@ { "name": "Ethernet8", "alias": "eth8", - "coreId": "1", - "corePortId": "1", - "numVoq": "8", + "coreid": "1", + "coreportid": "1", + "numvoq": "8", "lanes": "65", "speed": 25000, "autoneg": "on", From 0fb6179d0337346682fd5e307cc3b80fd119fea4 Mon Sep 17 00:00:00 2001 From: Xincun Li Date: Thu, 18 Apr 2024 14:22:54 -0700 Subject: [PATCH 3/7] rename with snake case --- .../Nokia-IXR7250E-36x100G/0/port_config.ini | 2 +- .../Nokia-IXR7250E-36x100G/1/port_config.ini | 2 +- .../Nokia-IXR7250E-36x400G/0/port_config.ini | 2 +- .../Nokia-IXR7250E-36x400G/1/port_config.ini | 2 +- .../cli-plugin-tests/config_db.json | 24 +++++++++---------- src/sonic-yang-models/doc/Configuration.md | 18 +++++++------- .../tests/files/sample_config_db.json | 18 +++++++------- .../yang_model_tests/tests_config/port.json | 18 +++++++------- .../yang-models/sonic-port.yang | 6 ++--- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini index d9df84b6ed9a..8b4e625ec7a5 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreid coreportid numvoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0 1 1 8 Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8 1 2 8 Ethernet16 88,89,90,91 Ethernet3/1 3 Ext 100000 Eth16 1 3 8 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini index 4d769b17db84..6c4b7ef3bf6e 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreid coreportid numvoq +# name lanes alias index role speed asic_port_name coreid core_port_id num_voq Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth0 1 1 8 Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth8 1 2 8 Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth16 1 3 8 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini index 478b5cb1ca60..18449e8cbcba 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreid coreportid numvoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet0 72,73,74,75,76,77,78,79 Ethernet1/1 1 Ext 400000 Eth0 1 1 8 Ethernet8 80,81,82,83,84,85,86,87 Ethernet2/1 2 Ext 400000 Eth8 1 2 8 Ethernet16 88,89,90,91,92,93,94,95 Ethernet3/1 3 Ext 400000 Eth16 1 3 8 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini index 92c0731ddcc5..faccc8e39def 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreid coreportid numvoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet144 72,73,74,75,76,77,78,79 Ethernet19/1 19 Ext 400000 Eth0 1 1 8 Ethernet152 80,81,82,83,84,85,86,87 Ethernet20/1 20 Ext 400000 Eth8 1 2 8 Ethernet160 88,89,90,91,92,93,94,95 Ethernet21/1 21 Ext 400000 Eth16 1 3 8 diff --git a/dockers/docker-macsec/cli-plugin-tests/config_db.json b/dockers/docker-macsec/cli-plugin-tests/config_db.json index 9f4c266d4284..d145fb7c724e 100644 --- a/dockers/docker-macsec/cli-plugin-tests/config_db.json +++ b/dockers/docker-macsec/cli-plugin-tests/config_db.json @@ -11,14 +11,14 @@ "PORT|Ethernet0": { "alias": "Ethernet1/1", "asic_port_name": "Eth0-ASIC0", - "coreid": "1", - "coreportid": "1", + "core_id": "1", + "core_port_id": "1", "description": "Ethernet1/1", "index": "1", "lanes": "72,73,74,75,76,77,78,79", "macsec": "macsec_profile", "mtu": "9100", - "numvoq": "8", + "num_voq": "8", "pfc_asym": "off", "role": "Ext", "speed": "400000", @@ -27,14 +27,14 @@ "PORT|Ethernet1": { "alias": "Ethernet2/1", "asic_port_name": "Eth0-ASIC0", - "coreid": "1", - "coreportid": "1", + "core_id": "1", + "core_port_id": "1", "description": "Ethernet2/1", "index": "1", "lanes": "72,73,74,75,76,77,78,79", "macsec": "macsec_profile", "mtu": "9100", - "numvoq": "8", + "num_voq": "8", "pfc_asym": "off", "role": "Ext", "speed": "400000", @@ -43,14 +43,14 @@ "PORT|Ethernet4": { "alias": "Ethernet5/1", "asic_port_name": "Eth0-ASIC0", - "coreid": "1", - "coreportid": "1", + "core_id": "1", + "core_port_id": "1", "description": "Ethernet5/1", "index": "1", "lanes": "72,73,74,75,76,77,78,79", "macsec": "macsec_profile", "mtu": "9100", - "numvoq": "8", + "num_voq": "8", "pfc_asym": "off", "role": "Ext", "speed": "400000", @@ -59,14 +59,14 @@ "PORT|Ethernet5": { "alias": "Ethernet6/1", "asic_port_name": "Eth0-ASIC0", - "coreid": "1", - "coreportid": "1", + "core_id": "1", + "core_port_id": "1", "description": "Ethernet6/1", "index": "1", "lanes": "72,73,74,75,76,77,78,79", "macsec": "macsec_profile", "mtu": "9100", - "numvoq": "8", + "num_voq": "8", "pfc_asym": "off", "role": "Ext", "speed": "400000", diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 0423b70a7da8..ad4c1afdfbee 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -1811,9 +1811,9 @@ optional attributes. "laser_freq": "191300", "tx_power": "-27.3", "dom_polling": "enabled", - "coreid": "1", - "coreportid": "1", - "numvoq": "8" + "core_id": "1", + "core_port_id": "1", + "num_voq": "8" }, "Ethernet1": { "index": "1", @@ -1827,9 +1827,9 @@ optional attributes. "laser_freq": "191300", "tx_power": "-27.3", "dom_polling": "enabled", - "coreid": "0", - "coreportid": "14", - "numvoq": "8" + "core_id": "0", + "core_port_id": "14", + "num_voq": "8" }, "Ethernet63": { "index": "63", @@ -1841,9 +1841,9 @@ optional attributes. "laser_freq": "191300", "tx_power": "-27.3", "dom_polling": "disabled", - "coreid": "0", - "coreportid": "15", - "numvoq": "8" + "core_id": "0", + "core_port_id": "15", + "num_voq": "8" } } } diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index eed6f899f724..99d6c2556e6c 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -566,9 +566,9 @@ "PORT": { "Ethernet0": { "alias": "Eth1/1", - "coreid": "1", - "coreportid": "1", - "numvoq": "8", + "core_id": "1", + "core_port_id": "1", + "num_voq": "8", "lanes": "65", "description": "", "speed": "11100", @@ -585,9 +585,9 @@ }, "Ethernet1": { "alias": "Eth1/2", - "coreid": "1", - "coreportid": "1", - "numvoq": "8", + "core_id": "1", + "core_port_id": "1", + "num_voq": "8", "lanes": "66", "description": "", "speed": "11100", @@ -603,9 +603,9 @@ }, "Ethernet2": { "alias": "Eth1/3", - "coreid": "1", - "coreportid": "1", - "numvoq": "8", + "core_id": "1", + "core_port_id": "1", + "num_voq": "8", "lanes": "67", "description": "", "speed": "11100", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json index b17cb9896d61..6695b358a60b 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json @@ -285,9 +285,9 @@ { "name": "Ethernet8", "alias": "eth8", - "coreid": "1", - "coreportid": "1", - "numvoq": "8", + "core_id": "1", + "core_port_id": "1", + "num_voq": "8", "lanes": "65", "speed": 25000, "autoneg": "on", @@ -305,9 +305,9 @@ { "name": "Ethernet8", "alias": "eth8", - "coreid": "1", - "coreportid": "1", - "numvoq": "8", + "core_id": "1", + "core_port_id": "1", + "num_voq": "8", "lanes": "65", "speed": 25000, "autoneg": "on", @@ -325,9 +325,9 @@ { "name": "Ethernet8", "alias": "eth8", - "coreid": "1", - "coreportid": "1", - "numvoq": "8", + "core_id": "1", + "core_port_id": "1", + "num_voq": "8", "lanes": "65", "speed": 25000, "autoneg": "on", diff --git a/src/sonic-yang-models/yang-models/sonic-port.yang b/src/sonic-yang-models/yang-models/sonic-port.yang index c6ad4453dca2..02629f4955ef 100644 --- a/src/sonic-yang-models/yang-models/sonic-port.yang +++ b/src/sonic-yang-models/yang-models/sonic-port.yang @@ -39,21 +39,21 @@ module sonic-port{ } } - leaf numvoq { + leaf num_voq { description "The number of virtual output queue supportted on this port."; type string { length 1..16; } } - leaf coreid { + leaf core_id { description "The ASIC core where the port belongs to."; type string { length 1..16; } } - leaf coreportid { + leaf core_port_id { description "The ASIC core port for this port."; type string { length 1..16; From 8cdd8bfda28aa82774b1d3048eed100c817b2917 Mon Sep 17 00:00:00 2001 From: Xincun Li Date: Thu, 18 Apr 2024 15:32:30 -0700 Subject: [PATCH 4/7] Minor fix for port_config.ini --- .../Nokia-IXR7250E-36x100G/1/port_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini index 6c4b7ef3bf6e..630e5109d077 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreid core_port_id num_voq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth0 1 1 8 Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth8 1 2 8 Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth16 1 3 8 From 3174f8e21392d6f5efa90343b9951d0f7b2dde10 Mon Sep 17 00:00:00 2001 From: Xincun Li <147451452+xincunli-sonic@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:24:07 -0700 Subject: [PATCH 5/7] Update port.json for retrigger build --- .../tests/yang_model_tests/tests_config/port.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json index 6695b358a60b..37c5606c1c33 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json @@ -305,8 +305,8 @@ { "name": "Ethernet8", "alias": "eth8", - "core_id": "1", - "core_port_id": "1", + "core_id": "2", + "core_port_id": "2", "num_voq": "8", "lanes": "65", "speed": 25000, @@ -325,8 +325,8 @@ { "name": "Ethernet8", "alias": "eth8", - "core_id": "1", - "core_port_id": "1", + "core_id": "3", + "core_port_id": "3", "num_voq": "8", "lanes": "65", "speed": 25000, From 20258c2bb801049754b60b6ae54c4d16e62c8219 Mon Sep 17 00:00:00 2001 From: Xincun Li Date: Mon, 22 Apr 2024 10:54:32 -0700 Subject: [PATCH 6/7] rename name in arista port_config.ini --- .../Arista-7800R3-48CQ2-C48/port_config.ini | 2 +- .../Arista-7800R3A-36D2-C36/0/port_config.ini | 2 +- .../Arista-7800R3A-36D2-C36/1/port_config.ini | 2 +- .../Arista-7800R3A-36D2-C72/0/port_config.ini | 2 +- .../Arista-7800R3A-36D2-C72/1/port_config.ini | 2 +- .../Arista-7800R3A-36D2-D36/0/port_config.ini | 2 +- .../Arista-7800R3A-36D2-D36/1/port_config.ini | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini index 07a78421dd4b..3f5543738aa6 100644 --- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreId corePortId numVoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet0 6,7 Ethernet1/1 1 Ext 100000 Eth0 0 1 8 Ethernet4 2,3 Ethernet2/1 2 Ext 100000 Eth4 0 2 8 Ethernet8 4,5 Ethernet3/1 3 Ext 100000 Eth8 0 3 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini index a67c9b3f7d2f..c199d4af0b47 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreId corePortId numVoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0 1 1 8 Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8 1 2 8 Ethernet16 88,89,90,91 Ethernet3/1 3 Ext 100000 Eth16 1 3 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini index e8fd3d7906e8..3cd1cc0d1493 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreId corePortId numVoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth0 1 1 8 Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth8 1 2 8 Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth16 1 3 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini index f9f02ffb83a0..e38d580c72cd 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreId corePortId numVoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0 1 1 8 Ethernet4 76,77,78,79 Ethernet1/5 1 Ext 100000 Eth4 1 2 8 Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8 1 3 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini index 1366612874cb..ce3155c52751 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreId corePortId numVoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth144 1 1 8 Ethernet148 76,77,78,79 Ethernet19/5 19 Ext 100000 Eth148 1 2 8 Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth152 1 3 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini index d6b5da8404dd..3ba9272d43a4 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreId corePortId numVoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet0 72,73,74,75,76,77,78,79 Ethernet1/1 1 Ext 400000 Eth0 1 1 8 Ethernet8 80,81,82,83,84,85,86,87 Ethernet2/1 2 Ext 400000 Eth8 1 2 8 Ethernet16 88,89,90,91,92,93,94,95 Ethernet3/1 3 Ext 400000 Eth16 1 3 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini index 7416fc3280fd..873c1713a309 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini @@ -1,4 +1,4 @@ -# name lanes alias index role speed asic_port_name coreId corePortId numVoq +# name lanes alias index role speed asic_port_name core_id core_port_id num_voq Ethernet144 72,73,74,75,76,77,78,79 Ethernet19/1 19 Ext 400000 Eth0 1 1 8 Ethernet152 80,81,82,83,84,85,86,87 Ethernet20/1 20 Ext 400000 Eth8 1 2 8 Ethernet160 88,89,90,91,92,93,94,95 Ethernet21/1 21 Ext 400000 Eth16 1 3 8 From f625c9a8ed33372df9f4737793f42d4ffac2fd68 Mon Sep 17 00:00:00 2001 From: Xincun Li <147451452+xincunli-sonic@users.noreply.github.com> Date: Tue, 23 Apr 2024 16:59:18 -0700 Subject: [PATCH 7/7] Update sonic-port.yang --- src/sonic-yang-models/yang-models/sonic-port.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sonic-yang-models/yang-models/sonic-port.yang b/src/sonic-yang-models/yang-models/sonic-port.yang index 02629f4955ef..163e19fc841b 100644 --- a/src/sonic-yang-models/yang-models/sonic-port.yang +++ b/src/sonic-yang-models/yang-models/sonic-port.yang @@ -39,22 +39,22 @@ module sonic-port{ } } - leaf num_voq { - description "The number of virtual output queue supportted on this port."; + leaf core_id { + description "The ASIC core where the port belongs to."; type string { length 1..16; } } - leaf core_id { - description "The ASIC core where the port belongs to."; + leaf core_port_id { + description "The ASIC core port for this port."; type string { length 1..16; } } - leaf core_port_id { - description "The ASIC core port for this port."; + leaf num_voq { + description "The number of virtual output queue supportted on this port."; type string { length 1..16; }