commit f5bd891cf5afb30085d1a5e93d86bd022c097238
author Tom Joseph <tomjoseph@in.ibm.com> Mon Nov 19 09:49:21 2018 +0530
committer Tom Joseph <tomjoseph@in.ibm.com> Tue Nov 20 09:45:55 2018 +0530
tree 426c12cf2da3825056392426114aa3b919acde23
parent 23886efd0780cd6c87741a9ecac2d55d9ab4c7a8

Refactor mapper application to enable unit tests

Change-Id: I58cac8879f93ce49bfb654a1bf559d7f77b5b486
Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>

phosphor-ldap-mapper/ldap_mapper_mgr.cpp

diff --git a/phosphor-ldap-mapper/ldap_mapper_mgr.cpp b/phosphor-ldap-mapper/ldap_mapper_mgr.cpp
index a321331..a1d6e11 100644
--- a/phosphor-ldap-mapper/ldap_mapper_mgr.cpp
+++ b/phosphor-ldap-mapper/ldap_mapper_mgr.cpp
@@ -19,8 +19,10 @@
 using PrivilegeMappingExists = sdbusplus::xyz::openbmc_project::User::Common::
     Error::PrivilegeMappingExists;
 
-LDAPMapperMgr::LDAPMapperMgr(sdbusplus::bus::bus &bus, const char *path) :
-    MapperMgrIface(bus, path), bus(bus), path(path)
+LDAPMapperMgr::LDAPMapperMgr(sdbusplus::bus::bus &bus, const char *path,
+                             const char *filePath) :
+    MapperMgrIface(bus, path),
+    bus(bus), path(path), persistPath(filePath)
 {
 }
 
@@ -37,9 +39,10 @@
 
     // Create mapping for LDAP privilege mapper entry
     auto entry = std::make_unique<phosphor::user::LDAPMapperEntry>(
-        bus, mapperObject.c_str(), groupName, privilege, *this);
+        bus, mapperObject.c_str(), persistPath.c_str(), groupName, privilege,
+        *this);
 
-    serialize(*entry, entryId);
+    serialize(*entry, entryId, persistPath);
 
     PrivilegeMapperList.emplace(entryId, std::move(entry));
 
@@ -49,7 +52,7 @@
 void LDAPMapperMgr::deletePrivilegeMapper(Id id)
 {
     // Delete the persistent representation of the privilege mapper.
-    fs::path mapperPath(LDAP_MAPPER_PERSIST_PATH);
+    fs::path mapperPath(persistPath);
     mapperPath /= std::to_string(id);
     fs::remove(mapperPath);
 
@@ -96,7 +99,7 @@
 {
     namespace fs = std::experimental::filesystem;
 
-    fs::path dir(LDAP_MAPPER_PERSIST_PATH);
+    fs::path dir(persistPath);
     if (!fs::exists(dir) || fs::is_empty(dir))
     {
         return;
@@ -108,7 +111,7 @@
         size_t idNum = std::stol(id);
         auto entryPath = std::string(mapperMgrRoot) + '/' + id;
         auto entry = std::make_unique<phosphor::user::LDAPMapperEntry>(
-            bus, entryPath.c_str(), *this);
+            bus, entryPath.c_str(), persistPath.c_str(), *this);
         if (deserialize(file.path(), *entry))
         {
             entry->Ifaces::emit_object_added();