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

[config]: Create portchannel with LACP key #1473

Merged
merged 3 commits into from
Jun 21, 2021

Conversation

DavidZagury
Copy link
Contributor

@DavidZagury DavidZagury commented Mar 3, 2021

This PR depends on:

What I did

Fix issue - sonic-net/sonic-buildimage#4009
Change the LACP key to be generated from the Port Channel name instead of always being 0.
When upgrading without warm-reboot update old port channels to use the new default.

How I did it

When adding a new port-channel add by default the key lacp_key with the value 'auto' to the port-channel table, this is done to change the port-channel LACP key to be generated from the Port Channel name instead of always being 0.

When upgrading without warm-reboot, also update old port channels to use the new default.
This is not done on warm-reboot to avoid the link from going down.

How to verify it

Create a new port-channel, add a port and run tcpdump on this port.
LACP Key should be the number in the end of the port channel name with leading 1.

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

  • 201811
  • 201911
  • 202006
  • 202012

@DavidZagury DavidZagury changed the title Unique lacp key bug 4009 [config]: Create portchannel with LACP key Mar 3, 2021
config/main.py Outdated Show resolved Hide resolved
@DavidZagury DavidZagury force-pushed the unique_lacp_key_bug_4009 branch 5 times, most recently from dce8b59 to dafdcea Compare March 10, 2021 10:47
@liat-grozovik
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@liat-grozovik
Copy link
Collaborator

retest this please

scripts/db_migrator.py Outdated Show resolved Hide resolved
scripts/db_migrator.py Outdated Show resolved Hide resolved
@DavidZagury DavidZagury force-pushed the unique_lacp_key_bug_4009 branch 2 times, most recently from cfcbe42 to 4177043 Compare March 14, 2021 16:05
@liat-grozovik
Copy link
Collaborator

@yaxia and @judyjoseph any further comments or we are good to cont? tests are also passing :-)

@DavidZagury DavidZagury force-pushed the unique_lacp_key_bug_4009 branch 2 times, most recently from eea6435 to 1fdf2dc Compare April 4, 2021 14:52
@judyjoseph
Copy link
Contributor

@yaxia and @judyjoseph any further comments or we are good to cont? tests are also passing :-)

Sry, I missed responding earlier - @DavidZagury could you take care of Ying's comment to verify the config DB indeed has the lacp_key present in case of cold boot ? thanks

@DavidZagury DavidZagury force-pushed the unique_lacp_key_bug_4009 branch 3 times, most recently from f7e4652 to 3e1955a Compare April 22, 2021 11:42
@DavidZagury
Copy link
Contributor Author

@yaxia and @judyjoseph any further comments or we are good to cont? tests are also passing :-)

Sry, I missed responding earlier - @DavidZagury could you take care of Ying's comment to verify the config DB indeed has the lacp_key present in case of cold boot ? thanks

I have added a tests that check the db_migrator has added an lacp_key to the db

@DavidZagury DavidZagury force-pushed the unique_lacp_key_bug_4009 branch 2 times, most recently from 1239ad7 to f48161c Compare April 26, 2021 06:47
@liat-grozovik
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@DavidZagury DavidZagury force-pushed the unique_lacp_key_bug_4009 branch 2 times, most recently from 8a07160 to cf3faab Compare May 23, 2021 10:54
@judyjoseph
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@liat-grozovik
Copy link
Collaborator

kindly reminder @yxieca and @judyjoseph can you please review / approve?

@judyjoseph
Copy link
Contributor

@DavidZagury, could you resolve the conflicts, before we can merge in. thanks.

@DavidZagury DavidZagury force-pushed the unique_lacp_key_bug_4009 branch 2 times, most recently from 25ad3f1 to bbc0364 Compare June 6, 2021 07:40
@lguohan
Copy link
Contributor

lguohan commented Jun 7, 2021

can you add better description for the pr? for example, can you add description for the db_migrator change?

@sonic-net sonic-net deleted a comment from DavidZagury Jun 13, 2021
@liat-grozovik
Copy link
Collaborator

@lguohan and @tahmed-dev can you please review latest comments? if all is OK please approve so we can merge.

gitsabari pushed a commit to gitsabari/sonic-utilities that referenced this pull request Jun 15, 2021
…rator test cases as well (sonic-net#1614)

- What I did
Originally, the method advance_version_for_expected_database was introduced (in sonic-net#1566) to handle the case the latest version in CONFIG_DB is greater than the latest version in mellanox_buffer_migrator.
Now there are other database migrators whose test cases can also encounter this situation, like port auto-negotiation (sonic-net#1568) and port-channel for LACP key (sonic-net#1473).
So I would like to make the method public, available for all database migrators.
Related database migrator test cases have been updated accordingly.

- How to verify it
Run the unit test.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
@liat-grozovik
Copy link
Collaborator

@DavidZagury can you please confirm that all comments were handled include the test? If so, we can ask @lguohan to review and approve

@DavidZagury
Copy link
Contributor Author

@DavidZagury can you please confirm that all comments were handled include the test? If so, we can ask @lguohan to review and approve
@lguohan I have handled all the comments and added the checks in the tests that were requested

@judyjoseph judyjoseph merged commit 2cdadb5 into sonic-net:master Jun 21, 2021
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-utilities that referenced this pull request Aug 10, 2021
…rator test cases as well (sonic-net#1614)

- What I did
Originally, the method advance_version_for_expected_database was introduced (in sonic-net#1566) to handle the case the latest version in CONFIG_DB is greater than the latest version in mellanox_buffer_migrator.
Now there are other database migrators whose test cases can also encounter this situation, like port auto-negotiation (sonic-net#1568) and port-channel for LACP key (sonic-net#1473).
So I would like to make the method public, available for all database migrators.
Related database migrator test cases have been updated accordingly.

- How to verify it
Run the unit test.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-utilities that referenced this pull request Aug 10, 2021
What I did
Fix issue - sonic-net/sonic-buildimage#4009
Change the LACP key to be generated from the Port Channel name instead of always being 0.
When upgrading without warm-reboot update old port channels to use the new default.

How I did it
When adding a new port-channel add by default the key lacp_key with the value 'auto' to the port-channel table, this is done to change the port-channel LACP key to be generated from the Port Channel name instead of always being 0.

When upgrading without warm-reboot, also update old port channels to use the new default.
This is not done on warm-reboot to avoid the link from going down.
stepanblyschak pushed a commit to stepanblyschak/sonic-utilities that referenced this pull request Apr 28, 2022
d03c6ccc90b92d9319c500a8adcf727a9fa5609b (HEAD -> 201911, origin/201911) [intfsorch] Init proxy_arp variable while adding router interface. (sonic-net#1473)
9e7c0bc8e3f2c7c5422f2f8a2c6498f659dcdf84 [drop counters] Clarify log messages for initial counter setup (sonic-net#1445)
da8ac754fa1c36f9bb7ba1210017f915f339cfe0 Create vnet tunnel map only if it doesn't exist (sonic-net#1482)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
stepanblyschak pushed a commit to stepanblyschak/sonic-utilities that referenced this pull request Apr 28, 2022
Including the following changes:
[bitmap_vnet] Remove BMTOR implementation (sonic-net#1496)
[intfsorch] Init proxy_arp variable while adding router interface. (sonic-net#1473)
[drop counters] Clarify log messages for initial counter setup (sonic-net#1445)

Signed-off-by: Liat Grozovik <liatg@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants