summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2018-10-17 19:36:29 -0500
committerAdriana Kobylak <anoo@us.ibm.com>2018-10-17 19:38:06 -0500
commit24bb08cc6cb49a93717b0f2b33cb1d612cc75dad (patch)
treeed21e6a042a9765b774cdab49f76f655eb5f644e
parent4772a944dc93438752af5deee1dd2350c8c69389 (diff)
downloadopenpower-pnor-code-mgmt-24bb08cc6cb49a93717b0f2b33cb1d612cc75dad.tar.gz
openpower-pnor-code-mgmt-24bb08cc6cb49a93717b0f2b33cb1d612cc75dad.zip
msl_verify: Create error log when verify fails
Create a Version::Incompatible error log when the verification fails to make the failure more visible to the user. Tested: Verified a new error log was created with the metadata. "/xyz/openbmc_project/logging/entry/4": { "AdditionalData": [ "_PID=1540", "ACTUAL_VERSION=IPCS-FP5295G2-OP9-v2.0.8-2.8", "MIN_VERSION=v2.2", "VERSION_PURPOSE=xyz.openbmc_project.Software.Version.VersionPurpose.Host" ], "Message": "xyz.openbmc_project.Software.Version.Error.Incompatible", Change-Id: I3d13265b4a7e6a9a58cbd7cd619a162fb11da164 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
-rw-r--r--msl_verify_main.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/msl_verify_main.cpp b/msl_verify_main.cpp
index 85911ddb7..181063269 100644
--- a/msl_verify_main.cpp
+++ b/msl_verify_main.cpp
@@ -2,6 +2,10 @@
#include "msl_verify.hpp"
+#include <phosphor-logging/elog-errors.hpp>
+#include <phosphor-logging/elog.hpp>
+#include <xyz/openbmc_project/Software/Version/error.hpp>
+
int main(int argc, char* argv[])
{
using MinimumShipLevel = openpower::software::image::MinimumShipLevel;
@@ -9,7 +13,15 @@ int main(int argc, char* argv[])
if (!minimumShipLevel.verify())
{
- // TODO Create error log
+ using namespace phosphor::logging;
+ using IncompatibleErr = sdbusplus::xyz::openbmc_project::Software::
+ Version::Error::Incompatible;
+ using Incompatible =
+ xyz::openbmc_project::Software::Version::Incompatible;
+
+ report<IncompatibleErr>(prev_entry<Incompatible::MIN_VERSION>(),
+ prev_entry<Incompatible::ACTUAL_VERSION>(),
+ prev_entry<Incompatible::VERSION_PURPOSE>());
}
return 0;
OpenPOWER on IntegriCloud