Handle restore_count and system_enable ”NoneType“ value scenario. (#679)

* Handle system_enable NoneType value scenario.

* Handle NoneType error.

* Added UT

* Move UT into TestXcvrdScript

* Fix UT

* Fix UT

* Fix UT

* Using log utilities function

* Fix UT

* Pass self

* Use helpper_logger instead of self.

* Remove empty lines

* add log_exception_traceback to print stack.

* Modify log errors.

Author: ryanzhu706

sonic-xcvrd/tests/test_xcvrd.py

@@ -528,6 +528,38 @@ def test_post_port_sfp_firmware_info_to_db_lport_list_None(self, mock_get_presen
         dom_info_update.post_port_sfp_firmware_info_to_db(logical_port_name, port_mapping, firmware_info_tbl, stop_event)
         assert firmware_info_tbl.set.call_count == 0
 
+    @pytest.mark.parametrize(
+        "restore_count, system_enabled, expected",
+        [
+            (1, None, True),
+            (0, None, False),
+            ("2", None, True),
+            ("0", None, False),
+            (None, "true", True),
+            (None, "false", False),
+            (None, None, False),
+        ]
+    )
+    def test_is_syncd_warm_restore_complete_valid_cases(self, restore_count, system_enabled, expected):
+        mock_db = MagicMock()
+        mock_db.hget.side_effect = lambda table, key: (
+            restore_count if "WARM_RESTART_TABLE|syncd" in table else system_enabled
+        )
+
+        with patch("xcvrd.xcvrd.daemon_base.db_connect", return_value=mock_db):
+            assert is_syncd_warm_restore_complete() == expected
+
+    def test_is_syncd_warm_restore_complete_invalid_restore_count(self):
+        # restore_count = "abc" triggers ValueError in int("abc")
+        mock_db = MagicMock()
+        mock_db.hget.side_effect = lambda table, key: (
+            "abc" if "WARM_RESTART_TABLE|syncd" in table else None
+        )
+
+        with patch("xcvrd.xcvrd.daemon_base.db_connect", return_value=mock_db):
+            result = is_syncd_warm_restore_complete()
+            assert result is False
+
     def test_post_port_dom_sensor_info_to_db(self):
         def mock_get_transceiver_dom_sensor_real_value(physical_port):
             return {

sonic-xcvrd/xcvrd/xcvrd.py

@@ -470,10 +470,27 @@ def is_syncd_warm_restore_complete():
     to avoid premature config push by xcvrd that caused port flaps.
     """
     state_db = daemon_base.db_connect("STATE_DB")
-    restore_count = state_db.hget("WARM_RESTART_TABLE|syncd", "restore_count") or "0"
+    restore_count = state_db.hget("WARM_RESTART_TABLE|syncd", "restore_count")
     system_enabled = state_db.hget("WARM_RESTART_ENABLE_TABLE|system", "enable")
-    return int(restore_count.strip()) > 0 or "true" in system_enabled
+    try:
+        # --- Handle restore_count (could be int, str, or None) ---
+        if restore_count is not None:
+            if isinstance(restore_count, int):
+                if restore_count > 0:
+                    return True
+            elif isinstance(restore_count, str):
+                if restore_count.strip().isdigit() and int(restore_count.strip()) > 0:
+                    return True
+
+        # --- Handle system_enabled (only care about "true"/"false"/None) ---
+        if isinstance(system_enabled, str):
+            if system_enabled.strip().lower() == "true":
+                return True
 
+    except Exception as e:
+        helper_logger.log_warning(f"Unexpected value: restore_count={restore_count}, system_enabled={system_enabled}, error={e}")
+        log_exception_traceback()
+    return False
 #
 # Helper classes ===============================================================
 #