Merged
Conversation
jleveque
approved these changes
Jan 30, 2018
Collaborator
|
conflict, can you check? |
Contributor
|
The conflict is kind of expected with Qi's PR #1350. And it should be easy to resolve. Looks like we cannot solve it online. Prince, I think what you need to do is: from your working branch, do a 'git fetch origin', then "git rebase -i origin/master", then take your change on snmp repo. then force push to your fork. We can do it together tomorrow if you'd like to. Regards, |
Contributor
Author
|
@yxieca, I did a merge from upstream and seems to have resolved the conflict. Can you check. |
yxieca
approved these changes
Jan 30, 2018
This was referenced Jan 30, 2018
Contributor
|
@prsunny what's this pull request's update? |
vmittal-msft
pushed a commit
to vmittal-msft/sonic-buildimage
that referenced
this pull request
Oct 20, 2025
…se on Arista 7280DR3A variants (sonic-net#1351) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Arista 7280DR3A SKUs don't support controlling thermal and psu fan speed. This makes some platform_tests under sonic-mgmt fail since they assume they are controllable by default. Tests affected by this: `platform_tests/api/test_psu_fans.py::TestPsuFans::test_set_fans_speed` `platform_tests/api/test_thermal.py::TestThermalApi::test_set_low_threshold` `platform_tests/api/test_thermal.py::TestThermalApi::test_set_high_threshold` ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Modify `platform.json` to explicity mention that psu fan speed and thermal sensors are not controllable #### How to verify it Reran the above-mentioned tests and verified that they are skipped. <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [x] 202503 (For Disagg T2) #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [x] msft-202503 #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged) 
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
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.
- What I did
Submodule update for