commit fa5daf446fd5c8edcc6e8a43364f97aaed99e787
author Eddie James <eajames@us.ibm.com> Fri Sep 01 11:51:28 2017 -0500
committer Edward A. James <eajames@us.ibm.com> Thu Oct 12 10:03:30 2017 -0500
tree feb4bfa4b61f14e152c15ef848bfeed39788af02
parent 2308b8bfaf1307c76c2a50984047a71fdaff7e53

remove Delete from Version

- Since the Activation object inherits Delete and implements a Delete
method, we don't need to do so for the Version object.

Change-Id: I1da26c3475872c1324a25b92ad8891ff8d3cabbc
Signed-off-by: Eddie James <eajames@us.ibm.com>

item_updater.cpp

diff --git a/item_updater.cpp b/item_updater.cpp
index 5ef6bd0..9e558ce 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -138,8 +138,7 @@
                                 path,
                                 version,
                                 purpose,
-                                filePath,
-                                *this)));
+                                filePath)));
     }
     else
     {
@@ -248,8 +247,7 @@
                                      path,
                                      version,
                                      purpose,
-                                     "",
-                                     *this)));
+                                     "")));
         }
         else if (0 == iter.path().native().compare(0, PNOR_RW_PREFIX_LEN,
                                                       PNOR_RW_PREFIX))

version.cpp

diff --git a/version.cpp b/version.cpp
index 8e36071..5dbab35 100644
--- a/version.cpp
+++ b/version.cpp
@@ -93,11 +93,6 @@
     return keys;
 }
 
-void Version::delete_()
-{
-    parent.erase(getId(version()));
-}
-
 } // namespace updater
 } // namespace software
 } // namespace openpower

version.hpp

diff --git a/version.hpp b/version.hpp
index d2c0624..8cb7e37 100644
--- a/version.hpp
+++ b/version.hpp
@@ -2,7 +2,6 @@
 
 #include <sdbusplus/bus.hpp>
 #include "xyz/openbmc_project/Software/Version/server.hpp"
-#include "xyz/openbmc_project/Object/Delete/server.hpp"
 #include "xyz/openbmc_project/Common/FilePath/server.hpp"
 
 namespace openpower
@@ -16,7 +15,6 @@
 
 using VersionInherit = sdbusplus::server::object::object<
         sdbusplus::xyz::openbmc_project::Software::server::Version,
-        sdbusplus::xyz::openbmc_project::Object::server::Delete,
         sdbusplus::xyz::openbmc_project::Common::server::FilePath>;
 
 /** @class Version
@@ -34,16 +32,13 @@
          * @param[in] versionString  - The version string
          * @param[in] versionPurpose - The version purpose
          * @param[in] filePath       - The image filesystem path
-         * @param[in] parent         - The version's parent
          */
         Version(sdbusplus::bus::bus& bus,
                 const std::string& objPath,
                 const std::string& versionString,
                 VersionPurpose versionPurpose,
-                const std::string& filePath,
-                ItemUpdater& parent) :
-                        VersionInherit(bus, (objPath).c_str(), true),
-                        parent(parent)
+                const std::string& filePath) :
+                        VersionInherit(bus, (objPath).c_str(), true)
         {
             // Set properties.
             purpose(versionPurpose);
@@ -78,15 +73,6 @@
          * @return The id.
          */
         static std::string getId(const std::string& version);
-
-        /** @brief Deletes the D-Bus object and removes image.
-         *
-         */
-        void delete_() override;
-
-    private:
-        ItemUpdater& parent;
-
 };
 
 } // namespace updater