summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Kodihalli <dkodihal@in.ibm.com>2017-10-25 04:18:49 -0500
committerDeepak Kodihalli <dkodihal@in.ibm.com>2017-10-25 04:18:49 -0500
commit3f3fa5618bea2e2f5ba436506272ca013951144f (patch)
tree27a0ce1602e8221dfc2eebffb9d87d4e494c0972
parentdfc7ec737bc482bf5f6720b9b239533d9e92616c (diff)
downloadopenpower-occ-control-3f3fa5618bea2e2f5ba436506272ca013951144f.zip
openpower-occ-control-3f3fa5618bea2e2f5ba436506272ca013951144f.tar.gz
Check only CPU presence before reconstructing OCCs
OCC d-bus objects are typically created in response to the CPU inventory being created. At this point of time we just know the CPU is present. It may not be functional. Of course if the CPU is not functional, then the host may or may not choose to set the OCC active, but the OCC object must have been created in response to a present CPU. This commit employs the same logic for reconstructing OCC objects when the OCC app restarts. Previously an OCC object would be created only if corresponding CPU is present and functional. Instead, check only for presence. Change-Id: I4f85a644237b5b5aa7dc3e52d266375b786a8c0a Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
-rw-r--r--occ_finder.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/occ_finder.cpp b/occ_finder.cpp
index b931452..0c02c35 100644
--- a/occ_finder.cpp
+++ b/occ_finder.cpp
@@ -114,12 +114,7 @@ std::vector<std::string> get(sdbusplus::bus::bus& bus)
"Present",
true));
- match.emplace_back(std::make_tuple(
- "xyz.openbmc_project.State.Decorator.OperationalStatus",
- "Functional",
- true));
-
- // Select only if the CPU is marked 'Present' and 'Functional'
+ // Select only if the CPU is marked 'Present'.
// Local variable to make it readable
auto path = entry->first;
auto service = entry->second.begin()->first;
OpenPOWER on IntegriCloud