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

[PDDF] Remove references to deprecated platform plugins #1485

Merged
merged 1 commit into from
Mar 10, 2021
Merged

[PDDF] Remove references to deprecated platform plugins #1485

merged 1 commit into from
Mar 10, 2021

Conversation

FuzailBrcm
Copy link
Contributor

@FuzailBrcm FuzailBrcm commented Mar 7, 2021 •
edited by jleveque
Loading

Fixes: #1459

What I did

  • Removed the references of deprecated plugins from PDDF utils
  • Removed the references of the deprecated plugins from helper utility util_base

How I did it

  • Made PDDF debug utils python3
  • Modified them to base only upon the 2.0 platform APIs classes
  • Removed the helper utilities pertaining to old plugins init

How to verify it

Verified it locally on a AS9716 TH3 setup.

root@sonic:/home/admin# pddf_psuutil status
PSU    Status
-----  --------
PSU1   NOT OK
PSU2   OK
root@sonic:/home/admin# pddf_psuutil mfrinfo
PSU    Status    Manufacturer ID    Model       Serial               Fan Airflow Direction
-----  --------  -----------------  ----------  -------------------  -----------------------
PSU1   NOT OK    3Y POWER           YESM1300AM  S0A000X601825000091  exhaust
PSU2   OK        3Y POWER           YESM1300AM  S0A000X601825000090  exhaust
root@sonic:/home/admin# pddf_psuutil seninfo
PSU    Status      Output Voltage (V)    Output Current (A)    Output Power (W)    Temperature1 (C)    Fan1 Speed (RPM)
-----  --------  --------------------  --------------------  ------------------  ------------------  ------------------
PSU1   NOT OK                    0.00                  0.00                0.00               N/A                   0
PSU2   OK                       12.06                 21.09              252.00               N/A               13488
root@sonic:/home/admin#
root@sonic:/home/admin#
root@sonic:/home/admin# pddf_psuutil
debug    mfrinfo  numpsus  seninfo  status   version
root@sonic:/home/admin# pddf_psuutil numpsus
2
root@sonic:/home/admin# pddf_psuutil version
PDDF psuutil version 2.0
root@sonic:/home/admin#
root@sonic:/home/admin# pddf_psuutil debug dump-sysfs
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_present
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_model_name
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_power_good
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_mfr_id
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_fan_dir
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_v_out
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_i_out
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-9/9-0058/psu_p_out
...
root@sonic:/home/admin# pddf_fanutil numfans
12
root@sonic:/home/admin# pddf_fanutil status
FAN         Status
----------  --------
Fantray1_1  OK
Fantray1_2  OK
Fantray2_1  OK
Fantray2_2  OK
Fantray3_1  OK
Fantray3_2  OK
Fantray4_1  OK
Fantray4_2  OK
Fantray5_1  OK
Fantray5_2  OK
Fantray6_1  OK
Fantray6_2  OK
root@sonic:/home/admin#
root@sonic:/home/admin# pddf_fanutil direction
FAN         Direction
----------  -----------
Fantray1_1  Exhaust
Fantray1_2  Exhaust
Fantray2_1  Exhaust
Fantray2_2  Exhaust
Fantray3_1  Exhaust
Fantray3_2  Exhaust
Fantray4_1  Exhaust
Fantray4_2  Exhaust
Fantray5_1  Exhaust
Fantray5_2  Exhaust
Fantray6_1  Exhaust
Fantray6_2  Exhaust
root@sonic:/home/admin#
root@sonic:/home/admin# pddf_fanutil getspeed
FAN           SPEED (RPM)
----------  -------------
Fantray1_1           5800
Fantray1_2           5900
Fantray2_1           5800
Fantray2_2           5900
Fantray3_1           5700
Fantray3_2           5800
Fantray4_1           5700
Fantray4_2           5800
Fantray5_1           5800
Fantray5_2           5900
Fantray6_1           5800
Fantray6_2           5900
root@sonic:/home/admin#
root@sonic:/home/admin# pddf_fanutil version
PDDF fanutil version 2.0
root@sonic:/home/admin#
root@sonic:/home/admin# pddf_thermalutil version
PDDF thermalutil version 2.0
root@sonic:/home/admin# pddf_thermalutil gettemp
Temp Sensor    Label           Value
-------------  --------------  -------------------------------
Temp_1         lm75-i2c-18-48  temp1 +25.5 C (high = +80.0 C)
Temp_2         lm75-i2c-18-49  temp1 +28.0 C (high = +80.0 C)
Temp_3         lm75-i2c-18-4a  temp1 +26.5 C (high = +80.0 C)
Temp_4         lm75-i2c-18-4b  temp1 +24.5 C (high = +80.0 C)
Temp_5         lm75-i2c-18-4c  temp1 +28.5 C (high = +80.0 C)
Temp_6         lm75-i2c-18-4e  temp1 +26.5 C (high = +80.0 C)
Temp_7         lm75-i2c-18-4f  temp1 +28.5 C (high = +80.0 C)
root@sonic:/home/admin# 
root@sonic:/home/admin# pddf_thermalutil numthermals
7
root@sonic:/home/admin# pddf_thermalutil debug dump-sysfs
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-0048/hwmon/hwmon7/temp1_max
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-0048/hwmon/hwmon7/temp1_max_hyst
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-0048/hwmon/hwmon7/temp1_input
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-0049/hwmon/hwmon8/temp1_max
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-0049/hwmon/hwmon8/temp1_max_hyst
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-0049/hwmon/hwmon8/temp1_input
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004a/hwmon/hwmon9/temp1_max
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004a/hwmon/hwmon9/temp1_max_hyst
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004a/hwmon/hwmon9/temp1_input
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004b/hwmon/hwmon10/temp1_max
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004b/hwmon/hwmon10/temp1_max_hyst
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004b/hwmon/hwmon10/temp1_input
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004c/hwmon/hwmon11/temp1_max
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004c/hwmon/hwmon11/temp1_max_hyst
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004c/hwmon/hwmon11/temp1_input
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004e/hwmon/hwmon12/temp1_max
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004e/hwmon/hwmon12/temp1_max_hyst
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004e/hwmon/hwmon12/temp1_input
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004f/hwmon/hwmon13/temp1_max
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004f/hwmon/hwmon13/temp1_max_hyst
/sys/bus/i2c/devices/i2c-0/i2c-1/i2c-18/18-004f/hwmon/hwmon13/temp1_input
root@sonic:/home/admin#

Previous command output (if the output of a command-line utility has changed)

Only if a platform is PDDF based then,

root@sonic:/home/admin# pddf_psuutil mfrinfo
PSU1 is Not OK

PSU2 is OK
Manufacture Id: 3Y POWER
Model: YESM1300AM
Serial Number: S0A000X601825000120
Fan Direction: Exhaust

root@sonic:/home/admin# pddf_psuutil seninfo
PSU1 is Not OK

PSU2 is OK
Output Voltage: 12089.0 mv
Output Current: 21031.0 ma
Output Power: 254000.0 mw
Fan1 Speed: 13792 rpm

root@sonic:/home/admin#

New command output (if the output of a command-line utility has changed)

Only if a platform uses PDDF.

root@sonic:/home/admin# 
root@sonic:/home/admin# pddf_psuutil mfrinfo
PSU    Status    Manufacturer ID    Model       Serial               Fan Airflow Direction
-----  --------  -----------------  ----------  -------------------  -----------------------
PSU1   NOT OK    3Y POWER           YESM1300AM  S0A000X601825000091  exhaust
PSU2   OK        3Y POWER           YESM1300AM  S0A000X601825000090  exhaust
root@sonic:/home/admin# pddf_psuutil seninfo
PSU    Status      Output Voltage (V)    Output Current (A)    Output Power (W)    Temperature1 (C)    Fan1 Speed (RPM)
-----  --------  --------------------  --------------------  ------------------  ------------------  ------------------
PSU1   NOT OK                    0.00                  0.00                0.00               N/A                   0
PSU2   OK                       12.06                 21.09              252.00               N/A               13488
root@sonic:/home/admin#

@FuzailBrcm
Copy link
Contributor Author

Fixing
#1459

@jleveque jleveque changed the title Fixing #1459: Remove references to deprecated platform plugins from P… [PDDF] Remove references to deprecated platform plugins Mar 10, 2021
@jleveque jleveque merged commit a4ae643 into sonic-net:master Mar 10, 2021
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
Cleanup 💧 PDDF
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove references to deprecated platform plugins from utilities_common/util_base.py and PDDF
2 participants
@FuzailBrcm @jleveque