Rename Version::Errors to Image::Errors
The Version interface is a public interface, and errors are being
added to it:
https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-dbus-interfaces/+/13836/
This conflicts with the internal Version errors, so rename the
internal one to an Image namespace since that's not a public
interface and make more sense since the errors deal with failures
during image file extraction.
Tested:
Uploaded an invalid tar file (u-boot.bin) and the new Image::Error
was created:
"/xyz/openbmc_project/logging/entry/2": {
"AdditionalData": [
"PATH=/tmp/images/u-boot.bin",
"_PID=1348"
],
"Description": "An internal BMC error occurred",
"EventID": "None",
"Id": 2,
"Message": "xyz.openbmc_project.Software.Image.Error.UnTarFailure",
Change-Id: I6f6c84e2ea782c8ebc952bba4d5cee6be232f08f
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/image_manager.cpp b/image_manager.cpp
index 8bae16c..1a530de 100644
--- a/image_manager.cpp
+++ b/image_manager.cpp
@@ -18,7 +18,7 @@
#include <phosphor-logging/elog.hpp>
#include <phosphor-logging/log.hpp>
#include <string>
-#include <xyz/openbmc_project/Software/Version/error.hpp>
+#include <xyz/openbmc_project/Software/Image/error.hpp>
namespace phosphor
{
@@ -28,11 +28,11 @@
{
using namespace phosphor::logging;
-using namespace sdbusplus::xyz::openbmc_project::Software::Version::Error;
+using namespace sdbusplus::xyz::openbmc_project::Software::Image::Error;
namespace Software = phosphor::logging::xyz::openbmc_project::Software;
-using ManifestFail = Software::Version::ManifestFileFailure;
-using UnTarFail = Software::Version::UnTarFailure;
-using InternalFail = Software::Version::InternalFailure;
+using ManifestFail = Software::Image::ManifestFileFailure;
+using UnTarFail = Software::Image::UnTarFailure;
+using InternalFail = Software::Image::InternalFailure;
namespace fs = std::experimental::filesystem;
struct RemovablePath