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

[orchagent] Use mac address from config_db instead of from eth0 #4166

Merged
merged 2 commits into from
Feb 21, 2020
Merged

[orchagent] Use mac address from config_db instead of from eth0 #4166

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
058928b
Use mac address from config_db instead of eth0
prsunny Feb 18, 2020
55410e5
Addressed comments, added log message
prsunny Feb 19, 2020
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
5 changes: 4 additions & 1 deletion dockers/docker-orchagent/orchagent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
# vendor specific code.
export platform=`sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type`

MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
MAC_ADDRESS=`sonic-cfggen -d -v 'DEVICE_METADATA.localhost.mac'`
if [ "$MAC_ADDRESS" == "None" ] || [ -z "$MAC_ADDRESS" ]; then
MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
fi

# Create a folder for SwSS record files
mkdir -p /var/log/swss
Expand Down
5 changes: 4 additions & 1 deletion platform/p4/docker-sonic-p4/orchagent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env bash

MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
MAC_ADDRESS=`sonic-cfggen -d -v 'DEVICE_METADATA.localhost.mac'`
if [ "$MAC_ADDRESS" == "None" ] || [ -z "$MAC_ADDRESS" ]; then
MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
fi

# Create a folder for SsWW record files
mkdir -p /var/log/swss
Expand Down
5 changes: 4 additions & 1 deletion platform/vs/docker-sonic-vs/orchagent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ else
export platform=$fake_platform
fi

MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
MAC_ADDRESS=`sonic-cfggen -d -v 'DEVICE_METADATA.localhost.mac'`
if [ "$MAC_ADDRESS" == "None" ] || [ -z "$MAC_ADDRESS" ]; then
MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
fi

# Create a folder for SwSS record files
mkdir -p /var/log/swss
Expand Down