SAI MAC address placeholder initial value and MAC set simplified

sonic-net · Nov 9, 2020 · 0e2ba12 · 0e2ba12
1 parent 22c5f8a
commit 0e2ba12
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 24 deletions.
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/profile.ini b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/profile.ini
@@ -1,2 +1,2 @@
-switchMacAddress=00:50:43:ee:ee:ee
+switchMacAddress=XX:XX:XX:XX:XX:XX
 ledMode=ac3x97bits
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/profile.ini.inband b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/profile.ini.inband
@@ -1,3 +1,3 @@
-switchMacAddress=00:50:43:ee:ee:ee
+switchMacAddress=XX:XX:XX:XX:XX:XX
 inbandMgmtPortNum=48
 ledMode=ac3x97bits
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/profile.ini.noinband b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/profile.ini.noinband
@@ -1,2 +1,2 @@
-switchMacAddress=00:50:43:ee:ee:ee
+switchMacAddress=XX:XX:XX:XX:XX:XX
 ledMode=ac3x97bits
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh b/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh
@@ -20,7 +20,7 @@ load_kernel_drivers() {
 
 nokia_7215_profile()
 {
-    MAC_ADDR=$(sudo /usr/local/bin/get-base-mac.py)
+    MAC_ADDR=$(sudo decode-syseeprom -m)
     sed -i "s/switchMacAddress=.*/switchMacAddress=$MAC_ADDR/g" /usr/share/sonic/device/armhf-nokia_ixs7215_52x-r0/Nokia-7215/profile.ini
     echo "Nokia-7215: Updating switch mac address ${MAC_ADDR}"
 }

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/utils/get-base-mac.py b/platform/marvell-armhf/sonic-platform-nokia/7215/utils/get-base-mac.py