Skip to content
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.

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

Macsec fix for portchannel workaround only for Broadcom dnx platforms #10732

Merged
merged 27 commits into from
Nov 15, 2023
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
febcacd
Added test case to verify ebtables rules.
abdosi Feb 6, 2021
9582616
Merge remote-tracking branch 'upstream/master'
abdosi Feb 9, 2021
940ebe4
Merge remote-tracking branch 'upstream/master'
abdosi Feb 28, 2021
36feb13
Merge remote-tracking branch 'upstream/master'
abdosi Mar 9, 2021
ab4beee
Merge remote-tracking branch 'upstream/master'
abdosi Mar 16, 2021
8d59326
Merge remote-tracking branch 'upstream/master'
abdosi Mar 18, 2021
fa03609
Merge remote-tracking branch 'upstream/master'
abdosi Mar 18, 2021
532639a
Merge remote-tracking branch 'upstream/master'
abdosi May 14, 2021
0833669
Merge remote-tracking branch 'upstream/master'
abdosi Jun 28, 2021
f2dbf92
Merge remote-tracking branch 'upstream/master'
abdosi Oct 4, 2021
915dc97
Merge remote-tracking branch 'upstream/master'
abdosi Oct 12, 2021
1aacc7a
Merge remote-tracking branch 'upstream/master'
abdosi Oct 12, 2021
6ca8577
Merge remote-tracking branch 'upstream/master'
abdosi Oct 13, 2021
7ad4900
Merge remote-tracking branch 'upstream/master'
abdosi Oct 27, 2021
a6d5c16
Fix to avoid overlap of Front Port Channel and Internal Pot Channel
abdosi Oct 27, 2021
03453b0
Merge remote-tracking branch 'upstream/master'
abdosi Nov 18, 2021
5fce19c
Merge remote-tracking branch 'upstream/master'
abdosi Jan 21, 2022
501698b
Merge branch 'master' of https://github.com/abdosi/sonic-mgmt
abdosi Feb 13, 2022
e7b6504
Merge remote-tracking branch 'upstream/master'
abdosi Jun 27, 2023
402c17c
Merge remote-tracking branch 'upstream/master'
abdosi Aug 4, 2023
fe770ed
Increase wait time for link up post config reload/minigraph for modular
abdosi Aug 4, 2023
dddc82a
Merge remote-tracking branch 'upstream/master'
abdosi Aug 16, 2023
6266b90
Merge remote-tracking branch 'upstream/master'
abdosi Nov 14, 2023
d044f9f
ignore ttl check not using the correct ip header for outer ipv4 and
abdosi Nov 14, 2023
23f0685
Revert "Increase wait time for link up post config reload/minigraph f…
abdosi Nov 14, 2023
4ce6724
Revert "ignore ttl check not using the correct ip header for outer ip…
abdosi Nov 14, 2023
823eef4
macsec port channel workaround to remove/add member port applies only
abdosi Nov 14, 2023
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
13 changes: 9 additions & 4 deletions tests/macsec/macsec_config_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,17 @@ def enable_macsec_port(host, port, profile_name):
return

pc = find_portchannel_from_member(port, get_portchannel(host))
if pc:

dnx_platform = host.facts.get("platform_asic") == 'broadcom-dnx'

if dnx_platform and pc:
host.command("sudo config portchannel {} member del {} {}".format(getns_prefix(host, port), pc["name"], port))
time.sleep(2)

cmd = "sonic-db-cli {} CONFIG_DB HSET 'PORT|{}' 'macsec' '{}'".format(getns_prefix(host, port), port, profile_name)
host.command(cmd)

if pc:
if dnx_platform and pc:
time.sleep(2)
host.command("sudo config portchannel {} member add {} {}".format(getns_prefix(host, port), pc["name"], port))

Expand All @@ -116,14 +119,16 @@ def disable_macsec_port(host, port):
return

pc = find_portchannel_from_member(port, get_portchannel(host))
if pc:
dnx_platform = host.facts.get("platform_asic") == 'broadcom-dnx'

if dnx_platform and pc:
host.command("sudo config portchannel {} member del {} {}".format(getns_prefix(host, port), pc["name"], port))
time.sleep(2)

cmd = "sonic-db-cli {} CONFIG_DB HDEL 'PORT|{}' 'macsec'".format(getns_prefix(host, port), port)
host.command(cmd)

if pc:
if dnx_platform and pc:
time.sleep(2)
host.command("sudo config portchannel {} member add {} {}".format(getns_prefix(host, port), pc["name"], port))

Expand Down