Skip to content

Commit

Permalink
Rename the leaf nodes to lower case. (#18704)
Browse files Browse the repository at this point in the history 
### Why I did it
Consolidate the `numvoq`, `coreid`, `coreportid` to be lower case which matches other leaf node convention.

### How I did it

Rename to lower case.

#### How to verify it
No need to verify.
  • Loading branch information
@xincunli-sonic
xincunli-sonic committed Apr 26, 2024
1 parent 3f36abf commit 879cd74
Show file tree
Hide file tree
Showing 16 changed files with 56 additions and 56 deletions.
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 12 additions & 12 deletions dockers/docker-macsec/cli-plugin-tests/config_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
18 changes: 9 additions & 9 deletions src/sonic-yang-models/doc/Configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1378,9 +1378,9 @@ optional attributes.
"link_training": "off",
"laser_freq": "191300",
"tx_power": "-27.3",
"coreId": "1",
"corePortId": "1",
"numVoq": "8"
"core_id": "1",
"core_port_id": "1",
"num_voq": "8"
},
"Ethernet1": {
"index": "1",
Expand All @@ -1393,9 +1393,9 @@ optional attributes.
"link_training": "on",
"laser_freq": "191300",
"tx_power": "-27.3",
"coreId": "0",
"corePortId": "14",
"numVoq": "8"
"core_id": "0",
"core_port_id": "14",
"num_voq": "8"
},
"Ethernet63": {
"index": "63",
Expand All @@ -1406,9 +1406,9 @@ optional attributes.
"speed": "40000",
"laser_freq": "191300",
"tx_power": "-27.3",
"coreId": "0",
"corePortId": "15",
"numVoq": "8"
"core_id": "0",
"core_port_id": "15",
"num_voq": "8"
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions src/sonic-yang-models/tests/files/sample_config_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,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",
Expand All @@ -468,9 +468,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",
Expand All @@ -485,9 +485,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",
Expand Down
18 changes: 9 additions & 9 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,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",
Expand All @@ -253,9 +253,9 @@
{
"name": "Ethernet8",
"alias": "eth8",
"coreId": "1",
"corePortId": "1",
"numVoq": "8",
"core_id": "2",
"core_port_id": "2",
"num_voq": "8",
"lanes": "65",
"speed": 25000,
"autoneg": "on",
Expand All @@ -273,9 +273,9 @@
{
"name": "Ethernet8",
"alias": "eth8",
"coreId": "1",
"corePortId": "1",
"numVoq": "8",
"core_id": "3",
"core_port_id": "3",
"num_voq": "8",
"lanes": "65",
"speed": 25000,
"autoneg": "on",
Expand Down
12 changes: 6 additions & 6 deletions src/sonic-yang-models/yang-models/sonic-port.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ module sonic-port{
}
}

leaf numVoq {
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 coreId {
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 corePortId {
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;
}
Expand Down

0 comments on commit 879cd74

Please sign in to comment.