Skip to content

[hash] update GH frontend with IPV6_FLOW_LABEL for ECMP/LAG switch hash configuration #3730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liat-grozovik merged 1 commit into from
Mar 13, 2025
Merged

[hash] update GH frontend with IPV6_FLOW_LABEL for ECMP/LAG switch hash configuration #3730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions doc/Command-Reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4712,6 +4712,7 @@ This command displays switch hash global configuration.
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
| LAG | +-------------------+-------------+ |
Expand All @@ -4733,6 +4734,7 @@ This command displays switch hash global configuration.
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
```
Expand Down Expand Up @@ -4776,6 +4778,7 @@ This command displays switch hash capabilities.
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
| LAG | +-------------------+-------------+ |
Expand All @@ -4799,6 +4802,7 @@ This command displays switch hash capabilities.
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
```
Expand Down Expand Up @@ -4838,7 +4842,8 @@ This command is used to manage switch hash global configuration.
'INNER_DST_IP' \
'INNER_SRC_IP' \
'INNER_L4_DST_PORT' \
'INNER_L4_SRC_PORT'
'INNER_L4_SRC_PORT' \
'IPV6_FLOW_LABEL'
admin@sonic:~$ config switch-hash global lag-hash \
'DST_MAC' \
'SRC_MAC' \
Expand All @@ -4855,7 +4860,8 @@ This command is used to manage switch hash global configuration.
'INNER_DST_IP' \
'INNER_SRC_IP' \
'INNER_L4_DST_PORT' \
'INNER_L4_SRC_PORT'
'INNER_L4_SRC_PORT' \
'IPV6_FLOW_LABEL'
```

**config switch-hash global ecmp/lag hash algorithm**
Expand Down
32 changes: 24 additions & 8 deletions tests/hash_input/assert_show_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
| LAG | +--------------+-------------+ |
Expand Down Expand Up @@ -57,7 +58,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": "CRC"
},
Expand Down Expand Up @@ -97,6 +99,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
"""
Expand All @@ -123,7 +126,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": "XOR"
}
Expand Down Expand Up @@ -153,6 +157,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
| LAG | +-------------------+-------------+ |
Expand All @@ -174,6 +179,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
"""
Expand All @@ -196,7 +202,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": "CRC"
},
Expand All @@ -217,7 +224,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": "XOR"
}
Expand Down Expand Up @@ -339,6 +347,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
| LAG | +---------------+---------------+ |
Expand Down Expand Up @@ -369,7 +378,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": [
"CRC",
Expand Down Expand Up @@ -419,6 +429,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
"""
Expand Down Expand Up @@ -447,7 +458,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": [
"CRC",
Expand Down Expand Up @@ -487,6 +499,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
| LAG | +-------------------+-------------+ |
Expand All @@ -510,6 +523,7 @@
| | | INNER_SRC_IP | | |
| | | INNER_L4_DST_PORT | | |
| | | INNER_L4_SRC_PORT | | |
| | | IPV6_FLOW_LABEL | | |
| | +-------------------+-------------+ |
+--------+-------------------------------------+
"""
Expand All @@ -534,7 +548,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": [
"CRC",
Expand Down Expand Up @@ -565,7 +580,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
],
"algorithm": [
"CRC",
Expand Down
2 changes: 1 addition & 1 deletion tests/hash_input/mock_config/ecmp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SWITCH_HASH|GLOBAL": {
"ecmp_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"ecmp_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"ecmp_hash_algorithm": "CRC"
}
}
4 changes: 2 additions & 2 deletions tests/hash_input/mock_config/ecmp_and_lag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"SWITCH_HASH|GLOBAL": {
"ecmp_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"lag_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"ecmp_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"lag_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"ecmp_hash_algorithm": "CRC",
"lag_hash_algorithm": "XOR"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/hash_input/mock_config/lag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SWITCH_HASH|GLOBAL": {
"lag_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"lag_hash@": "DST_MAC,SRC_MAC,ETHERTYPE,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"lag_hash_algorithm": "XOR"
}
}
2 changes: 1 addition & 1 deletion tests/hash_input/mock_state/ecmp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"LAG_HASH_CAPABLE": "false",
"ECMP_HASH_ALGORITHM_CAPABLE": "true",
"LAG_HASH_ALGORITHM_CAPABLE": "false",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"ECMP_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR",
"LAG_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/hash_input/mock_state/ecmp_and_lag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"LAG_HASH_CAPABLE": "true",
"ECMP_HASH_ALGORITHM_CAPABLE": "true",
"LAG_HASH_ALGORITHM_CAPABLE": "true",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"ECMP_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR",
"LAG_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/hash_input/mock_state/empty.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"LAG_HASH_CAPABLE": "false",
"ECMP_HASH_ALGORITHM_CAPABLE": "false",
"LAG_HASH_ALGORITHM_CAPABLE": "false",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"ECMP_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR",
"LAG_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/hash_input/mock_state/lag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"LAG_HASH_CAPABLE": "true",
"ECMP_HASH_ALGORITHM_CAPABLE": "false",
"LAG_HASH_ALGORITHM_CAPABLE": "true",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT",
"HASH|NATIVE_HASH_FIELD_LIST": "IN_PORT,DST_MAC,SRC_MAC,ETHERTYPE,VLAN_ID,IP_PROTOCOL,DST_IP,SRC_IP,L4_DST_PORT,L4_SRC_PORT,INNER_DST_MAC,INNER_SRC_MAC,INNER_ETHERTYPE,INNER_IP_PROTOCOL,INNER_DST_IP,INNER_SRC_IP,INNER_L4_DST_PORT,INNER_L4_SRC_PORT,IPV6_FLOW_LABEL",
"ECMP_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR",
"LAG_HASH_ALGORITHM": "CRC,XOR,RANDOM,CRC_32LO,CRC_32HI,CRC_CCITT,CRC_XOR"
}
Expand Down
3 changes: 2 additions & 1 deletion utilities_common/switch_hash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"INNER_DST_IP",
"INNER_SRC_IP",
"INNER_L4_DST_PORT",
"INNER_L4_SRC_PORT"
"INNER_L4_SRC_PORT",
"IPV6_FLOW_LABEL"
]

HASH_ALGORITHM = [
Expand Down