Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / bmcweb / adc4f0db57568c5e5d2a3398fce00dbb050a3b72
commitadc4f0db57568c5e5d2a3398fce00dbb050a3b72[log] [tgz]
authorShawn McCarney <shawnmm@us.ibm.com>Wed Jul 24 09:21:50 2019 -0500
committerEd Tanous <ed.tanous@intel.com>Thu Aug 15 21:06:16 2019 +0000
tree139c24202599a19b85639ec3105835a008c70364
parentb76f9ca126d5c1abcd8b833a511d784531dbb3a1 [diff]
Redfish: Move power supplies to Power schema

Made the following enhancements related to power supplies in Redfish:
* Moved power supplies from Chassis schema to Power schema
* Added support for multiple power supplies within one chassis
* Added support for multiple sensors associated with one power supply
* Set power supply Name and MemberId to inventory item name (like
  powersupply0) rather than sensor name (like ps0_input_power).
* Set power supply VPD fields like Manufacturer and SerialNumber

Also improved support for power sensors that are not related to power
supplies, such as VRM sensors.  These sensors are no longer treated as
power supplies, and they will not be included in the Power schema
output.  They should instead be included in the SensorCollection output
when that support is completed.

Uses an ObjectMapper association named "inventory" to find the power
supply inventory item associated with a power sensor.  For example:

  /xyz/openbmc_project/sensors/power/ps0_input_power/inventory ->
  /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0

See https://github.com/openbmc/docs/blob/master/sensor-architecture.md
for more information on associations between sensors and low-level
hardware items.

Test Plan:
  https://gist.github.com/smccarney/43b2fae304575302af61332a71280d74

Tested: Verified Power and Thermal output on a Witherspoon system.
        Tested with power sensors that were/were not associated
        with power supplies.  Verified power supply properties in
        Power output.  Verified that power supplies are no longer
        returned in Chassis collection output.  Ran Redfish
        Service Validator.

Change-Id: I50db389b5df011bfb561d31aafb33cc4bf7fcde6
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>
2 files changed
tree: 139c24202599a19b85639ec3105835a008c70364
  1. cmake/
  2. crow/
  3. include/
  4. redfish-core/
  5. scripts/
  6. src/
  7. static/
  8. .clang-format
  9. .clang-tidy
  10. .gitignore
  11. aspeed_purley.cmake
  12. bmcweb.service.in
  13. bmcweb.socket
  14. build_x86.sh
  15. cmake-format.json
  16. CMakeLists.txt
  17. CMakeLists.txt.in
  18. DEVELOPING.md
  19. JenkinsFile
  20. LICENCE
  21. MAINTAINERS
  22. pam-webserver
  23. README.md
  24. Redfish.md
README.md

OpenBMC webserver

This component attempts to be a "do everything" embedded webserver for openbmc.

Capabilities

At this time, the webserver implements a few interfaces:

  • Authentication middleware that supports cookie and token based authentication, as well as CSRF prevention backed by linux PAM authentication credentials.
  • An (incomplete) attempt at replicating phosphor-dbus-rest interfaces in C++. Right now, a few of the endpoint definitions work as expected, but there is still a lot of work to be done. The portions of the interface that are functional are designed to work correctly for phosphor-webui, but may not yet be complete.
  • Replication of the rest-dbus backend interfaces to allow bmc debug to logged in users.
  • An initial attempt at a read-only redfish interface. Currently the redfish interface targets ServiceRoot, SessionService, AccountService, Roles, and ManagersService. Some functionality here has been shimmed to make development possible. For example, there exists only a single user role.
  • SSL key generation at runtime. See the configuration section for details.
  • Static file hosting. Currently, static files are hosted from the fixed location at /usr/share/www. This is intended to allow loose coupling with yocto projects, and allow overriding static files at build time.
  • Dbus-monitor over websocket. A generic endpoint that allows UIs to open a websocket and register for notification of events to avoid polling in single page applications. (this interface may be modified in the future due to security concerns.

Configuration

BMCWeb is configured by setting -D flags that correspond to options in bmcweb/CMakeLists.txt and then compiling. For example, cmake -DBMCWEB_ENABLE_KVM=NO ... followed by make. The option names become C++ preprocessor symbols that control which code is compiled into the program.

When BMCWeb starts running, it reads persistent configuration data (such as UUID and session data) from a local file. If this is not usable, it generates a new configuration.

When BMCWeb SSL support is enabled and a usable certificate is not found, it will generate a self-sign a certificate before launching the server. The keys are generated by the prime256v1 algorithm. The certificate

  • is issued by C=US, O=OpenBMC, CN=testhost,
  • is valid for 10 years,
  • has a random serial number, and
  • is signed using the SHA-256 algorithm.

Crow patches

The crow project has had a number of additions to make it more useful for use in the OpenBmc Project. A non-exhaustive list is below. At the time of this writing, the crow project is not accepting patches, so for the time being crow will simply be checked in as is.

  • Applied clang-format to the whole crow tree. This was done without regard for arrays and fixed data structures, but was deemed to be overall better than the inconsistent formatting that existed in upstream previously.
  • Crow server now calls stop before destruction of the Crow app object.
  • Fixed a bug where timed out websockets would seg fault the system by accessing a destroyed socket object without null checks when in SSL mode.
  • Added a TestSocketAdapter class that could be used to unit test server behavior without utilizing a socket.
  • Added the "getRoutes" call to both the app and the routing Trie class that allows consumers to poll the server for all (or a subset of) registered web routes in the system.
  • Hardcoded the websocket implementation for binary mode, instead of leaving protocol unspecified.
  • Move most uses of std::unordered_map to boost::flat_map to lower memory consumption, and (in some cases) to improve memory locality.
  • Adjust the addHeaders mechanism to use a fixed string instead of a full map implementation to avoid unnecessary mallocs and reduce the number of scatter gather buffers on an http response.
  • Change server name header from Crow/0.1 to iBMC
  • Starts the http server io_context inside the main thread, instead of creating a new thread.
  • Removes all BMCWEB_MSVC_WORKAROUND flags.
  • Removes the behavior that causes a 301 redirect for paths that end in "/", and simply returns the endpoint requested. This was done for redfish compatibility.
  • Removes the built in crow/json.hpp package and adds nlohmann json package as the first class json package for crow.
  • Move uses of boost::array to std::array where possible.
  • Add the ability to get a reference to the crow::Request object on websocket connection to allow checking header values.
  • Patch http handler to call middlewares on websocket connections to allow authentication to be applied appropriately.
  • Adds an is_secure flag to provide information about whether or not the payload was delivered over ssl.