Repository navigation
[action] [PR:28469] [platform_tests][watchdog]: Add Nokia BMC H6-128 watchdog config - #1484
Merged
Merged
Conversation
### Description of PR
Summary:
Fixes #28467
Add a `watchdog.yml` entry for the Nokia BMC H6-128 platform so `platform_tests/api/test_watchdog.py` uses timeout values valid for its hardware watchdog.
### Type of change
- [x] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
- [ ] Skipped for non-supported platforms
- [ ] Test case improvement
### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [ ] 202511
- [x] 202608
### Approach
#### What is the motivation for this PR?
On a Nokia BMC H6-128 switch (`arm64-nokia_bmc_h6_128-r0`, HwSKU `Nokia-BMC-H6-128`, Aspeed), 6 of 7 `test_watchdog.py` cases fail. The platform has no entry in `tests/platform_tests/api/watchdog.yml`, so the `conf` fixture falls back to the generic `default` block (`valid_timeout: 10 / greater_timeout: 20 / too_big_timeout: 100`).
On this BMC the `hw-watchdog-mgrd` daemon owns `/dev/watchdog0` and only accepts timeouts in the 30-300s range, so:
- `watchdog.arm(10)` / `watchdog.arm(20)` return `-1` (below the 30s minimum), failing `test_arm_disarm_states`, `test_remaining_time`, `test_periodic_arm`, `test_arm_different_timeout_greater`, `test_arm_different_timeout_smaller`.
- `watchdog.arm(100)` is accepted (within range) and returns `100`, but `test_arm_too_big_timeout` expects rejection (`-1`), so it fails.
- `test_arm_negative_timeout` passes (negative timeout is invalid on any platform).
This is a test-config gap, not a product defect.
#### How did you do it?
Added an `arm64-nokia_bmc_h6_128-r0` entry that reuses the existing shared `*bmc_watchdog_defaults` anchor (`valid 30 / greater 170 / too_big 301 / punch 90`), mirroring the `arm64-nexthop_b27-r0` BMC entry.
#### How did you verify/test it?
Verified the YAML parses and the anchor resolves to `{valid_timeout: 30, greater_timeout: 170, too_big_timeout: 301, watchdog_punching_period_seconds: 90}` for platform `arm64-nokia_bmc_h6_128-r0`. These values are within the daemon's supported 30-300s range, so arm/disarm/remaining-time cases now get valid timeouts and `too_big_timeout` (301) is correctly rejected.
#### Any platform specific information?
Specific to Nokia BMC H6-128 (`arm64-nokia_bmc_h6_128-r0`) running the `hw-watchdog-mgrd` daemon.
#### Supported testbed topology if it's a new test case?
N/A
### Documentation
N/A
Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
Collaborator
Author
|
Original PR: sonic-net/sonic-mgmt#28469 |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Collaborator
Author
|
/azp run |
1 similar comment
Collaborator
Author
|
/azp run |
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
2 of 13 tasks
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
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.
Description of PR
Summary:
Fixes #28467
Add a
watchdog.ymlentry for the Nokia BMC H6-128 platform soplatform_tests/api/test_watchdog.pyuses timeout values valid for its hardware watchdog.Type of change
Back port request
Approach
What is the motivation for this PR?
On a Nokia BMC H6-128 switch (
arm64-nokia_bmc_h6_128-r0, HwSKUNokia-BMC-H6-128, Aspeed), 6 of 7test_watchdog.pycases fail. The platform has no entry intests/platform_tests/api/watchdog.yml, so theconffixture falls back to the genericdefaultblock (valid_timeout: 10 / greater_timeout: 20 / too_big_timeout: 100).On this BMC the
hw-watchdog-mgrddaemon owns/dev/watchdog0and only accepts timeouts in the 30-300s range, so:watchdog.arm(10)/watchdog.arm(20)return-1(below the 30s minimum), failingtest_arm_disarm_states,test_remaining_time,test_periodic_arm,test_arm_different_timeout_greater,test_arm_different_timeout_smaller.watchdog.arm(100)is accepted (within range) and returns100, buttest_arm_too_big_timeoutexpects rejection (-1), so it fails.test_arm_negative_timeoutpasses (negative timeout is invalid on any platform).This is a test-config gap, not a product defect.
How did you do it?
Added an
arm64-nokia_bmc_h6_128-r0entry that reuses the existing shared*bmc_watchdog_defaultsanchor (valid 30 / greater 170 / too_big 301 / punch 90), mirroring thearm64-nexthop_b27-r0BMC entry.How did you verify/test it?
Verified the YAML parses and the anchor resolves to
{valid_timeout: 30, greater_timeout: 170, too_big_timeout: 301, watchdog_punching_period_seconds: 90}for platformarm64-nokia_bmc_h6_128-r0. These values are within the daemon's supported 30-300s range, so arm/disarm/remaining-time cases now get valid timeouts andtoo_big_timeout(301) is correctly rejected.Any platform specific information?
Specific to Nokia BMC H6-128 (
arm64-nokia_bmc_h6_128-r0) running thehw-watchdog-mgrddaemon.Supported testbed topology if it's a new test case?
N/A
Documentation
N/A
Signed-off-by: Sonic Build Admin sonicbld@microsoft.com