[PATCH pyphosphor] Remove org.openbmc.Object.Enumerate interface

OpenBMC Patches openbmc-patches at stwcx.xyz
Wed Jun 22 13:00:54 AEST 2016


From: Brad Bishop <bradleyb at fuzziesquirrel.com>

Everyone should be using the freedesktop ObjectManager for this.

Signed-off-by: Brad Bishop <bradleyb at fuzziesquirrel.com>
---
 obmc/dbuslib/bindings.py | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

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 @@ class DbusObjectManager(dbus.service.Object):
     @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
-- 
2.9.0




More information about the openbmc mailing list