Fix AttributeError triggered by use of non-existent log_critical method in pcied (#651)

* Fix AttributeError triggered by use of non-existent log_critical method in pcied
* Adding unit test for redis DB connection failure path and fix incorrect table variable initialization

Author: GauravNagesh

sonic-pcied/scripts/pcied

@@ -58,7 +58,7 @@ def load_platform_pcieutil():
         except ImportError as e:
             log.log_error("Failed to load default PcieUtil module. Error : {}".format(str(e)), True)
     if _platform_pcieutil is None:
-        log.log_critical("Failed to load any PCIe utility module. Exiting...", True)
+        log.log_error("Failed to load any PCIe utility module. Exiting...", True)
         raise RuntimeError("Unable to load PCIe utility module.")
     return _platform_pcieutil
 
@@ -84,7 +84,7 @@ class DaemonPcied(daemon_base.DaemonBase):
         self.stop_event = threading.Event()
         self.state_db = None
         self.device_table = None
-        self.table = None
+        self.status_table = None
         self.resultInfo = []
         self.device_name = None
         self.aer_stats = {}
@@ -102,7 +102,7 @@ class DaemonPcied(daemon_base.DaemonBase):
             self.status_table = swsscommon.Table(self.state_db, PCIE_STATUS_TABLE_NAME)
             self.detach_info = swsscommon.Table(self.state_db, PCIE_DETACH_INFO_TABLE)
         except Exception as e:
-            log.log_critical("Failed to connect to STATE_DB or create table. Error: {}".format(str(e)), True)
+            log.log_error("Failed to connect to STATE_DB or create table. Error: {}".format(str(e)), True)
             sys.exit(PCIEUTIL_CONF_FILE_ERROR)
 
     def __del__(self):

sonic-pcied/tests/test_DaemonPcied.py

@@ -397,3 +397,29 @@ def test_update_aer_to_statedb(self):
         daemon_pcied.log_error.assert_called_once_with(
             "Exception while updating AER attributes to STATE_DB for PCIe Device 1: Test Exception"
         )
+
+
+    @mock.patch('pcied.load_platform_pcieutil', mock.MagicMock())
+    @mock.patch('pcied.daemon_base.db_connect', mock.MagicMock())
+    @mock.patch('pcied.sys.exit')
+    @mock.patch('pcied.log')
+    def test_init_db_connection_failure(self, mock_log, mock_exit):
+        # Case 1 : Normal Execution path; Verify error was not logged and exit was not called
+        pcied.DaemonPcied(SYSLOG_IDENTIFIER)
+        mock_log.log_error.assert_not_called()
+        mock_exit.assert_not_called()
+
+        # Reset mock objects
+        mock_log.reset_mock()
+        mock_exit.reset_mock()
+
+        # Case 2 : Test exception during Redis connection or table creation error and verify error was logged and exit was called with correct error code
+        with mock.patch('pcied.swsscommon.Table', side_effect=Exception('Test Redis DB Exception')):
+            pcied.DaemonPcied(SYSLOG_IDENTIFIER)
+
+            mock_log.log_error.assert_called_once_with(
+                'Failed to connect to STATE_DB or create table. Error: Test Redis DB Exception',
+                True
+            )
+
+            mock_exit.assert_called_once_with(pcied.PCIEUTIL_CONF_FILE_ERROR)

sonic-pcied/tests/test_pcied.py

@@ -64,7 +64,6 @@ def test_load_platform_pcieutil():
             assert result == instance
             mock_log.log_notice.assert_not_called()
             mock_log.log_error.assert_not_called()
-            mock_log.log_critical.assert_not_called()
 
         # Case 2: Fallback to sonic_platform_base.sonic_pcie.pcie_common.PcieUtil
         with patch('sonic_platform.pcie.Pcie', side_effect=ImportError("No module named 'sonic_platform.pcie'")), \
@@ -76,7 +75,6 @@ def test_load_platform_pcieutil():
             assert result == instance
             mock_log.log_notice.assert_called_once()
             mock_log.log_error.assert_not_called()
-            mock_log.log_critical.assert_not_called()
             mock_log.reset_mock()
 
         # Case 3: Failure to import both modules
@@ -86,5 +84,4 @@ def test_load_platform_pcieutil():
                 pcied.load_platform_pcieutil()
 
             mock_log.log_notice.assert_called_once()
-            mock_log.log_error.assert_called_once()
-            mock_log.log_critical.assert_called_once()
+            assert mock_log.log_error.call_count == 2