commit 926b35dc292d607128f0b1b17250c5563797eb1c
author Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Sep 19 14:20:04 2016 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Sep 20 15:46:27 2016 -0400
tree eca50df52a3cbfc68dcfc2169ab480e8be75ea06
parent 5d4890c2c8b3dffa7090250abdcca11e960eda1e

server: remove dbus_find_interfaces

This can be a blocking call, so refactor discovery such that an
org.freedesktop.Properties.Get call is invoked at discovery time
for instrospected objects with associations.

Change-Id: I9c4d54bbc3834c7970eac23cba4045fc4dd0cd6a
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 f9bf5ca..0120de5 100644
--- a/obmc/mapper/server.py
+++ b/obmc/mapper/server.py
@@ -83,6 +83,13 @@
                 lambda x: x.Introspect())
 
         @staticmethod
+        def _get(path, iface, prop):
+            return _FindInterfaces._invoke_method(
+                path,
+                dbus.PROPERTIES_IFACE,
+                lambda x: x.Get(iface, prop))
+
+        @staticmethod
         def _get_managed_objects(om):
             return _FindInterfaces._invoke_method(
                 om,
@@ -118,6 +125,15 @@
             ifaces = filter(
                 self._match,
                 [x.attrib.get('name') for x in root.findall('interface')])
+            ifaces = {x: {} for x in ifaces}
+
+            iface = obmc.dbuslib.enums.OBMC_ASSOCIATIONS_IFACE
+            if iface in ifaces:
+                associations = self._get(
+                    path, iface, 'associations')
+                if associations:
+                    ifaces[iface]['associations'] = associations
+
             self.results[path] = ifaces
 
             if dbus.BUS_DAEMON_IFACE + '.ObjectManager' in ifaces:
@@ -263,6 +279,7 @@
             cache_entry = self.cache_get(path)
             old = self.interfaces_get(cache_entry, owner)
             new = list(set(interfaces).union(old))
+            new = {x: iprops[x] for x in new}
             self.update_interfaces(path, owner, old, new)
 
     def interfaces_removed_handler(self, path, interfaces, **kw):
@@ -348,7 +365,8 @@
         new_assoc = []
         old_assoc = []
         if self.is_association(added):
-            new_assoc = self.dbus_get_associations(path, owner, new)
+            iface = obmc.dbuslib.enums.OBMC_ASSOCIATIONS_IFACE
+            new_assoc = new[iface]['associations']
         if self.is_association(removed):
             old_assoc = self.index_get_associations(path, [owner])
         self.update_associations(
@@ -481,18 +499,6 @@
         if not owners:
             del index[path]
 
-    def dbus_get_associations(self, path, owner, obj):
-        iface = obmc.dbuslib.enums.OBMC_ASSOCIATIONS_IFACE
-        if 'associations' in obj[iface]:
-            return obj[iface]['associations']
-
-        # fallback to dbus
-        obj = self.bus.get_object(owner, path, introspect=False)
-        iface = dbus.Interface(obj, dbus.PROPERTIES_IFACE)
-        return [(str(f), str(r), str(e)) for f, r, e in iface.Get(
-            obmc.dbuslib.enums.OBMC_ASSOCIATIONS_IFACE,
-            'associations')]
-
     def index_get_associations(self, path, owners=[], direction='forward'):
         forward = 'forward' if direction == 'forward' else 'reverse'
         reverse = 'reverse' if direction == 'forward' else 'forward'