commit f9b24bf1b064600bb3f450dbbce475937742c121
author Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Apr 02 16:46:32 2018 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Apr 03 14:39:13 2018 +0000
tree 4c3ca3167d2a7f4088bbe205e57e011f89b60c5f
parent e6add0770686cfdc18ffeb4979eac8d1a0d721ec

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>

obmc/mapper/server.py

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 @@
             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