pytools: obmcutil: Consistent naming for command descriptors

Change-Id: Ibb6d90dbca9c1bffd7b714dc70342b7927ced94e
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

1 files changed, 17 insertions, 17 deletions

diff --git a/pytools/obmcutil b/pytools/obmcutil
index 06d3fae..9bb8428 100644
--- a/pytools/obmcutil
+++ b/pytools/obmcutil
@@ -4,7 +4,7 @@ import sys
 import dbus
 import argparse
 
-dbus_objects = {
+descriptors = {
     'power': {
         'bus_name': 'org.openbmc.control.Power',
         'object_name': '/org/openbmc/control/power0',
@@ -65,17 +65,17 @@ dbus_objects = {
     'state' : ['bmcstate', 'chassisstate', 'hoststate']
 }
 
-def run_one_command(dbus_bus, objinfo):
-    bus = objinfo['bus_name']
-    obj = objinfo['object_name']
-    iface = objinfo['interface_name']
+def run_one_command(dbus_bus, descriptor):
+    bus = descriptor['bus_name']
+    obj = descriptor['object_name']
+    iface = descriptor['interface_name']
     dbus_obj = dbus_bus.get_object(bus, obj)
 
-    if (objinfo.has_key('property')):
-        prop = objinfo['property']
+    if (descriptor.has_key('property')):
+        prop = descriptor['property']
         dbus_iface = dbus.Interface(dbus_obj, "org.freedesktop.DBus.Properties")
-        if objinfo.has_key('value'):
-            dbus_iface.Set(iface, prop, objinfo['value'])
+        if descriptor.has_key('value'):
+            dbus_iface.Set(iface, prop, descriptor['value'])
         else:
             dbus_prop = dbus_iface.Get(iface, prop)
             print '{:<20}: {}'.format(prop, str(dbus_prop))
@@ -85,23 +85,23 @@ def run_one_command(dbus_bus, objinfo):
         for p in props:
             print p + " = " + str(props[p])
 
-def run_all_commands(dbus_bus, commands):
-    if isinstance(commands, dict):
-        run_one_command(dbus_bus, commands)
+def run_all_commands(dbus_bus, recipe):
+    if isinstance(recipe, dict):
+        run_one_command(dbus_bus, recipe)
         return
 
-    assert isinstance(commands, list)
-    for command in commands:
-        run_one_command(dbus_bus, dbus_objects[command])
+    assert isinstance(recipe, list)
+    for command in recipe:
+        run_one_command(dbus_bus, descriptors[command])
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('recipe', choices=sorted(dbus_objects.keys()))
+    parser.add_argument('recipe', choices=sorted(descriptors.keys()))
     args = parser.parse_args()
 
     dbus_bus = dbus.SystemBus()
     try:
-        run_all_commands(dbus_bus, dbus_objects[args.recipe], args)
+        run_all_commands(dbus_bus, descriptors[args.recipe], args)
     finally:
         dbus_bus.close()