commit da66fd84209f93d9f9c11ea45d45819b92a4a98f
author Patrick Venture <venture@google.com> Mon Jun 03 11:11:24 2019 -0700
committer Patrick Venture <venture@google.com> Mon Jun 03 11:24:59 2019 -0700
tree d076a0c3958f3466ddf67501cd78529c4584b24f
parent a2d8239473ea9c441e157481c83195c5dcffe5bc

merge Verification and Update statuses

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ibb9c1c9f9cb7e9cda18f4e8dddb31d57a12f0d90

tools/updater.cpp

diff --git a/tools/updater.cpp b/tools/updater.cpp
index 0819c80..98ef86e 100644
--- a/tools/updater.cpp
+++ b/tools/updater.cpp
@@ -114,8 +114,7 @@
     using namespace std::chrono_literals;
 
     static constexpr auto verificationSleep = 5s;
-    ipmi_flash::VerifyCheckResponses result =
-        ipmi_flash::VerifyCheckResponses::other;
+    ipmi_flash::ActionStatus result = ipmi_flash::ActionStatus::unknown;
 
     try
     {
@@ -138,22 +137,21 @@
                 std::fprintf(stderr, "Received invalid metadata response!!!\n");
             }
 
-            result =
-                static_cast<ipmi_flash::VerifyCheckResponses>(resp.metadata[0]);
+            result = static_cast<ipmi_flash::ActionStatus>(resp.metadata[0]);
 
             switch (result)
             {
-                case ipmi_flash::VerifyCheckResponses::failed:
+                case ipmi_flash::ActionStatus::failed:
                     std::fprintf(stderr, "failed\n");
                     exitLoop = true;
                     break;
-                case ipmi_flash::VerifyCheckResponses::other:
+                case ipmi_flash::ActionStatus::unknown:
                     std::fprintf(stderr, "other\n");
                     break;
-                case ipmi_flash::VerifyCheckResponses::running:
+                case ipmi_flash::ActionStatus::running:
                     std::fprintf(stderr, "running\n");
                     break;
-                case ipmi_flash::VerifyCheckResponses::success:
+                case ipmi_flash::ActionStatus::success:
                     std::fprintf(stderr, "success\n");
                     exitLoop = true;
                     break;
@@ -183,7 +181,7 @@
      * which exceptions from the lower layers allow one to try and delete the
      * blobs to rollback the state and progress.
      */
-    return (result == ipmi_flash::VerifyCheckResponses::success);
+    return (result == ipmi_flash::ActionStatus::success);
 }
 
 bool UpdateHandler::verifyFile(const std::string& target)