summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-04-02 16:46:32 -0400
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-04-03 14:39:13 +0000
commitf9b24bf1b064600bb3f450dbbce475937742c121 (patch)
tree4c3ca3167d2a7f4088bbe205e57e011f89b60c5f
parente6add0770686cfdc18ffeb4979eac8d1a0d721ec (diff)
downloadphosphor-objmgr-f9b24bf1b064600bb3f450dbbce475937742c121.tar.gz
phosphor-objmgr-f9b24bf1b064600bb3f450dbbce475937742c121.zip
server: discovery: Apply interface filtering rules
We have interface rules but are not applying them on new daemon startup discovery. This results in unintended caching of blacklisted or unspecified interfaces. Resolves openbmc/openbmc#3052 Tested: Built palmetto image and booted BMC to obmc-standby target Change-Id: I57d01f925e51a10abdb55d39922c7f52d2286d91 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--obmc/mapper/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/obmc/mapper/server.py b/obmc/mapper/server.py
index 01c18ee..5e51d65 100644
--- a/obmc/mapper/server.py
+++ b/obmc/mapper/server.py
@@ -102,7 +102,9 @@ def find_dbus_interfaces(conn, service, path, callback, error_callback, **kw):
try:
self.gmo_pending.remove(path)
for k, v in list(objs.items()):
- self.results[k] = v
+ ifaces = {iface: properties for iface, properties in list(
+ filter(lambda x: iface_match(x[0]), v.items()))}
+ self.results[k] = ifaces
except Exception as e:
error_callback(service, path, e)
return None
OpenPOWER on IntegriCloud