Skip to content

Submodule update#1351

Merged
prsunny merged 2 commits intosonic-net:masterfrom
prsunny:master
Jan 30, 2018
Merged

Submodule update#1351
prsunny merged 2 commits intosonic-net:masterfrom
prsunny:master

Conversation

@prsunny
Copy link
Copy Markdown
Contributor

@prsunny prsunny commented Jan 30, 2018

- What I did

Submodule update for

  1. sonic-py-swsssdk
  2. sonic-snmpagent
  3. sonic-utilities

@lguohan
Copy link
Copy Markdown
Collaborator

lguohan commented Jan 30, 2018

conflict, can you check?

@yxieca
Copy link
Copy Markdown
Contributor

yxieca commented Jan 30, 2018

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,
Ying

@prsunny
Copy link
Copy Markdown
Contributor Author

prsunny commented Jan 30, 2018

@yxieca, I did a merge from upstream and seems to have resolved the conflict. Can you check.

@stcheng
Copy link
Copy Markdown
Contributor

stcheng commented Jan 30, 2018

@prsunny what's this pull request's update?

mssonicbld added a commit that referenced this pull request Feb 8, 2024
…tically (#18068)

#### Why I did it
src/sonic-sairedis
```
* a504933 - (HEAD -> master, origin/master, origin/HEAD) Change dash API pipeline name (#1351) (11 hours ago) [Kamil Cudnik]
```
#### How I did it
#### How to verify it
#### Description for the changelog
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)
![image](https://github.com/user-attachments/assets/6984acbe-0e5d-480c-923c-7f20a4e8731e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants