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.

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

Jump to bottom

[docker-teamd]: Explicitly set LAG hwaddr #664

Merged
merged 5 commits into from
Jun 6, 2017
Merged

[docker-teamd]: Explicitly set LAG hwaddr #664

merged 5 commits into from
Jun 6, 2017

Conversation

marian-pritsak
Copy link
Collaborator

Team device is initially created without any members and has a random HW
address, which is later changed to port's address. This configuration
sets team device's address explicitly to base MAC to avoid reassignment.

Signed-off-by: marian-pritsak marianp@mellanox.com

@marian-pritsak
[docker-teamd]: Explicitly set LAG hwaddr
5b76aa3 
Team device is initially created without any members and has a random HW
address, which is later changed to port's address. This configuration
sets team device's address explicitly to base MAC to avoid reassignment.

Signed-off-by: marian-pritsak <marianp@mellanox.com>
@lguohan
Copy link
Collaborator

lguohan commented Jun 2, 2017

test fails, can you check?

@lguohan
Copy link
Collaborator

lguohan commented Jun 2, 2017 •
edited

also, I think centec also use your approach to set up the switch mac, can you check? https://github.com/Azure/sonic-sairedis/blob/master/syncd/scripts/syncd_init_common.sh#L63

lguohan
lguohan requested changes Jun 2, 2017
View reviewed changes
Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the comments.

oleksandrivantsiv
oleksandrivantsiv reviewed Jun 2, 2017
View reviewed changes
dockers/docker-teamd/start.sh Outdated
SONIC_ASIC_TYPE=$(sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type)
MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')

# Nellanox platform requires has last byte aligned
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

marian-pritsak and others added 3 commits June 6, 2017 10:35
@marian-pritsak
Update teamd config tests with hwaddr
7cfc37f 
Signed-off-by: marian-pritsak <marianp@mellanox.com>
@marian-pritsak
Align HW addr byte for Centec and Mellanox
5fedd44 
Signed-off-by: marian-pritsak <marianp@mellanox.com>
@lguohan
Merge branch 'master' into lag-hwaddr
5670f4a
lguohan
lguohan requested changes Jun 6, 2017
View reviewed changes
src/sonic-config-engine/tests/sample_output/PortChannel04.conf Outdated
@@ -1,5 +1,6 @@
{
"device": "PortChannel04",
"hwaddr": "11:22:33:44:55:66",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

11 is multicast address, not a valid src mac address.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@marian-pritsak
Change HW addr to unicast in config tests
fddae34 
Signed-off-by: marian-pritsak <marianp@mellanox.com>
@lguohan lguohan merged commit 820e7aa into sonic-net:master Jun 6, 2017
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Nov 1, 2018
@lguohan
[submodules]: update sonic-swss and sonic-sairedis
e66fda4 
swss:

* 863b69c 2018-11-01 | [teamsyncd]: Fix bug when removing selectable in select function (sonic-net#665) (HEAD, origin/master, origin/HEAD) [Shuotian Cheng]
* 2c83b68 2018-10-31 | Warm reboot: bring up ports for whole system warm reboot (sonic-net#653) [Qi Luo]
* d049d65 2018-10-31 | [vstest]: get subscribed objects from appdb and asicdb (sonic-net#664) [lguohan]
* 057a329 2018-10-31 | [vstest]: change the redis mount point when --dvsname is provided. (sonic-net#663) [lguohan]
* 34e157e 2018-10-31 | [VS]: fix swss warm restart test (sonic-net#662) [Jipan Yang]

sairedis:

* c612c5e 2018-11-01 | Add specific comparison logic for more objects (sonic-net#360) (HEAD, origin/master, origin/HEAD) [Kamil Cudnik]
* a6b709a 2018-10-31 | [syncd] re-establish notifications after warm boot (sonic-net#368) [Ying Xie]
* d655d20 2018-10-29 | [syncd] partial warm recovery support (sonic-net#352) [Ying Xie]
* 4d9aa18 2018-10-29 | Add missing object types to virtual switch (sonic-net#364) [Kamil Cudnik]
* 1fdaf47 2018-10-29 | Add VS support for setting stats via redis DB channel (sonic-net#366) [Kamil Cudnik]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
@lguohan lguohan mentioned this pull request Nov 1, 2018
Merged
lguohan added a commit that referenced this pull request Nov 1, 2018
@lguohan
[submodules]: update sonic-swss and sonic-sairedis (#2220)
d392004 
swss:

* 863b69c 2018-11-01 | [teamsyncd]: Fix bug when removing selectable in select function (#665) (HEAD, origin/master, origin/HEAD) [Shuotian Cheng]
* 2c83b68 2018-10-31 | Warm reboot: bring up ports for whole system warm reboot (#653) [Qi Luo]
* d049d65 2018-10-31 | [vstest]: get subscribed objects from appdb and asicdb (#664) [lguohan]
* 057a329 2018-10-31 | [vstest]: change the redis mount point when --dvsname is provided. (#663) [lguohan]
* 34e157e 2018-10-31 | [VS]: fix swss warm restart test (#662) [Jipan Yang]

sairedis:

* c612c5e 2018-11-01 | Add specific comparison logic for more objects (#360) (HEAD, origin/master, origin/HEAD) [Kamil Cudnik]
* a6b709a 2018-10-31 | [syncd] re-establish notifications after warm boot (#368) [Ying Xie]
* d655d20 2018-10-29 | [syncd] partial warm recovery support (#352) [Ying Xie]
* 4d9aa18 2018-10-29 | Add missing object types to virtual switch (#364) [Kamil Cudnik]
* 1fdaf47 2018-10-29 | Add VS support for setting stats via redis DB channel (#366) [Kamil Cudnik]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Oct 2, 2019
@yxieca
[201811][swss][utilities] advance sub module head
0890719 
Submodule src/sonic-swss fcd091c..9585be4:
  > [teamsyncd]: Check if LAG exists before removing (sonic-net#1069)
  > [mirrororch]: Toggle the mirror session when moving between VLAN/non-VLAN (sonic-net#1078)

Submodule src/sonic-utilities 7bb6ffb..2d721de:
  > [show] Properly replace port name with alias in command output (sonic-net#664)
  > [neighbor_advertiser] hand pick partial change from sonic-net#525 (sonic-net#689)
  > Revert "Revert "Fixed config Asym PFC CLI. (sonic-net#632)" (sonic-net#652)"

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@yxieca yxieca mentioned this pull request Oct 2, 2019
Merged
yxieca added a commit that referenced this pull request Oct 3, 2019
@yxieca
[201811][swss][utilities] advance sub module head (#3552)
40ad3fd 
* [201811][swss][utilities] advance sub module head

Submodule src/sonic-swss fcd091c..9585be4:
  > [teamsyncd]: Check if LAG exists before removing (#1069)
  > [mirrororch]: Toggle the mirror session when moving between VLAN/non-VLAN (#1078)

Submodule src/sonic-utilities 7bb6ffb..2d721de:
  > [show] Properly replace port name with alias in command output (#664)
  > [neighbor_advertiser] hand pick partial change from #525 (#689)
  > Revert "Revert "Fixed config Asym PFC CLI. (#632)" (#652)"

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* address compile issue

Submodule src/sonic-swss 9585be4..2529d79:
  > [mirrororch]: Address compiler switch issue (#1079)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
@lguohan
[vstest]: get subscribed objects from appdb and asicdb (sonic-net#664)
d049d65 
Signed-off-by: Guohan Lu <gulv@microsoft.com>
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@jleveque
[show] Properly replace port name with alias in command output (sonic…
2278d10 
…-net#664)
AidanCopeland pushed a commit to Metaswitch/sonic-buildimage that referenced this pull request Apr 14, 2022
@kcudnik
[syncd] Fix passing switch pointers during warm boot (sonic-net#664)
9c026a6 
During warm boot we also need to update notification pointers when creating switch in warm boot mode, since syncd/vendor_sai_lib could be loaded at different address space, and this can lead to SIGSEGV, since previous address may not be available
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oleksandrivantsiv oleksandrivantsiv oleksandrivantsiv left review comments

@lguohan lguohan lguohan approved these changes

@stcheng stcheng Awaiting requested review from stcheng

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@marian-pritsak @lguohan @oleksandrivantsiv @msftclas