commit cc1ed68651a6904bb06a422fb758bf1795f5e5ce
author AppaRao Puli <apparao.puli@linux.intel.com> Tue Oct 01 12:29:40 2019 +0530
committer Jason M. Bills <jason.m.bills@linux.intel.com> Wed Apr 08 13:12:15 2020 -0700
tree 7f9cc1eb81a9c49e4430c61c8f5315da976bf922
parent e4e9565e19a2260485cfc7fc24d8a74f4b5c2ded

Removed company prefix from 'intel-pfr' name

Removed 'Intel' Prefix from D-Bus path and
interface related to PFR as it is generic feature.
Different OEM's can have their own way of implementing
the PFR feature but the D-Bus interface for exposing properties
like Provisioning and locking status should be implementation
agnostic. So remove 'Intel' Prefix from D-Bus path and interface
names in Intel PFR manager implementation.

Tested:
Verified using redfish URI '/redfish/v1/Systems/system'
along with dependent patch in bmcweb and observed correct
response on PFR enabled platform.
RESPONSE:
........
"Oem": {
        "OpenBmc": {
            "FirmwareProvisioning": {
                "Locked": true,
                "Provisioned": true
            }
        }
    }
.....

Change-Id: Id70ea5b54427d8d884147204f9028d7d9b2da99e
Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecdc2dd..a6c976e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,5 @@
 add_subdirectory(libpfr)
 add_subdirectory(service)
 
-set(SERVICE_FILES
-    ${PROJECT_SOURCE_DIR}/xyz.openbmc_project.Intel.PFR.Manager.service)
+set(SERVICE_FILES ${PROJECT_SOURCE_DIR}/xyz.openbmc_project.PFR.Manager.service)
 install(FILES ${SERVICE_FILES} DESTINATION /lib/systemd/system/)

service/src/mainapp.cpp

diff --git a/service/src/mainapp.cpp b/service/src/mainapp.cpp
index f044d8a..103ab22 100644
--- a/service/src/mainapp.cpp
+++ b/service/src/mainapp.cpp
@@ -275,10 +275,10 @@
     auto conn = std::make_shared<sdbusplus::asio::connection>(io);
     stateTimer = std::make_unique<boost::asio::steady_timer>(io);
     initTimer = std::make_unique<boost::asio::steady_timer>(io);
-    conn->request_name("xyz.openbmc_project.Intel.PFR.Manager");
+    conn->request_name("xyz.openbmc_project.PFR.Manager");
     auto server = sdbusplus::asio::object_server(conn);
 
-    // Create Intel PFR attributes object and interface
+    // Create PFR attributes object and interface
     pfrConfigObject = std::make_unique<intel::pfr::PfrConfig>(server, conn);
 
     pfrVersionObjects.clear();

service/src/pfr_mgr.cpp

diff --git a/service/src/pfr_mgr.cpp b/service/src/pfr_mgr.cpp
index 9186916..d5fba5f 100644
--- a/service/src/pfr_mgr.cpp
+++ b/service/src/pfr_mgr.cpp
@@ -88,9 +88,8 @@
     server(srv_),
     conn(conn_)
 {
-    pfrCfgIface =
-        server.add_interface("/xyz/openbmc_project/intel_pfr",
-                             "xyz.openbmc_project.Intel_PFR.Attributes");
+    pfrCfgIface = server.add_interface("/xyz/openbmc_project/pfr",
+                                       "xyz.openbmc_project.PFR.Attributes");
 
     getProvisioningStatus(ufmLocked, ufmProvisioned);
 

xyz.openbmc_project.PFR.Manager.service

diff --git a/xyz.openbmc_project.Intel.PFR.Manager.service b/xyz.openbmc_project.PFR.Manager.service
similarity index 84%
rename from xyz.openbmc_project.Intel.PFR.Manager.service
rename to xyz.openbmc_project.PFR.Manager.service
index 6c270f8..0f33aad 100644
--- a/xyz.openbmc_project.Intel.PFR.Manager.service
+++ b/xyz.openbmc_project.PFR.Manager.service
@@ -8,7 +8,7 @@
 StartLimitInterval=0
 SyslogIdentifier=intel-pfr-manager
 Type=dbus
-BusName=xyz.openbmc_project.Intel.PFR.Manager
+BusName=xyz.openbmc_project.PFR.Manager
 
 [Install]
 WantedBy=multi-user.target