Prevent output_watts KeyError#16772
Merged
yejianquan merged 1 commit intosonic-net:masterfrom Feb 4, 2025
Merged
Conversation
…rror * Use .get to get output_watts with a default value if the key doesn't exist Signed-off-by: Javier Tan [email protected]
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
auspham
approved these changes
Feb 4, 2025
Contributor
auspham
left a comment
auspham
left a comment
There was a problem hiding this comment.
LGTM, thanks for taking care of this.
Contributor
|
@yejianquan for viz |
11 tasks
yejianquan
reviewed
Feb 4, 2025
Collaborator
|
Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#54 |
yejianquan
pushed a commit
that referenced
this pull request
Feb 4, 2025
Description of PR Summary: When executing show reboot-cause history, swss needs to access /var/run/redis/sonic-db/database_config.json we're dependent on the database service to boot up. Without waiting for this service to boot up we might run into runtime error: /usr/local/lib/python3.8/dist-packages/_pytest/main.py:305: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown. Plugin: terminalreporter, Hook: pytest_sessionfinish KeyboardInterrupt: For more information see https://pluggy.readthedocs.io/en/stable/api_reference.html#pluggy.PluggyTeardownRaisedWarning config.hook.pytest_sessionfinish( Traceback (most recent call last): File "/var/src/sonic-mgmt-int/tests/platform_tests/test_power_off_reboot.py", line 118, in test_power_off_reboot reboot_and_check( File "/var/src/sonic-mgmt-int/tests/platform_tests/test_reboot.py", line 86, in reboot_and_check reboot(dut, localhost, reboot_type=reboot_type, File "/var/src/sonic-mgmt-int/tests/common/plugins/loganalyzer/utils.py", line 24, in decorated res = func(*args, **kwargs) File "/var/src/sonic-mgmt-int/tests/common/reboot.py", line 341, in reboot curr_reboot_cause_history = duthost.show_and_parse("show reboot-cause history") File "/var/src/sonic-mgmt-int/tests/common/devices/multi_asic.py", line 136, in _run_on_asics return getattr(self.sonichost, self.multi_asic_attr)(*module_args, **complex_args) File "/var/src/sonic-mgmt-int/tests/common/devices/sonic.py", line 1687, in show_and_parse output = self.shell(show_cmd, **kwargs)["stdout_lines"] File "/var/src/sonic-mgmt-int/tests/common/devices/base.py", line 131, in _run raise RunAnsibleModuleFail("run module {} failed".format(self.module_name), res) tests.common.errors.RunAnsibleModuleFail: run module shell failed, Ansible Results => failed = True changed = True rc = 1 cmd = show reboot-cause history start = 2025-02-04 03:50:33.469088 end = 2025-02-04 03:50:33.934749 delta = 0:00:00.465661 msg = non-zero return code invocation = {'module_args': {'_raw_params': 'show reboot-cause history', '_uses_shell': True, 'warn': False, 'stdin_add_newline': True, 'strip_empty_ends': True, 'argv': None, 'chdir': None, 'executable': None, 'creates': None, 'removes': None, 'stdin': None}} _ansible_no_log = None stdout = stderr = Traceback (most recent call last): File "/usr/local/bin/show", line 5, in <module> from show.main import cli File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 325, in <module> if is_gearbox_configured(): ^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 265, in is_gearbox_configured app_db = SonicV2Connector() ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2066, in __init__ for db_name in self.get_db_list(): ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2003, in get_db_list return _swsscommon.SonicV2Connector_Native_get_db_list(self) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RuntimeError: Sonic database config file doesn't exist at /var/run/redis/sonic-db/database_config.json Fixes # (issue)31217914 Approach What is the motivation for this PR? Explained above How did you do it? Simply wait for database service is ready before executing the command How did you verify/test it? Verified on T2 testbed together with #16772 image Signed-off-by: Austin Pham <[email protected]>
yejianquan
pushed a commit
that referenced
this pull request
Feb 6, 2025
Description of PR Summary: Cherry-pick #16773 conflict Summary: When executing show reboot-cause history, swss needs to access /var/run/redis/sonic-db/database_config.json we're dependent on the database service to boot up. Without waiting for this service to boot up we might run into runtime error: /usr/local/lib/python3.8/dist-packages/_pytest/main.py:305: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown. Plugin: terminalreporter, Hook: pytest_sessionfinish KeyboardInterrupt: For more information see https://pluggy.readthedocs.io/en/stable/api_reference.html#pluggy.PluggyTeardownRaisedWarning config.hook.pytest_sessionfinish( Traceback (most recent call last): File "/var/src/sonic-mgmt-int/tests/platform_tests/test_power_off_reboot.py", line 118, in test_power_off_reboot reboot_and_check( File "/var/src/sonic-mgmt-int/tests/platform_tests/test_reboot.py", line 86, in reboot_and_check reboot(dut, localhost, reboot_type=reboot_type, File "/var/src/sonic-mgmt-int/tests/common/plugins/loganalyzer/utils.py", line 24, in decorated res = func(*args, **kwargs) File "/var/src/sonic-mgmt-int/tests/common/reboot.py", line 341, in reboot curr_reboot_cause_history = duthost.show_and_parse("show reboot-cause history") File "/var/src/sonic-mgmt-int/tests/common/devices/multi_asic.py", line 136, in _run_on_asics return getattr(self.sonichost, self.multi_asic_attr)(*module_args, **complex_args) File "/var/src/sonic-mgmt-int/tests/common/devices/sonic.py", line 1687, in show_and_parse output = self.shell(show_cmd, **kwargs)["stdout_lines"] File "/var/src/sonic-mgmt-int/tests/common/devices/base.py", line 131, in _run raise RunAnsibleModuleFail("run module {} failed".format(self.module_name), res) tests.common.errors.RunAnsibleModuleFail: run module shell failed, Ansible Results => failed = True changed = True rc = 1 cmd = show reboot-cause history start = 2025-02-04 03:50:33.469088 end = 2025-02-04 03:50:33.934749 delta = 0:00:00.465661 msg = non-zero return code invocation = {'module_args': {'_raw_params': 'show reboot-cause history', '_uses_shell': True, 'warn': False, 'stdin_add_newline': True, 'strip_empty_ends': True, 'argv': None, 'chdir': None, 'executable': None, 'creates': None, 'removes': None, 'stdin': None}} _ansible_no_log = None stdout = stderr = Traceback (most recent call last): File "/usr/local/bin/show", line 5, in <module> from show.main import cli File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 325, in <module> if is_gearbox_configured(): ^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 265, in is_gearbox_configured app_db = SonicV2Connector() ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2066, in __init__ for db_name in self.get_db_list(): ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2003, in get_db_list return _swsscommon.SonicV2Connector_Native_get_db_list(self) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RuntimeError: Sonic database config file doesn't exist at /var/run/redis/sonic-db/database_config.json Fixes # (issue)31217914 Approach What is the motivation for this PR? Explained above How did you do it? Simply wait for database service is ready before executing the command How did you verify/test it? Verified on T2 testbed together with #16772 image Signed-off-by: Austin Pham <[email protected]>
wangxin
pushed a commit
to wangxin/sonic-mgmt
that referenced
this pull request
Feb 21, 2025
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: When executing `show reboot-cause history`, swss needs to access `/var/run/redis/sonic-db/database_config.json` we're dependent on the database service to boot up. Without waiting for this service to boot up we might run into runtime error: ``` /usr/local/lib/python3.8/dist-packages/_pytest/main.py:305: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown. Plugin: terminalreporter, Hook: pytest_sessionfinish KeyboardInterrupt: For more information see https://pluggy.readthedocs.io/en/stable/api_reference.html#pluggy.PluggyTeardownRaisedWarning config.hook.pytest_sessionfinish( Traceback (most recent call last): File "/var/src/sonic-mgmt-int/tests/platform_tests/test_power_off_reboot.py", line 118, in test_power_off_reboot reboot_and_check( File "/var/src/sonic-mgmt-int/tests/platform_tests/test_reboot.py", line 86, in reboot_and_check reboot(dut, localhost, reboot_type=reboot_type, File "/var/src/sonic-mgmt-int/tests/common/plugins/loganalyzer/utils.py", line 24, in decorated res = func(*args, **kwargs) File "/var/src/sonic-mgmt-int/tests/common/reboot.py", line 341, in reboot curr_reboot_cause_history = duthost.show_and_parse("show reboot-cause history") File "/var/src/sonic-mgmt-int/tests/common/devices/multi_asic.py", line 136, in _run_on_asics return getattr(self.sonichost, self.multi_asic_attr)(*module_args, **complex_args) File "/var/src/sonic-mgmt-int/tests/common/devices/sonic.py", line 1687, in show_and_parse output = self.shell(show_cmd, **kwargs)["stdout_lines"] File "/var/src/sonic-mgmt-int/tests/common/devices/base.py", line 131, in _run raise RunAnsibleModuleFail("run module {} failed".format(self.module_name), res) tests.common.errors.RunAnsibleModuleFail: run module shell failed, Ansible Results => failed = True changed = True rc = 1 cmd = show reboot-cause history start = 2025-02-04 03:50:33.469088 end = 2025-02-04 03:50:33.934749 delta = 0:00:00.465661 msg = non-zero return code invocation = {'module_args': {'_raw_params': 'show reboot-cause history', '_uses_shell': True, 'warn': False, 'stdin_add_newline': True, 'strip_empty_ends': True, 'argv': None, 'chdir': None, 'executable': None, 'creates': None, 'removes': None, 'stdin': None}} _ansible_no_log = None stdout = stderr = Traceback (most recent call last): File "/usr/local/bin/show", line 5, in <module> from show.main import cli File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 325, in <module> if is_gearbox_configured(): ^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 265, in is_gearbox_configured app_db = SonicV2Connector() ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2066, in __init__ for db_name in self.get_db_list(): ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2003, in get_db_list return _swsscommon.SonicV2Connector_Native_get_db_list(self) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RuntimeError: Sonic database config file doesn't exist at /var/run/redis/sonic-db/database_config.json ``` Fixes # (issue)31217914 ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request - [ ] 202012 - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 ### Approach #### What is the motivation for this PR? Explained above #### How did you do it? Simply wait for database service is ready before executing the command #### How did you verify/test it? Verified on T2 testbed together with sonic-net#16772  #### Any platform specific information? #### Supported testbed topology if it's a new test case? ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? -->
wangxin
pushed a commit
to wangxin/sonic-mgmt
that referenced
this pull request
Feb 21, 2025
[action] [PR:16773] fix: fix show reboot-cause history error Description of PR Summary: When executing show reboot-cause history, swss needs to access /var/run/redis/sonic-db/database_config.json we're dependent on the database service to boot up. Without waiting for this service to boot up we might run into runtime error: /usr/local/lib/python3.8/dist-packages/_pytest/main.py:305: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown. Plugin: terminalreporter, Hook: pytest_sessionfinish KeyboardInterrupt: For more information see https://pluggy.readthedocs.io/en/stable/api_reference.html#pluggy.PluggyTeardownRaisedWarning config.hook.pytest_sessionfinish( Traceback (most recent call last): File "/var/src/sonic-mgmt-int/tests/platform_tests/test_power_off_reboot.py", line 118, in test_power_off_reboot reboot_and_check( File "/var/src/sonic-mgmt-int/tests/platform_tests/test_reboot.py", line 86, in reboot_and_check reboot(dut, localhost, reboot_type=reboot_type, File "/var/src/sonic-mgmt-int/tests/common/plugins/loganalyzer/utils.py", line 24, in decorated res = func(*args, **kwargs) File "/var/src/sonic-mgmt-int/tests/common/reboot.py", line 341, in reboot curr_reboot_cause_history = duthost.show_and_parse("show reboot-cause history") File "/var/src/sonic-mgmt-int/tests/common/devices/multi_asic.py", line 136, in _run_on_asics return getattr(self.sonichost, self.multi_asic_attr)(*module_args, **complex_args) File "/var/src/sonic-mgmt-int/tests/common/devices/sonic.py", line 1687, in show_and_parse output = self.shell(show_cmd, **kwargs)["stdout_lines"] File "/var/src/sonic-mgmt-int/tests/common/devices/base.py", line 131, in _run raise RunAnsibleModuleFail("run module {} failed".format(self.module_name), res) tests.common.errors.RunAnsibleModuleFail: run module shell failed, Ansible Results => failed = True changed = True rc = 1 cmd = show reboot-cause history start = 2025-02-04 03:50:33.469088 end = 2025-02-04 03:50:33.934749 delta = 0:00:00.465661 msg = non-zero return code invocation = {'module_args': {'_raw_params': 'show reboot-cause history', '_uses_shell': True, 'warn': False, 'stdin_add_newline': True, 'strip_empty_ends': True, 'argv': None, 'chdir': None, 'executable': None, 'creates': None, 'removes': None, 'stdin': None}} _ansible_no_log = None stdout = stderr = Traceback (most recent call last): File "/usr/local/bin/show", line 5, in <module> from show.main import cli File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 325, in <module> if is_gearbox_configured(): ^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 265, in is_gearbox_configured app_db = SonicV2Connector() ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2066, in __init__ for db_name in self.get_db_list(): ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2003, in get_db_list return _swsscommon.SonicV2Connector_Native_get_db_list(self) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RuntimeError: Sonic database config file doesn't exist at /var/run/redis/sonic-db/database_config.json Fixes # (issue)31217914 Approach What is the motivation for this PR? Explained above How did you do it? Simply wait for database service is ready before executing the command How did you verify/test it? Verified on T2 testbed together with sonic-net#16772 image
nnelluri-cisco
pushed a commit
to nnelluri-cisco/sonic-mgmt
that referenced
this pull request
Mar 15, 2025
…rror (sonic-net#16772) Description of PR Summary: Fixes sonic-net#16771 Approach What is the motivation for this PR? Prevent test failures due to KeyError when retrieving PDU["output_watts"] How did you do it? Use .get function to provide default value for PDUs that don't have output_watts as an attribute How did you verify/test it? Tested on T2 device with PDUs that don't provide output_watts (thanks @auspham) Signed-off-by: Javier Tan [email protected]
nnelluri-cisco
pushed a commit
to nnelluri-cisco/sonic-mgmt
that referenced
this pull request
Mar 15, 2025
Description of PR Summary: When executing show reboot-cause history, swss needs to access /var/run/redis/sonic-db/database_config.json we're dependent on the database service to boot up. Without waiting for this service to boot up we might run into runtime error: /usr/local/lib/python3.8/dist-packages/_pytest/main.py:305: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown. Plugin: terminalreporter, Hook: pytest_sessionfinish KeyboardInterrupt: For more information see https://pluggy.readthedocs.io/en/stable/api_reference.html#pluggy.PluggyTeardownRaisedWarning config.hook.pytest_sessionfinish( Traceback (most recent call last): File "/var/src/sonic-mgmt-int/tests/platform_tests/test_power_off_reboot.py", line 118, in test_power_off_reboot reboot_and_check( File "/var/src/sonic-mgmt-int/tests/platform_tests/test_reboot.py", line 86, in reboot_and_check reboot(dut, localhost, reboot_type=reboot_type, File "/var/src/sonic-mgmt-int/tests/common/plugins/loganalyzer/utils.py", line 24, in decorated res = func(*args, **kwargs) File "/var/src/sonic-mgmt-int/tests/common/reboot.py", line 341, in reboot curr_reboot_cause_history = duthost.show_and_parse("show reboot-cause history") File "/var/src/sonic-mgmt-int/tests/common/devices/multi_asic.py", line 136, in _run_on_asics return getattr(self.sonichost, self.multi_asic_attr)(*module_args, **complex_args) File "/var/src/sonic-mgmt-int/tests/common/devices/sonic.py", line 1687, in show_and_parse output = self.shell(show_cmd, **kwargs)["stdout_lines"] File "/var/src/sonic-mgmt-int/tests/common/devices/base.py", line 131, in _run raise RunAnsibleModuleFail("run module {} failed".format(self.module_name), res) tests.common.errors.RunAnsibleModuleFail: run module shell failed, Ansible Results => failed = True changed = True rc = 1 cmd = show reboot-cause history start = 2025-02-04 03:50:33.469088 end = 2025-02-04 03:50:33.934749 delta = 0:00:00.465661 msg = non-zero return code invocation = {'module_args': {'_raw_params': 'show reboot-cause history', '_uses_shell': True, 'warn': False, 'stdin_add_newline': True, 'strip_empty_ends': True, 'argv': None, 'chdir': None, 'executable': None, 'creates': None, 'removes': None, 'stdin': None}} _ansible_no_log = None stdout = stderr = Traceback (most recent call last): File "/usr/local/bin/show", line 5, in <module> from show.main import cli File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 325, in <module> if is_gearbox_configured(): ^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/show/main.py", line 265, in is_gearbox_configured app_db = SonicV2Connector() ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2066, in __init__ for db_name in self.get_db_list(): ^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/swsscommon/swsscommon.py", line 2003, in get_db_list return _swsscommon.SonicV2Connector_Native_get_db_list(self) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RuntimeError: Sonic database config file doesn't exist at /var/run/redis/sonic-db/database_config.json Fixes # (issue)31217914 Approach What is the motivation for this PR? Explained above How did you do it? Simply wait for database service is ready before executing the command How did you verify/test it? Verified on T2 testbed together with sonic-net#16772 image Signed-off-by: Austin Pham <[email protected]>
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
4 participants
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.
Description of PR
Summary:
Fixes #16771
Type of change
Back port request
Approach
What is the motivation for this PR?
Prevent test failures due to KeyError when retrieving PDU["output_watts"]
How did you do it?
Use
.getfunction to provide default value for PDUs that don't haveoutput_wattsas an attributeHow did you verify/test it?
Tested on T2 device with PDUs that don't provide
output_watts(thanks @auspham)Any platform specific information?
N/A
Supported testbed topology if it's a new test case?
N/A
Documentation