[code sync] Merge code from sonic-net/sonic-platform-daemons:202505 to 202506#28
Merged
Merged
Conversation
…tach Azure#5 (#641) <!-- Provide a general summary of your changes in the Title above --> #### Description <!-- Describe your changes in detail --> Two changes are being done in this PR: Remove deletion of the `PCIE_DETACH_INFO` from the pcied (This should be handled by the power off/power on of the DPU from the module_base implementation) The returned value from `self.detach_info.get(key)` in pcied is of the form tuple: `(True, [('bus_info', '0000:03:00.1'), ('dpu_state', 'detaching')])` This has to be handled correctly by the pcied (which was expecting a dictionary #### Motivation and Context <!-- Why is this change required? What problem does it solve? If this pull request closes/resolves an open Issue, make sure you include the text "fixes #xxxx", "closes #xxxx" or "resolves #xxxx" here --> This is required since the pcied should not delete the entries from the `PCIE_DETACH_INFO` table as opposed to the module_base implementation #### How Has This Been Tested? <!-- Please describe in detail how you tested your changes. Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code, etc. --> Unit tests: ``` tests/test_DaemonPcied.py::TestDaemonPcied::test_signal_handler PASSED [ 7%] tests/test_DaemonPcied.py::TestDaemonPcied::test_run PASSED [ 14%] tests/test_DaemonPcied.py::TestDaemonPcied::test_del PASSED [ 21%] tests/test_DaemonPcied.py::TestDaemonPcied::test_del_exception PASSED [ 28%] tests/test_DaemonPcied.py::TestDaemonPcied::test_is_dpu_in_detaching_mode PASSED [ 35%] tests/test_DaemonPcied.py::TestDaemonPcied::test_check_pcie_devices PASSED [ 42%] tests/test_DaemonPcied.py::TestDaemonPcied::test_check_pcie_devices_update_aer PASSED [ 50%] tests/test_DaemonPcied.py::TestDaemonPcied::test_check_pcie_devices_detaching PASSED [ 57%] tests/test_DaemonPcied.py::TestDaemonPcied::test_update_pcie_devices_status_db PASSED [ 64%] tests/test_DaemonPcied.py::TestDaemonPcied::test_check_n_update_pcie_aer_stats PASSED [ 71%] tests/test_DaemonPcied.py::TestDaemonPcied::test_update_aer_to_statedb PASSED [ 78%] tests/test_pcied.py::test_main PASSED [ 85%] tests/test_pcied.py::test_read_id_file PASSED [ 92%] tests/test_pcied.py::test_load_platform_pcieutil PASSED [100%] ``` Also tested manually on smart switch system, Restarted pcied (`supervisorctl restart pcied` in pmon docker) and checked that the detach info table is not deleted) Checked the logs to confirm that pcied is not crashing due to the additional change for processing of detach table #### Additional Information (Optional)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
<br>* b4b76a9 - (HEAD -> 202506, origin/202505) [Smartswitch][pcied] Fix pcied handling for smartswitch during DPU detach #5 (#641) (2025-07-10) [mssonicbld]<br>