Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

psusutil sysfs attribute changes for hwmon #1264

Merged
merged 2 commits into from
Jan 10, 2018
Merged

psusutil sysfs attribute changes for hwmon #1264

merged 2 commits into from
Jan 10, 2018

Conversation

paavaanan
Copy link
Contributor

- What I did
Replaced sysfs variables default location to hwmon SMF directory. Replaced psu_presence variables compatible to hwmon

- How to verify it
psuutil show status

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

jleveque
jleveque suggested changes Dec 27, 2017
View reviewed changes
device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py Outdated
@@ -8,7 +8,7 @@

try:
from sonic_psu.psu_base import PsuBase
except ImportError as e:
except ImportError, e:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change from as to comma? The "comma variable" is no longer supported by Python 3.x, and this plugin is imported by both Python 2.7 and 3.6 scripts. Please change back to as.

device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py Outdated
@@ -8,7 +8,7 @@

try:
from sonic_psu.psu_base import PsuBase
except ImportError as e:
except ImportError, e:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change from as to comma? The "comma variable" is no longer supported by Python 3.x, and this plugin is imported by both Python 2.7 and 3.6 scripts. Please change back to as.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jileveque, thanks for the information. Will do the change accordingly.

@jleveque jleveque merged commit 1ceb07a into sonic-net:master Jan 10, 2018
lguohan added a commit that referenced this pull request Jan 11, 2018
@lguohan
Revert "[Dell S6100, Z9100] psusutil sysfs attribute changes for hwmon (
c1eedc0 
#1264)"

This reverts commit 1ceb07a.
@lguohan lguohan mentioned this pull request Jan 11, 2018
Merged
lguohan added a commit that referenced this pull request Jan 11, 2018
@lguohan
Revert "[Dell S6100, Z9100] psusutil sysfs attribute changes for hwmon (
9669b34 
#1264)" (#1297)

This reverts commit 1ceb07a.
zhenggen-xu added a commit to zhenggen-xu/sonic-buildimage that referenced this pull request Oct 17, 2019
@zhenggen-xu
Merge branch 'github'
b29376f 
* github:
  [minigraph]: Set hostname in all default minigraphs to 'sonic' (sonic-net#1333)
  Install sonic-platform-common package in platform-monitor docker for ledd (sonic-net#1330)
  Prevent supervisor from restarting configdb-load.sh (sonic-net#1324)
  [scripts]: Fix issues with checking status of the DB. Use one approach everywhere. (sonic-net#1323)
  [Arista7260cx3] Add platform specific reboot tool (sonic-net#1318)
  Install azure cli into docker-sonic-mgmt (sonic-net#1322)
  [sonic-py-swsssdk]: Update submodule pointer (sonic-net#1319)
  [supervisor] Add patch to prevent 'supervisorctl start' command from hanging if system time has rolled backward (sonic-net#1311)
  Move platform-specific hardware plugin base packages to sonic-platform-common submodule (sonic-net#1301)
  [baseimage]: Add missing dependency of igb & ixgbe (sonic-net#1316)
  [snmpagent]: Update sonic-snmpagent submodule (sonic-net#1314)
  Run docker containers with /tmp and /var/tmp mounted to tmpfs (sonic-net#1313)
  [Broadcom]: Update Boradcom SAI package to 3.0.3.3-3 (sonic-net#1312)
  [submodule]: Update sairedis (sonic-net#1310)
  [snmpagent]: Update sonic-snmpagent submodule (sonic-net#1308)
  [baseimage]: add mkfs.ext3 and fsck.ext3 in initrd to support ext3 partition (sonic-net#1306)
  [submodule]: update sonic-sairedis to enable syncd-rpc (sonic-net#1304)
  [device]: Fix Mellanox sku check (sonic-net#1303)
  Add support for Accton AS7712-32X platform (sonic-net#1299)
  [build]: build libsaithrift-dev and docker-ptf-[platform] (sonic-net#1300)
  [libsaithrift-dev]: Enable building libsaithrift-dev and pythonthrift libraries (sonic-net#1296)
  [Platform] Update switch configuration files and download link for Ingrasys S9130-32X/S9230-64X (sonic-net#1295)
  [Delta]: Add psuutil support for ag9032v1 (sonic-net#1298)
  Revert "[Dell S6100, Z9100] psusutil sysfs attribute changes for hwmon (sonic-net#1264)" (sonic-net#1297)
  [Dell S6100, Z9100] psusutil sysfs attribute changes for hwmon (sonic-net#1264)
  [Platform]As7712-32x update for sensors test (sonic-net#1292)
  Revert "[DHCP relay]: Add patch to always undef VLAN_TCI_PRESENT so as not to treat VLAN-tagged packets differently (sonic-net#1254)" (sonic-net#1291)
  [[submodule]: Update swss-common (sonic-net#1289)
  [baseimage]: Install sysfsutils package into SONiC host system (sonic-net#1290)
  Add caclmgrd and related files to translate and install control plane ACL rules (sonic-net#1240)
  [mellanox]: Update Mellanox buffers configuration (sonic-net#1263)
  [platform]: chmod 0644 for *.mk files (sonic-net#1284)
  [arista]: Update Arista platform modules and mount libraries to snmp docker (sonic-net#1283)
  [platform]: chmod a+x for debian/rules for platform-modules-delta (sonic-net#1282)
  Let debootstrap uses the same sources link as apt (sonic-net#1279)
  [doc]: update sonic-buildimage clone instructions (sonic-net#1278)
  [image]: Explicitly specify kernel_version as string (sonic-net#1280)
  Disable autosuspend for USB devices, preventing usb drives to be stopped and then renamed (sonic-net#1275)
  [platform]: As7712 32x add fancontrol (sonic-net#1270)
  [Platform] Add psuutil support for Ingrasys S9130-32X (sonic-net#1273)
  [submodules]: Update swss and utilitiles modules (sonic-net#1276)
  [Platform] Add psuutil and update submodule for Ingrasys S9100-32X, S8810-32Q, S9200-64X on master branch (sonic-net#1271)
  [centec]: support sai1.0 (sonic-net#1268)
  [build]: add build badge for nephos platform (sonic-net#1267)
  [build]: allow to use http(s) proxy in the build (sonic-net#1265)
  [Accton AS7816-64X] Add new platform and device for AS7816-64X. (sonic-net#1260)
  [Platform] Add Ingrasys S9130-32X and S9230-64X with Nephos Switch ASIC (sonic-net#1245)
  Add 'make reset' target with warning prompt to reset git repo and submodules (sonic-net#1258)
  [sudoers] Add 'docker ps' to READ_ONLY_CMDS (sonic-net#1259)
  Add set/get lpmode and mode_rst feature for qsfp (sonic-net#1261)
  [build] allow user to override the default number of build jobs (sonic-net#1255)
  [build] make second Accton Debian package extra package of the first one (sonic-net#1257)
  [arista] Delete sysfs entries for all Arista Digital Power Monitor/Management devices (sonic-net#1256)
  [DHCP relay]: Add patch to always undef VLAN_TCI_PRESENT so as not to treat VLAN-tagged packets differently (sonic-net#1254)
  [snmp]: Save S/N in state DB prior to starting service (sonic-net#1246)
  [device/accton] Correct exception function name (sonic-net#1249)
  [DHCP relay]: Fix circuit ID and remote ID bugs (sonic-net#1248)
  [sonic-py-swsssdk]: Update submodule pointer (sonic-net#1253)
  [swss]: update swss submodule (sonic-net#1244)
  [broadcom]: update sai to 3.0.3.3-1 (sonic-net#1243)
@paavaanan paavaanan deleted the sonic_psuutilities_branch branch May 10, 2020 06:12
stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request Dec 3, 2020
@stephenxs
Advance submodule head for sonic-swss and sonic-swss-common
2457d9f 
swss:
- [port_rates][rif_rates] Fix port_rates.lua (sonic-net#1520)
- Improve the way of handling BUFFER_PG during PFC storm (sonic-net#1480)
- [Orchagent] Vxlanorch and Portsorch changes for EVPN VXLAN (sonic-net#1264)
- [sub intf] ecmp hardware convergence acceleration at parent port oper status changes (sonic-net#1492)
- [dvs/copp] Adjust policer checks in VS tests for default COPP policers (sonic-net#1519)
- Flush ARP/neighbor entry on FDB flush when port L2-L3 (sonic-net#1506)
- [intfmgr]: Add GARP support (sonic-net#1503)

swss-common:
- [Dynamic buffer calc] Support dynamic buffer calculation (sonic-net#361)
- README.md: Update build requirements (sonic-net#414)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
@stephenxs stephenxs mentioned this pull request Dec 3, 2020
Merged
3 tasks
daall pushed a commit that referenced this pull request Dec 4, 2020
@stephenxs
Advance submodule head for sonic-swss and sonic-swss-common (#6111)
fdb51e7 
swss:
- [port_rates][rif_rates] Fix port_rates.lua (#1520)
- Improve the way of handling BUFFER_PG during PFC storm (#1480)
- [Orchagent] Vxlanorch and Portsorch changes for EVPN VXLAN (#1264)
- [sub intf] ecmp hardware convergence acceleration at parent port oper status changes (#1492)
- [dvs/copp] Adjust policer checks in VS tests for default COPP policers (#1519)
- Flush ARP/neighbor entry on FDB flush when port L2-L3 (#1506)
- [intfmgr]: Add GARP support (#1503)

swss-common:
- [Dynamic buffer calc] Support dynamic buffer calculation (#361)
- README.md: Update build requirements (#414)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
@stephenxs @santhosh-kt
Advance submodule head for sonic-swss and sonic-swss-common (sonic-ne…
26db3d8 
…t#6111)

swss:
- [port_rates][rif_rates] Fix port_rates.lua (sonic-net#1520)
- Improve the way of handling BUFFER_PG during PFC storm (sonic-net#1480)
- [Orchagent] Vxlanorch and Portsorch changes for EVPN VXLAN (sonic-net#1264)
- [sub intf] ecmp hardware convergence acceleration at parent port oper status changes (sonic-net#1492)
- [dvs/copp] Adjust policer checks in VS tests for default COPP policers (sonic-net#1519)
- Flush ARP/neighbor entry on FDB flush when port L2-L3 (sonic-net#1506)
- [intfmgr]: Add GARP support (sonic-net#1503)

swss-common:
- [Dynamic buffer calc] Support dynamic buffer calculation (sonic-net#361)
- README.md: Update build requirements (sonic-net#414)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
@srj102 @tapashdas
[Orchagent] Vxlanorch and Portsorch changes for EVPN VXLAN (sonic-net…
095f481 
…#1264)

* https://github.com/Azure/SONiC/pull/437/commits

1. Existing code supports a single mapper type to be created. Either BRIDGE or VRF type mappers are supported.
   Change to support multiple mapper type creations is being added.
2. Changes to support P2P tunnel creation and deletion.  A refcnt is maintained per resource type (IMR or IP prefix)
   and based on this a P2P tunnel is created or deleted.
3. Changes to support handling of VXLAN_REMOTE_VNI table. Interfaces with portsorch to create a Port object of type
   TUNNEL on tunnel discovery.
4. SAI interface function changes to support P2P tunnels.
5. EVPN NVO table handling.

Signed-off-by: Rajesh Sankaran <rajesh.sankaran@broadcom.com>
Co-authored-by: Tapash Das <tapash.das@broadcom.com>
mssonicbld added a commit that referenced this pull request Jul 6, 2023
@mssonicbld
[submodule] Update submodule sonic-sairedis to the latest HEAD automa…
bdb5f01 
…tically (#15724)

#### Why I did it
src/sonic-sairedis
```
* d1850e2 - (HEAD -> 202211, origin/202211) [CI]: Fix pipeline issue caused by urllib3 v2. (#1264) (13 hours ago) [Nazarii Hnydyn]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleveque jleveque jleveque approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@paavaanan @jleveque