commit 06a69d7b0674857ebe708025c17ce2fca93e1bf0
author Zbigniew Kurzynski <zbigniew.kurzynski@intel.com> Fri Sep 27 10:57:38 2019 +0200
committer Zbigniew Kurzynski <zbigniew.kurzynski@intel.com> Wed Oct 09 10:10:07 2019 +0000
tree 6c09c0489c69b8dc88f56ec2a53f1ae2101e9d52
parent 2e8c3a50140b755e9f5c934ca94fb9c5731451b1

Support uploading multiple certificates [install-backend]

To enable multiple certificates support in certificate manager,
and resolve following issues :

 openbmc/phosphor-certificate-manager#3,
 openbmc/bmcweb#84

the Install method should return a string with dbus path to just
created certificate. It will allow to recognize a new certificate
and return proper values in redfish response to certificate POST
method.

This change depends on interface change available under this review:
 https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-dbus-interfaces/+/25632

Signed-off-by: Zbigniew Kurzynski <zbigniew.kurzynski@intel.com>
Depends-On: I58bfb8a86f56923e7f7aca0d10ed7838537d7c14
Change-Id: Ic8ab545c931d89a022acdabd5a755e3bf39e5a79

certs_manager.cpp

diff --git a/certs_manager.cpp b/certs_manager.cpp
index a03088d..d2d9342 100644
--- a/certs_manager.cpp
+++ b/certs_manager.cpp
@@ -93,7 +93,7 @@
     }
 }
 
-void Manager::install(const std::string filePath)
+std::string Manager::install(const std::string filePath)
 {
     using NotAllowed =
         sdbusplus::xyz::openbmc_project::Common::Error::NotAllowed;
@@ -110,6 +110,7 @@
     certificatePtr = std::make_unique<Certificate>(
         bus, certObjectPath, certType, unitToRestart, certInstallPath, filePath,
         false, certWatchPtr);
+    return certObjectPath;
 }
 
 void Manager::delete_()

certs_manager.hpp

diff --git a/certs_manager.hpp b/certs_manager.hpp
index da47d35..91c5e43 100644
--- a/certs_manager.hpp
+++ b/certs_manager.hpp
@@ -62,7 +62,7 @@
      *
      *  @param[in] filePath - Certificate key file path.
      */
-    void install(const std::string filePath) override;
+    std::string install(const std::string filePath) override;
 
     /** @brief Delete the certificate (and possibly revert
      *         to a self-signed certificate).