Skip to content

Commit 5ea65dd

Browse files
prsunnytiantianlv
authored andcommitted
[orchagent] Use mac address from config_db instead of from eth0 (sonic-net#4166)
* Use mac address from config_db instead of eth0
1 parent 874a712 commit 5ea65dd

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

dockers/docker-orchagent/orchagent.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
# vendor specific code.
55
export platform=`sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type`
66

7-
MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
7+
MAC_ADDRESS=$(sonic-cfggen -d -v 'DEVICE_METADATA.localhost.mac')
8+
if [ "$MAC_ADDRESS" == "None" ] || [ -z "$MAC_ADDRESS" ]; then
9+
MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
10+
logger "Mac address not found in Device Metadata, Falling back to eth0"
11+
fi
812

913
# Create a folder for SwSS record files
1014
mkdir -p /var/log/swss

platform/p4/docker-sonic-p4/orchagent.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#!/usr/bin/env bash
22

3-
MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
3+
MAC_ADDRESS=$(sonic-cfggen -d -v 'DEVICE_METADATA.localhost.mac')
4+
if [ "$MAC_ADDRESS" == "None" ] || [ -z "$MAC_ADDRESS" ]; then
5+
MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
6+
logger "Mac address not found in Device Metadata, Falling back to eth0"
7+
fi
48

59
# Create a folder for SsWW record files
610
mkdir -p /var/log/swss

platform/vs/docker-sonic-vs/orchagent.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ else
66
export platform=$fake_platform
77
fi
88

9-
MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
9+
MAC_ADDRESS=$(sonic-cfggen -d -v 'DEVICE_METADATA.localhost.mac')
10+
if [ "$MAC_ADDRESS" == "None" ] || [ -z "$MAC_ADDRESS" ]; then
11+
MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
12+
logger "Mac address not found in Device Metadata, Falling back to eth0"
13+
fi
1014

1115
# Create a folder for SwSS record files
1216
mkdir -p /var/log/swss

0 commit comments

Comments
 (0)