Remove the PowerSupplyUnderVoltageFault error
Since the VIN_UV_FAULT check was combined with the INPUT_FAULT_WARN
check, we no longer need this error. However, since they are now
combined, update the wording on PowerSupplyInputFault to indicate that
it could be due to an undervoltage condition.
Add a trailing clarification statement to check the cables and/or the
power source to the power supply, to avoid confusion now that we have
added the power supply to the call out.
Change-Id: I5bb0285ee1f2f866ad92decf8e679b26bff3f06f
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
diff --git a/elog-errors.hpp b/elog-errors.hpp
index d50d7b1..3582c49 100644
--- a/elog-errors.hpp
+++ b/elog-errors.hpp
@@ -71,22 +71,22 @@
namespace sdbusplus
{
-namespace xyz
+namespace org
{
-namespace openbmc_project
+namespace open_power
{
-namespace Common
+namespace Witherspoon
{
-namespace Callout
+namespace Fault
{
namespace Error
{
- struct Inventory;
+ struct PowerSupplyInputFault;
} // namespace Error
-} // namespace Callout
-} // namespace Common
-} // namespace openbmc_project
-} // namespace xyz
+} // namespace Fault
+} // namespace Witherspoon
+} // namespace open_power
+} // namespace org
} // namespace sdbusplus
namespace sdbusplus
@@ -151,22 +151,22 @@
namespace sdbusplus
{
-namespace org
+namespace xyz
{
-namespace open_power
+namespace openbmc_project
{
-namespace Witherspoon
+namespace Common
{
-namespace Fault
+namespace Callout
{
namespace Error
{
- struct PowerSupplyInputFault;
+ struct Inventory;
} // namespace Error
-} // namespace Fault
-} // namespace Witherspoon
-} // namespace open_power
-} // namespace org
+} // namespace Callout
+} // namespace Common
+} // namespace openbmc_project
+} // namespace xyz
} // namespace sdbusplus
namespace sdbusplus
@@ -291,26 +291,6 @@
namespace sdbusplus
{
-namespace org
-{
-namespace open_power
-{
-namespace Witherspoon
-{
-namespace Fault
-{
-namespace Error
-{
- struct PowerSupplyUnderVoltageFault;
-} // namespace Error
-} // namespace Fault
-} // namespace Witherspoon
-} // namespace open_power
-} // namespace org
-} // namespace sdbusplus
-
-namespace sdbusplus
-{
namespace xyz
{
namespace openbmc_project
@@ -661,54 +641,6 @@
{
namespace Fault
{
-namespace _PowerSupplyUnderVoltageFault
-{
-
-struct RAW_STATUS
-{
- static constexpr auto str = "RAW_STATUS=%s";
- static constexpr auto str_short = "RAW_STATUS";
- using type = std::tuple<std::decay_t<decltype(str)>,const char*>;
- explicit constexpr RAW_STATUS(const char* a) : _entry(entry(str, a)) {};
- type _entry;
-};
-
-} // namespace _PowerSupplyUnderVoltageFault
-
-struct PowerSupplyUnderVoltageFault
-{
- static constexpr auto L = level::ERR;
- using RAW_STATUS = _PowerSupplyUnderVoltageFault::RAW_STATUS;
- using CALLOUT_INVENTORY_PATH = xyz::openbmc_project::Common::Callout::Inventory::CALLOUT_INVENTORY_PATH;
- using metadata_types = std::tuple<RAW_STATUS, CALLOUT_INVENTORY_PATH>;
-
-};
-
-} // namespace Fault
-} // namespace Witherspoon
-} // namespace open_power
-} // namespace org
-
-
-namespace details
-{
-
-template <>
-struct map_exception_type<sdbusplus::org::open_power::Witherspoon::Fault::Error::PowerSupplyUnderVoltageFault>
-{
- using type = org::open_power::Witherspoon::Fault::PowerSupplyUnderVoltageFault;
-};
-
-}
-
-namespace org
-{
-namespace open_power
-{
-namespace Witherspoon
-{
-namespace Fault
-{
namespace _PowerSupplyInputFault
{
diff --git a/org/open_power/Witherspoon/Fault.errors.yaml b/org/open_power/Witherspoon/Fault.errors.yaml
index 451f0fa..96a57ad 100644
--- a/org/open_power/Witherspoon/Fault.errors.yaml
+++ b/org/open_power/Witherspoon/Fault.errors.yaml
@@ -1,7 +1,7 @@
-- name: PowerSupplyUnderVoltageFault
- description: The power supply has indicated an input or under voltage fault condition.
- name: PowerSupplyInputFault
- description: The power supply has indicated an input fault or warn condition.
+ description: The power supply has indicated an input or under voltage
+ condition. Check the power supply cabling and/or input power
+ source.
- name: PowerSupplyShouldBeOn
description: The power supply indicated that it is not on when it should be.
- name: PowerSupplyOutputOvercurrent
diff --git a/org/open_power/Witherspoon/Fault.metadata.yaml b/org/open_power/Witherspoon/Fault.metadata.yaml
index d9b69b6..aa9db00 100644
--- a/org/open_power/Witherspoon/Fault.metadata.yaml
+++ b/org/open_power/Witherspoon/Fault.metadata.yaml
@@ -1,10 +1,3 @@
-- name: PowerSupplyUnderVoltageFault
- level: ERR
- meta:
- - str: "RAW_STATUS=%s"
- type: string
- inherits:
- - xyz.openbmc_project.Common.Callout.Inventory
- name: PowerSupplyInputFault
level: ERR
meta: