commit 53d93023fd8782c9618c1e2b5f08430eedc11ee8
author Patrick Williams <patrick@stwcx.xyz> Wed Apr 26 14:45:48 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed Apr 26 14:45:53 2017 -0500
tree c6450524faf3181d81bdd637fd1c7b032110edaf
parent e02cffd0ce0bbc10912d498a048c684bf6d5b3a9

obmcutil: Remove most old org.openbmc commands

Fixes openbmc/openbmc#1522.

Change-Id: Icbbc67f712f70e408207b7fb4cec3e70992009b3
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

pytools/obmcutil

diff --git a/pytools/obmcutil b/pytools/obmcutil
index 3265940..5ebe70b 100644
--- a/pytools/obmcutil
+++ b/pytools/obmcutil
@@ -23,16 +23,6 @@
         pass
 
 
-def merge_interfaces(objs):
-    for op in objs:
-        merged = {}
-        for interface, properties in objs[op].items():
-            merged.update(properties)
-
-        del objs[op]
-        objs[op] = merged
-
-
 def printDict(name, data):
     if (isinstance(data, dict)):
         print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
@@ -72,11 +62,6 @@
         'object_name': '/org/openbmc/control/power0',
         'interface_name': 'org.openbmc.control.Power'
     },
-    'chassis': {
-        'bus_name': 'org.openbmc.control.Chassis',
-        'object_name': '/org/openbmc/control/chassis0',
-        'interface_name': 'org.openbmc.control.Chassis'
-    },
     'poweron': {
         'bus_name': 'xyz.openbmc_project.State.Host',
         'object_name': '/xyz/openbmc_project/state/host0',
@@ -114,53 +99,6 @@
         'object_name': '/org/openbmc/sensors/host/BootProgress',
         'interface_name': 'org.openbmc.SensorValue'
     },
-    'biosupdate': {
-        'bus_name': 'org.openbmc.control.Flash',
-        'object_name': '/org/openbmc/control/flash/bios',
-        'interface_name': 'org.openbmc.Flash',
-        'method': 'updateViaTftp',
-    },
-    'biosflash': {
-        'bus_name': 'org.openbmc.control.Flash',
-        'object_name': '/org/openbmc/control/flash/bios',
-        'interface_name': 'org.openbmc.Flash',
-    },
-    'bmcupdate': {
-        'bus_name': 'org.openbmc.control.BmcFlash',
-        'object_name': '/org/openbmc/control/flash/bmc',
-        'interface_name': 'org.openbmc.control.BmcFlash',
-        'method': 'updateViaTftp',
-    },
-    'bmcflash': {
-        'bus_name': 'org.openbmc.control.BmcFlash',
-        'object_name': '/org/openbmc/control/flash/bmc',
-        'interface_name': 'org.openbmc.control.BmcFlash',
-    },
-    'getinventory': {
-        'bus_name': 'org.openbmc.Inventory',
-        'object_name': '/org/openbmc/inventory',
-        'interface_name': 'org.freedesktop.DBus.ObjectManager',
-        'method': 'GetManagedObjects',
-        'transform': merge_interfaces
-    },
-    'getsensors': {
-        'bus_name': 'org.openbmc.Sensors',
-        'object_name': '/org/openbmc/sensors',
-        'interface_name': 'org.freedesktop.DBus.ObjectManager',
-        'method': 'GetManagedObjects',
-        'transform': merge_interfaces
-    },
-    'host': {
-        'bus_name': 'org.openbmc.control.Host',
-        'object_name': '/org/openbmc/control/host0',
-        'interface_name': 'org.openbmc.control.Host',
-    },
-    'setdebugmode': {
-        'bus_name': 'org.openbmc.control.Host',
-        'object_name': '/org/openbmc/control/host0',
-        'interface_name': 'org.openbmc.control.Host',
-        'property': 'debug_mode'
-    },
 }
 
 # Commands that need to run multiple objects above