Refactor: Make createActivation() common
The function is almost the same for ubi and static layout, except a few
differences that creates the ubi objects.
Add below pure virtual functions for ubi to create ubi specific objects
* createActivationObject()
* createVersionObject()
Then it is possible to move most of the code in createActivation() into
the commone one.
Tested: On the last commit of the patch series, run code update and
factory reset on Witherspoon and all work fine.
Change-Id: Ieb3e783bc5b251529a55909f9e9f644230b274e7
Signed-off-by: Lei YU <mine260309@gmail.com>
diff --git a/item_updater.cpp b/item_updater.cpp
index 06f3bc8..f321b02 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -4,6 +4,7 @@
#include "xyz/openbmc_project/Common/error.hpp"
+#include <filesystem>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
@@ -13,9 +14,114 @@
{
namespace updater
{
+namespace server = sdbusplus::xyz::openbmc_project::Software::server;
+namespace fs = std::filesystem;
+
using namespace sdbusplus::xyz::openbmc_project::Common::Error;
using namespace phosphor::logging;
+void ItemUpdater::createActivation(sdbusplus::message::message& m)
+{
+ using SVersion = server::Version;
+ using VersionPurpose = SVersion::VersionPurpose;
+ namespace msg = sdbusplus::message;
+ namespace variant_ns = msg::variant_ns;
+
+ sdbusplus::message::object_path objPath;
+ std::map<std::string, std::map<std::string, msg::variant<std::string>>>
+ interfaces;
+ m.read(objPath, interfaces);
+
+ std::string path(std::move(objPath));
+ std::string filePath;
+ auto purpose = VersionPurpose::Unknown;
+ std::string version;
+
+ for (const auto& intf : interfaces)
+ {
+ if (intf.first == VERSION_IFACE)
+ {
+ for (const auto& property : intf.second)
+ {
+ if (property.first == "Purpose")
+ {
+ // Only process the Host and System images
+ auto value = SVersion::convertVersionPurposeFromString(
+ variant_ns::get<std::string>(property.second));
+
+ if (value == VersionPurpose::Host ||
+ value == VersionPurpose::System)
+ {
+ purpose = value;
+ }
+ }
+ else if (property.first == "Version")
+ {
+ version = variant_ns::get<std::string>(property.second);
+ }
+ }
+ }
+ else if (intf.first == FILEPATH_IFACE)
+ {
+ for (const auto& property : intf.second)
+ {
+ if (property.first == "Path")
+ {
+ filePath = variant_ns::get<std::string>(property.second);
+ }
+ }
+ }
+ }
+ if ((filePath.empty()) || (purpose == VersionPurpose::Unknown))
+ {
+ return;
+ }
+
+ // Version id is the last item in the path
+ auto pos = path.rfind("/");
+ if (pos == std::string::npos)
+ {
+ log<level::ERR>("No version id found in object path",
+ entry("OBJPATH=%s", path.c_str()));
+ return;
+ }
+
+ auto versionId = path.substr(pos + 1);
+
+ if (activations.find(versionId) == activations.end())
+ {
+ // Determine the Activation state by processing the given image dir.
+ auto activationState = server::Activation::Activations::Invalid;
+ AssociationList associations = {};
+ if (validateImage(filePath))
+ {
+ activationState = server::Activation::Activations::Ready;
+ // Create an association to the host inventory item
+ associations.emplace_back(std::make_tuple(
+ ACTIVATION_FWD_ASSOCIATION, ACTIVATION_REV_ASSOCIATION,
+ HOST_INVENTORY_PATH));
+ }
+
+ fs::path manifestPath(filePath);
+ manifestPath /= MANIFEST_FILE;
+ std::string extendedVersion =
+ (Version::getValue(
+ manifestPath.string(),
+ std::map<std::string, std::string>{{"extended_version", ""}}))
+ .begin()
+ ->second;
+
+ auto activation = createActivationObject(
+ path, versionId, extendedVersion, activationState, associations);
+ activations.emplace(versionId, std::move(activation));
+
+ auto versionPtr =
+ createVersionObject(path, versionId, version, purpose, filePath);
+ versions.emplace(versionId, std::move(versionPtr));
+ }
+ return;
+}
+
void ItemUpdater::createActiveAssociation(const std::string& path)
{
assocs.emplace_back(