Skip to content

[SmartSwitch] Adding backward compatibility for feature "enable/disable vxlan sport filtering" #23207

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

Open
congh-nvidia wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −7
Open

[SmartSwitch] Adding backward compatibility for feature "enable/disable vxlan sport filtering" #23207

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
4 changes: 4 additions & 0 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,10 @@ dash/test_dash_privatelink.py:
- "asic_type in ['vs'] and https://github.com/sonic-net/sonic-mgmt/issues/16407"
- "hwsku not in ['Cisco-8102-28FH-DPU-O-T1', 'Mellanox-SN4280-O8C40', 'Mellanox-SN4280-O28', 'Cisco-8102-28FH-DPU-O']"

dash/test_dash_privatelink.py::test_privatelink_udp_sport_range_negative:
skip:
reason: "The SONiC feature 'enable/disable VXLAN sport filtering' is not currently in the image. The skip will be removed when the feature is enabled."

dash/test_dash_privatelink_redirect.py:
skip:
conditions_logical_operator: or
Expand Down
12 changes: 9 additions & 3 deletions tests/dash/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,12 @@ def set_vxlan_udp_sport_range(dpuhosts, dpu_index):
{
"SWITCH_TABLE:switch": {
"vxlan_sport": VXLAN_UDP_BASE_SRC_PORT,
"vxlan_mask": VXLAN_UDP_SRC_PORT_MASK,
"vxlan_mask": VXLAN_UDP_SRC_PORT_MASK
},
"OP": "SET"
},
{
"SWITCH_TABLE:switch": {
"vxlan_security": "true"
},
"OP": "SET"
Expand All @@ -437,8 +442,9 @@ def set_vxlan_udp_sport_range(dpuhosts, dpu_index):

logger.info(f"Setting VXLAN source port config: {vxlan_sport_config}")
config_path = "/tmp/vxlan_sport_config.json"
dpuhost.copy(content=json.dumps(vxlan_sport_config, indent=4), dest=config_path, verbose=False)
apply_swssconfig_file(dpuhost, config_path)
for config in vxlan_sport_config:
dpuhost.copy(content=json.dumps([config], indent=4), dest=config_path, verbose=False)
apply_swssconfig_file(dpuhost, config_path)
if 'pensando' in dpuhost.facts['asic_type']:
logger.warning("Applying Pensando DPU VXLAN sport workaround")
dpuhost.shell("pdsctl debug update device --vxlan-port 4789 --vxlan-src-ports 5120-5247")
Expand Down
14 changes: 10 additions & 4 deletions tests/dash/test_dash_smartswitch_vnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,23 @@ def set_vxlan_udp_sport_range(dpuhosts, dpu_index):
{
"SWITCH_TABLE:switch": {
"vxlan_sport": VXLAN_UDP_BASE_SRC_PORT,
"vxlan_mask": VXLAN_UDP_SRC_PORT_MASK,
"vxlan_security": "true"
"vxlan_mask": VXLAN_UDP_SRC_PORT_MASK
},
"OP": "SET"
},
{
"SWITCH_TABLE:switch": {
"vxlan_security": "false"
},
"OP": "SET"
}
]

logger.info(f"Setting VXLAN source port config: {vxlan_sport_config}")
config_path = "/tmp/vxlan_sport_config.json"
dpuhost.copy(content=json.dumps(vxlan_sport_config, indent=4), dest=config_path, verbose=False)
apply_swssconfig_file(dpuhost, config_path)
for config in vxlan_sport_config:
dpuhost.copy(content=json.dumps([config], indent=4), dest=config_path, verbose=False)
apply_swssconfig_file(dpuhost, config_path)
if 'pensando' in dpuhost.facts['asic_type']:
logger.warning("Applying Pensando DPU VXLAN sport workaround")
dpuhost.shell("pdsctl debug update device --vxlan-port 4789 --vxlan-src-ports 5120-5247")
Expand Down
Loading