commit 0b30e97d14a3bdbfe5c5818e7968e352b2777999
author Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Jun 21 14:58:14 2016 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Jun 21 22:33:38 2016 -0400
tree dde2cb168ad4452abdbcf1b3d0e39626991f9f2c
parent 93aed45f230befa01c947173a908b120cfbe7017

Remove org.openbmc.Object.Enumerate interface

Everyone should be using the freedesktop ObjectManager for this.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

obmc/dbuslib/bindings.py

diff --git a/obmc/dbuslib/bindings.py b/obmc/dbuslib/bindings.py
index c7da8b8..3dec5af 100644
--- a/obmc/dbuslib/bindings.py
+++ b/obmc/dbuslib/bindings.py
@@ -144,29 +144,9 @@
     @dbus.service.signal(
         "org.freedesktop.DBus.ObjectManager", signature='oa{sa{sv}}')
     def InterfacesAdded(self, object_path, properties):
-        self.ObjectAdded(object_path, "")
+        pass
 
     @dbus.service.signal(
         "org.freedesktop.DBus.ObjectManager", signature='oas')
     def InterfacesRemoved(self, object_path, interfaces):
         pass
-
-    ## Legacy support, need to eventually refactor out
-    @dbus.service.signal(
-        "org.openbmc.Object.ObjectMapper", signature='ss')
-    def ObjectAdded(self, object_path, interface_name):
-        pass
-
-    ## flattens interfaces
-    @dbus.service.method(
-        'org.openbmc.Object.Enumerate', in_signature='',
-        out_signature='a{sa{sv}}')
-    def enumerate(self):
-        data = {}
-        for objpath in self.objects.keys():
-            props = self.objects[objpath].properties
-            data[objpath] = {}
-            for iface in props.keys():
-                data[objpath].update(props[iface])
-
-        return data