diff options
author | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-13 14:43:37 -0400 |
---|---|---|
committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-13 14:43:37 -0400 |
commit | edd61754d546ca105b523b4c1c6a8b00ae075d9c (patch) | |
tree | 01a7a390afe59a452b3be90f51d03248ddd97135 | |
parent | 055028558d367a2405f553ce1786a7c9e44da8e2 (diff) |
Update PowerManager for new IP Power firmware.
-rwxr-xr-x | powermanager.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/powermanager.py b/powermanager.py index 674f64d..1c9acf0 100755 --- a/powermanager.py +++ b/powermanager.py | |||
@@ -104,7 +104,7 @@ def find_port(): | |||
104 | dash is a dict key. | 104 | dash is a dict key. |
105 | 105 | ||
106 | """ | 106 | """ |
107 | POWER_PORTS = { 'pound': 'P60', 'pandaboard': 'P61' } | 107 | POWER_PORTS = { 'pound': 'p61', 'pandaboard': 'p62' } |
108 | 108 | ||
109 | script_name = os.path.basename(sys.argv[0]) | 109 | script_name = os.path.basename(sys.argv[0]) |
110 | dash_pos = script_name.find('-') | 110 | dash_pos = script_name.find('-') |
@@ -112,7 +112,7 @@ def find_port(): | |||
112 | raise ValueError('No dash found in script name: {}'.format(script_name)) | 112 | raise ValueError('No dash found in script name: {}'.format(script_name)) |
113 | port_key = script_name[:dash_pos] | 113 | port_key = script_name[:dash_pos] |
114 | try: | 114 | try: |
115 | return POWER_PORTS[port_key] | 115 | return (port_key, POWER_PORTS[port_key]) |
116 | except KeyError: | 116 | except KeyError: |
117 | raise KeyError('Port key not found in dict: {}'.format(port_key)) | 117 | raise KeyError('Port key not found in dict: {}'.format(port_key)) |
118 | 118 | ||
@@ -134,7 +134,8 @@ def main(): | |||
134 | 134 | ||
135 | args = parse_args() | 135 | args = parse_args() |
136 | 136 | ||
137 | port = find_port() | 137 | machine, port = find_port() |
138 | print('Operating on port {} machine {}.'.format(port, machine)) | ||
138 | mgr = PowerManager(HOST, USERNAME, password, port) | 139 | mgr = PowerManager(HOST, USERNAME, password, port) |
139 | try: | 140 | try: |
140 | PowerManager.dispatch_action(mgr, args.action) | 141 | PowerManager.dispatch_action(mgr, args.action) |