diff options
author | AppaRao Puli <apparao.puli@linux.intel.com> | 2019-10-01 09:59:40 +0300 |
---|---|---|
committer | Puli, Apparao <apparao.puli@intel.com> | 2019-10-09 04:54:10 +0300 |
commit | ee5456f30fd5e655f306405df9af6e6026d3d1cc (patch) | |
tree | e60729d92c1d5ce1089e3c284160de759d19e227 | |
parent | 124de49a990ba0dd9720c9359cab4e2037e66ac7 (diff) | |
download | provingground-ee5456f30fd5e655f306405df9af6e6026d3d1cc.tar.xz |
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>
-rw-r--r-- | intel-pfr-manager/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intel-pfr-manager/service/src/mainapp.cpp | 4 | ||||
-rw-r--r-- | intel-pfr-manager/service/src/pfr_mgr.cpp | 5 | ||||
-rw-r--r-- | intel-pfr-manager/xyz.openbmc_project.PFR.Manager.service (renamed from intel-pfr-manager/xyz.openbmc_project.Intel.PFR.Manager.service) | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/intel-pfr-manager/CMakeLists.txt b/intel-pfr-manager/CMakeLists.txt index ecdc2dd..a6c976e 100644 --- a/intel-pfr-manager/CMakeLists.txt +++ b/intel-pfr-manager/CMakeLists.txt @@ -8,6 +8,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/service/inc) 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/) diff --git a/intel-pfr-manager/service/src/mainapp.cpp b/intel-pfr-manager/service/src/mainapp.cpp index f044d8a..103ab22 100644 --- a/intel-pfr-manager/service/src/mainapp.cpp +++ b/intel-pfr-manager/service/src/mainapp.cpp @@ -275,10 +275,10 @@ int main() 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(); diff --git a/intel-pfr-manager/service/src/pfr_mgr.cpp b/intel-pfr-manager/service/src/pfr_mgr.cpp index 9186916..d5fba5f 100644 --- a/intel-pfr-manager/service/src/pfr_mgr.cpp +++ b/intel-pfr-manager/service/src/pfr_mgr.cpp @@ -88,9 +88,8 @@ PfrConfig::PfrConfig(sdbusplus::asio::object_server &srv_, 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); diff --git a/intel-pfr-manager/xyz.openbmc_project.Intel.PFR.Manager.service b/intel-pfr-manager/xyz.openbmc_project.PFR.Manager.service index 6c270f8..0f33aad 100644 --- a/intel-pfr-manager/xyz.openbmc_project.Intel.PFR.Manager.service +++ b/intel-pfr-manager/xyz.openbmc_project.PFR.Manager.service @@ -8,7 +8,7 @@ RestartSec=5 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 |