Fixes for the issues uncovered by sonic-pcied unit tests

sonic-pcied/scripts/pcied

@@ -134,7 +134,8 @@ class DaemonPcied(daemon_base.DaemonBase):
 
         self.aer_stats = {}
         if Id is not None:
-            self.device_table.set(self.device_name, [('id', Id)])
+            fvp = swsscommon.FieldValuePairs([('id', Id)])
+            self.device_table.set(self.device_name, fvp)
             self.aer_stats = platform_pcieutil.get_pcie_aer_stats(bus=Bus, dev=Dev, func=Fn)
             self.update_aer_to_statedb()
 

sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py

@@ -26,6 +26,9 @@ def get(self, key):
     def get_size(self):
         return (len(self.mock_dict))
 
+    def getKeys(self):
+        return list(self.mock_dict.keys())
+
 
 class FieldValuePairs:
     fv_dict = {}

sonic-pcied/tests/test_DaemonPcied.py

@@ -282,22 +282,18 @@ def test_check_pcie_devices(self):
     @mock.patch('pcied.load_platform_pcieutil', mock.MagicMock())
     def test_update_pcie_devices_status_db(self):
         daemon_pcied = pcied.DaemonPcied(SYSLOG_IDENTIFIER)
-        daemon_pcied.status_table = mock.MagicMock()
         daemon_pcied.log_info = mock.MagicMock()
         daemon_pcied.log_error = mock.MagicMock()
 
         # test for pass resultInfo
         daemon_pcied.update_pcie_devices_status_db(0)
-        assert daemon_pcied.status_table.set.call_count == 1
         assert daemon_pcied.log_info.call_count == 1
         assert daemon_pcied.log_error.call_count == 0
 
-        daemon_pcied.status_table.set.reset_mock()
         daemon_pcied.log_info.reset_mock()
 
         # test for resultInfo with 1 device failed to detect
         daemon_pcied.update_pcie_devices_status_db(1)
-        assert daemon_pcied.status_table.set.call_count == 1
         assert daemon_pcied.log_info.call_count == 0
         assert daemon_pcied.log_error.call_count == 1
 
@@ -306,28 +302,24 @@ def test_update_pcie_devices_status_db(self):
     @mock.patch('pcied.read_id_file')
     def test_check_n_update_pcie_aer_stats(self, mock_read):
         daemon_pcied = pcied.DaemonPcied(SYSLOG_IDENTIFIER)
-        daemon_pcied.device_table = mock.MagicMock()
         daemon_pcied.update_aer_to_statedb = mock.MagicMock()
         pcied.platform_pcieutil.get_pcie_aer_stats = mock.MagicMock()
 
         mock_read.return_value = None
         daemon_pcied.check_n_update_pcie_aer_stats(0,1,0)
         assert daemon_pcied.update_aer_to_statedb.call_count == 0
-        assert daemon_pcied.device_table.set.call_count == 0
         assert pcied.platform_pcieutil.get_pcie_aer_stats.call_count == 0
 
         mock_read.return_value = '1714'
         daemon_pcied.check_n_update_pcie_aer_stats(0,1,0)
         assert daemon_pcied.update_aer_to_statedb.call_count == 1
-        assert daemon_pcied.device_table.set.call_count == 1
         assert pcied.platform_pcieutil.get_pcie_aer_stats.call_count == 1
 
 
     @mock.patch('pcied.load_platform_pcieutil', mock.MagicMock())
     def test_update_aer_to_statedb(self):
         daemon_pcied = pcied.DaemonPcied(SYSLOG_IDENTIFIER)
         daemon_pcied.log_debug = mock.MagicMock()
-        daemon_pcied.device_table = mock.MagicMock()
         daemon_pcied.device_name = mock.MagicMock()
         daemon_pcied.aer_stats = pcie_aer_stats_no_err
 
@@ -344,6 +336,3 @@ def test_update_aer_to_statedb(self):
 
         daemon_pcied.update_aer_to_statedb() 
         assert daemon_pcied.log_debug.call_count == 0
-        assert daemon_pcied.device_table.set.call_count == 1
-
-        daemon_pcied.device_table.set.reset_mock()