diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py
new file mode 100755
index 0000000000..20805e04ed
--- /dev/null
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+
+from sonic_platform.chassis import Chassis
+
+
+def main():
+    print("---------------------")
+    print("Chassis Watchdog Test")
+    print("---------------------")
+
+    chassis = Chassis()
+
+    watchdog = chassis.get_watchdog()
+
+    print("    Armed: {}".format(watchdog.is_armed()))
+    print("    Time Left: {}".format(watchdog.get_remaining_time()))
+
+    return
+
+
+if __name__ == '__main__':
+    main()
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
index 75ec3ab177..903b6365dc 100644
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py
@@ -10,19 +10,25 @@ import fcntl
 import array
 
 from sonic_platform_base.watchdog_base import WatchdogBase
-from sonic_py_common import logger
 
 """ ioctl constants """
+IO_WRITE = 0x40000000
 IO_READ = 0x80000000
+IO_READ_WRITE = 0xC0000000
 IO_SIZE_INT = 0x00040000
 IO_TYPE_WATCHDOG = ord('W') << 8
 
 WDR_INT = IO_READ | IO_SIZE_INT | IO_TYPE_WATCHDOG
+WDWR_INT = IO_READ_WRITE | IO_SIZE_INT | IO_TYPE_WATCHDOG
 
 """ Watchdog ioctl commands """
 WDIOC_SETOPTIONS = 4 | WDR_INT
 WDIOC_KEEPALIVE = 5 | WDR_INT
+WDIOC_SETTIMEOUT = 6 | WDWR_INT
 WDIOC_GETTIMEOUT = 7 | WDR_INT
+WDIOC_SETPRETIMEOUT = 8 | WDWR_INT
+WDIOC_GETPRETIMEOUT = 9 | WDR_INT
+WDIOC_GETTIMELEFT = 10 | WDR_INT
 
 """ Watchdog status constants """
 WDIOS_DISABLECARD = 0x0001
@@ -33,8 +39,6 @@ WD_SYSFS_PATH = "/sys/class/watchdog/"
 
 WD_COMMON_ERROR = -1
 
-sonic_logger = logger.Logger()
-
 
 class WatchdogImplBase(WatchdogBase):
     """
@@ -47,6 +51,7 @@ class WatchdogImplBase(WatchdogBase):
         Open a watchdog handle
         @param wd_device_path Path to watchdog device
         """
+        super(WatchdogImplBase, self).__init__()
 
         self.watchdog_path = wd_device_path
         self.watchdog = os.open(self.watchdog_path, os.O_WRONLY)
@@ -57,25 +62,6 @@ class WatchdogImplBase(WatchdogBase):
         self.armed = False
         self.timeout = self._gettimeout()
 
-    def disarm(self):
-        """
-        Disarm the hardware watchdog
-
-        Returns:
-            A boolean, True if watchdog is disarmed successfully, False
-            if not
-        """
-        sonic_logger.log_info(" Debug disarm watchdog ")
-
-        try:
-            self._disablewatchdog()
-            self.armed = False
-            self.timeout = 0
-        except IOError:
-            return False
-
-        return True
-
     def _disablewatchdog(self):
         """
         Turn off the watchdog timer
@@ -84,41 +70,6 @@ class WatchdogImplBase(WatchdogBase):
         req = array.array('h', [WDIOS_DISABLECARD])
         fcntl.ioctl(self.watchdog, WDIOC_SETOPTIONS, req, False)
 
-    def _gettimeout(self):
-        """
-        Get watchdog timeout
-        @return watchdog timeout
-        """
-
-        req = array.array('I', [0])
-        fcntl.ioctl(self.watchdog, WDIOC_GETTIMEOUT, req, True)
-
-        return int(req[0])
-
-    def arm(self, seconds):
-        """
-        Implements arm WatchdogBase API
-        """
-        sonic_logger.log_info(" Debug arm watchdog4 ")
-        ret = WD_COMMON_ERROR
-        if seconds < 0:
-            return ret
-
-        try:
-            if self.timeout != seconds:
-                self.timeout = self._settimeout(seconds)
-            if self.armed:
-                self._keepalive()
-            else:
-                sonic_logger.log_info(" Debug arm watchdog5 ")
-                self._enablewatchdog()
-                self.armed = True
-            ret = self.timeout
-        except IOError:
-            pass
-
-        return ret
-
     def _enablewatchdog(self):
         """
         Turn on the watchdog timer
@@ -133,3 +84,100 @@ class WatchdogImplBase(WatchdogBase):
         """
 
         fcntl.ioctl(self.watchdog, WDIOC_KEEPALIVE)
+
+    def _settimeout(self, seconds):
+        """
+        Set watchdog timer timeout
+        @param seconds - timeout in seconds
+        @return is the actual set timeout
+        """
+
+        req = array.array('I', [seconds])
+        fcntl.ioctl(self.watchdog, WDIOC_SETTIMEOUT, req, True)
+
+        return int(req[0])
+
+    def _gettimeout(self):
+        """
+        Get watchdog timeout
+        @return watchdog timeout
+        """
+
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMEOUT, req, True)
+
+        return int(req[0])
+
+    def _gettimeleft(self):
+        """
+        Get time left before watchdog timer expires
+        @return time left in seconds
+        """
+
+        req = array.array('I', [0])
+        fcntl.ioctl(self.watchdog, WDIOC_GETTIMELEFT, req, True)
+
+        return int(req[0])
+
+    def arm(self, seconds):
+        """
+        Arm the hardware watchdog
+        """
+
+        ret = WD_COMMON_ERROR
+        if seconds < 0:
+            return ret
+
+        try:
+            if self.timeout != seconds:
+                self.timeout = self._settimeout(seconds)
+            if self.armed:
+                self._keepalive()
+            else:
+                self._enablewatchdog()
+                self.armed = True
+            ret = self.timeout
+        except IOError:
+            pass
+
+        return ret
+
+    def disarm(self):
+        """
+        Disarm the hardware watchdog
+
+        Returns:
+            A boolean, True if watchdog is disarmed successfully, False
+            if not
+        """
+
+        try:
+            self._disablewatchdog()
+            self.armed = False
+            self.timeout = 0
+        except IOError:
+            return False
+
+        return True
+
+    def is_armed(self):
+        """
+        Implements is_armed WatchdogBase API
+        """
+
+        return self.armed
+
+    def get_remaining_time(self):
+        """
+        Implements get_remaining_time WatchdogBase API
+        """
+
+        timeleft = WD_COMMON_ERROR
+
+        if self.armed:
+            try:
+                timeleft = self._gettimeleft()
+            except IOError:
+                pass
+
+        return timeleft