Merge pull request #215 from gechiang/202205

Cherry-pick 17483 and 17378 from public master to msft/202205

Author: gechiang

device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json

@@ -14,7 +14,7 @@
     },
     {
         "key": "monitor_action",
-        "stringval": "warn"
+        "stringval": "reboot"
     },
     {
         "key": "grpc_thermal_monitor",
@@ -43,6 +43,26 @@
     {
       "key": "sonic_log_level",
       "stringval": "debug"
+    },
+    {
+      "key": "thermal_low_margin_threshold",
+      "intval": 10
+    },
+    {
+      "key": "thermal_log_current_threshold",
+      "intval": 2
+    },
+    {
+      "key": "thermal_log_margin_threshold",
+      "intval": 2
+    },
+    {
+      "key": "thermal_log_min_threshold",
+      "intval": 2
+    },
+    {
+      "key": "thermal_log_max_threshold",
+      "intval": 1
     }
     ]
 }

device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot

@@ -17,6 +17,10 @@ update_reboot_cause()
     sync
 }
 
+echo "Disable all SFPs"
+python3 -c 'import sonic_platform.platform; platform_chassis = sonic_platform.platform.Platform().get_chassis(); platform_chassis.tx_disable_all_sfps()'
+sleep 3
+
 # update the reboot_cuase file when reboot is trigger by device-mgr
 update_reboot_cause
 

device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json

@@ -31,6 +31,26 @@
     {
       "key": "sonic_log_level",
       "stringval": "debug"
+    },
+    {
+      "key": "thermal_low_margin_threshold",
+      "intval": 10
+    },
+    {
+      "key": "thermal_log_current_threshold",
+      "intval": 3
+    },
+    {
+      "key": "thermal_log_margin_threshold",
+      "intval": 3
+    },
+    {
+      "key": "thermal_log_min_threshold",
+      "intval": 5
+    },
+    {
+      "key": "thermal_log_max_threshold",
+      "intval": 1
     }
     ]
 }

device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot

@@ -1,15 +1,39 @@
 #!/bin/bash
-echo "Rebooting all Linecards"
-python3 -c 'import sonic_platform.platform; platform_chassis = sonic_platform.platform.Platform().get_chassis(); platform_chassis.reboot_imms()'
-sleep 3
+
+DEVICE_MGR_REBOOT_FILE="/tmp/device_mgr_reboot"
+
+update_reboot_cause()
+{
+    DEVICE_MGR_REBOOT_FILE=/tmp/device_mgr_reboot
+    REBOOT_CAUSE_FILE=/host/reboot-cause/reboot-cause.txt
+    DEVICE_REBOOT_CAUSE_FILE=/etc/opt/srlinux/reboot-cause.txt
+    if [ -e  $DEVICE_MGR_REBOOT_FILE ]; then
+        if [ -e $DEVICE_REBOOT_CAUSE_FILE ]; then
+            cp -f $DEVICE_REBOOT_CAUSE_FILE $REBOOT_CAUSE_FILE
+        fi
+        rm -f $DEVICE_MGR_REBOOT_FILE
+    else
+        touch /etc/opt/srlinux/devmgr_reboot_cause.done
+        rm -f $DEVICE_REBOOT_CAUSE_FILE &> /dev/null
+    fi
+    sync
+}
+
+if [ ! -e $DEVICE_MGR_REBOOT_FILE ]; then
+    echo "Rebooting all Linecards"
+    python3 -c 'import sonic_platform.platform; platform_chassis = sonic_platform.platform.Platform().get_chassis(); platform_chassis.reboot_imms()'
+    sleep 3
+fi
+
+# update the reboot_cuase file when reboot is trigger by device-mgr
+update_reboot_cause
+
 systemctl stop nokia-watchdog.service
 sleep 2
 echo "w" > /dev/watchdog
 kick_date=`date -u`
 echo "last watchdog kick $kick_date" > /var/log/nokia-watchdog-last.log
 rm -f /sys/firmware/efi/efivars/dump-*
-touch /etc/opt/srlinux/devmgr_reboot_cause.done
-rm -f /etc/opt/srlinux/reboot-cause.txt
 echo "Shutdown midplane"
 ifconfig xe0 down
 sync