Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / 3c530fbdd1f40ea89856465130ba39a95ce115c2
commit3c530fbdd1f40ea89856465130ba39a95ce115c2[log] [tgz]
authorBrandon Wyman <bjwyman@gmail.com>Tue Apr 13 13:13:22 2021 -0500
committerBrandon Wyman <bjwyman@gmail.com>Tue Apr 13 13:26:48 2021 -0500
treefa66307bb9cc16864d6828f280657eaf8df813d4
parentc12c53b985b9ac12c3c83df47371e7c2c70ae21b [diff]
psu-ng: Fix failing CI tests due to IBM_VPD

When c12c53b985b9ac12c3c83df47371e7c2c70ae21b merged, the CI tests for
the phosphor-power repository started intermittently failing.

The expected calls for updateInventory() do not apply if the
ibm-vpd=false, which is the default.

Add #if IBM_VPD check around test calls that are only expected if that
is enabled.

Tested:
     x86sdk
       $ meson --reconfigure ... -Dibm-vpd=false ... x86build
       $ ninja -C x86build
       $ ./x86build/phosphor-power-supply/test/phosphor-power-supply-tests
       Verify no tests FAILED.
     x86sdk
       $ meson --reconfigure ... -Dibm-vpd=true ... x86build
       $ ninja -C x86build
       $ ./x86build/phosphor-power-supply/test/phosphor-power-supply-tests
       Verify no tests FAILED.
     Run openbmc-build-scripts/scripts/build-unit-test-docker
       Verify SUCCESS.

See:
    https://gerrit.openbmc-project.xyz/c/openbmc/openbmc-build-scripts/+/42141
      (Fix for meson problem in CI)
    https://github.com/openbmc/docs/blob/master/testing/local-ci-build.md
      (How to run local CI)

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Change-Id: I4d481d7a493157b298e28d87cb2d962a8bdf5ccf
1 file changed
tree: fa66307bb9cc16864d6828f280657eaf8df813d4
  1. cold-redundancy/
  2. example/
  3. org/
  4. phosphor-power-sequencer/
  5. phosphor-power-supply/
  6. phosphor-regulators/
  7. power-sequencer/
  8. power-supply/
  9. services/
  10. test/
  11. tools/
  12. .clang-format
  13. .gitignore
  14. argument.hpp
  15. device.hpp
  16. device_monitor.hpp
  17. elog-errors.hpp
  18. file_descriptor.hpp
  19. gpio.cpp
  20. gpio.hpp
  21. LICENSE
  22. MAINTAINERS
  23. meson.build
  24. meson_options.txt
  25. names_values.hpp
  26. pmbus.cpp
  27. pmbus.hpp
  28. README.md
  29. types.hpp
  30. utility.cpp
  31. utility.hpp
README.md

Overview

This repository contains applications for configuring and monitoring devices that deliver power to the system.

  • cold-redundancy: Application that makes power supplies work in Cold Redundancy mode and rotates them at intervals.
  • phosphor-power-sequencer: Applications for configuring and monitoring power sequencer and related devices that support JSON-driven configuration.
  • phosphor-power-supply: Next generation power supply monitoring application.
  • phosphor-regulators: JSON-driven application that configures and monitors voltage regulators.
  • power-sequencer: A power sequencer monitoring application.
  • power-supply: Original power supply monitoring application.
  • tools/power-utils: Power supply utilities.

Build

To build all applications in this repository:

  meson build
  ninja -C build

To clean the repository and remove all build output:

  rm -rf build

You can specify meson options to customize the build process. For example, you can specify:

  • Which applications to build and install.
  • Application-specific configuration data, such as power sequencer type.
  • Whether to build tests.

Power Supply Monitor and Util JSON config

Several applications in this repository require a PSU JSON config to run. The JSON config file provides information for:

  • Where to access the pmbus attributes
  • Which attribute file in pmbus maps to which property and interface in D-Bus
  • Which kernel device directory is used on which PSU

There is an example psu.json to describe the necessary configurations.

  • inventoryPMBusAccessType defines the pmbus access type, which tells the service which sysfs type to use to read the attributes. The possible values are:
    • Base: The base dir, e.g. /sys/bus/i2c/devices/3-0069/
    • Hwmon: The hwmon dir, e.g. /sys/bus/i2c/devices/3-0069/hwmon/hwmonX/
    • Debug: The pmbus debug dir, e.g. /sys/kernel/debug/pmbus/hwmonX/
    • DeviceDebug: The device debug dir, e.g. '/sys/kernel/debug/./`
    • HwmonDeviceDebug: The hwmon device debug dir, e.g. /sys/kernel/debug/pmbus/hwmonX/cffps1/
  • fruConfigs defines the mapping between the attribute file and the FRU inventory interface and property. The configuration example below indicates that the service will read part_number attribute file from a directory specified by the above pmbus access type, and assign to PartNumber property in xyz.openbmc_project.Inventory.Decorator.Asset interface.
      "fruConfigs": [
    {
      "propertyName": "PartNumber",
      "fileName": "part_number",
      "interface": "xyz.openbmc_project.Inventory.Decorator.Asset"
    }
  ]
  • psuDevices defines the kernel device dir for each PSU in inventory. The configuration example below indicates that powersupply0's device is located in /sys/bus/i2c/devices/3-0069.
      "psuDevices": {
    "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0069",
  }