commit 99c8c0e995bfe8bbdbb25705f8e44624fdf7c1a4
author Adriana Kobylak <anoo@us.ibm.com> Mon Apr 17 13:39:11 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Apr 27 02:42:13 2017 +0000
tree 3cb327bf3f43676bfd1aebe1aa187f38ffc82b38
parent a8ade7e4620ed2f407a9f6d0c58ce8462bcabbf6

Activation: Create ActivationBlocksTransition

Create ActivationBlocksTransition when the Activation property is
set to Activating. Remove it when the property is set to anything else.

Change-Id: I7a6a1921f040a2e738751de1a3a138be5869afda
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

activation.hpp

diff --git a/activation.hpp b/activation.hpp
index 4945531..4aff3e5 100755
--- a/activation.hpp
+++ b/activation.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <sdbusplus/bus.hpp>
+#include <sdbusplus/server.hpp>
 #include <xyz/openbmc_project/Software/Activation/server.hpp>
 #include <xyz/openbmc_project/Software/ActivationBlocksTransition/server.hpp>
 #include "xyz/openbmc_project/Software/ExtendedVersion/server.hpp"
@@ -18,6 +18,24 @@
 using ActivationBlocksTransitionInherit = sdbusplus::server::object::object<
  sdbusplus::xyz::openbmc_project::Software::server::ActivationBlocksTransition>;
 
+/** @class ActivationBlocksTransition
+ *  @brief OpenBMC ActivationBlocksTransition implementation.
+ *  @details A concrete implementation for
+ *  xyz.openbmc_project.Software.ActivationBlocksTransition DBus API.
+ */
+class ActivationBlocksTransition : public ActivationBlocksTransitionInherit
+{
+    public:
+        /** @brief Constructs ActivationBlocksTransition.
+         *
+         * @param[in] bus    - The Dbus bus object
+         * @param[in] path   - The Dbus object path
+         */
+        ActivationBlocksTransition(sdbusplus::bus::bus& bus,
+                                   const std::string& path) :
+                   ActivationBlocksTransitionInherit(bus, path.c_str()) {}
+};
+
 /** @class Activation
  *  @brief OpenBMC activation software management implementation.
  *  @details A concrete implementation for
@@ -40,6 +58,8 @@
                    sdbusplus::xyz::openbmc_project::Software::
                    server::Activation::Activations activationStatus) :
                    ActivationInherit(bus, path.c_str(), true),
+                   bus(bus),
+                   path(path),
                    versionId(versionId)
         {
             // Set Properties.
@@ -66,26 +86,17 @@
         RequestedActivations requestedActivation(RequestedActivations value)
                 override;
 
+        /** @brief Persistent sdbusplus DBus bus connection */
+        sdbusplus::bus::bus& bus;
+
+        /** @brief Persistent DBus object path */
+        std::string path;
+
         /** @brief Version id */
         std::string versionId;
-};
 
-/** @class ActivationBlocksTransition
- *  @brief OpenBMC ActivationBlocksTransition implementation.
- *  @details A concrete implementation for
- *  xyz.openbmc_project.Software.ActivationBlocksTransition DBus API.
- */
-class ActivationBlocksTransition : public ActivationBlocksTransitionInherit
-{
-    public:
-        /** @brief Constructs ActivationBlocksTransition.
-         *
-         * @param[in] bus    - The Dbus bus object
-         * @param[in] path   - The Dbus object path
-         */
-        ActivationBlocksTransition(sdbusplus::bus::bus& bus,
-                                   const std::string& path) :
-                   ActivationBlocksTransitionInherit(bus, path.c_str()) {}
+        /** @brief Persistent ActivationBlocksTransition dbus object */
+        std::unique_ptr<ActivationBlocksTransition> activationBlocksTransition;
 };
 
 } // namespace updater