diff --git a/confluent/httpapi.py b/confluent/httpapi.py index 165b1ed8..debf48dd 100644 --- a/confluent/httpapi.py +++ b/confluent/httpapi.py @@ -229,17 +229,22 @@ def resourcehandler(env, start_response): return start_response('200 OK', headers) if mimetype == 'text/html': - for datum in _assemble_html(hdlr, resource): + for datum in _assemble_html(hdlr, resource, querydict): yield datum else: for datum in _assemble_json(hdlr, resource): yield datum -def _assemble_html(responses, resource): +def _assemble_html(responses, resource, querydict): yield '' yield 'Confluent REST Explorer: ' + resource + '' yield '
' + if querydict: + yield 'Response to input data:
' + yield json.dumps(querydict, separators=(',', ': '), + indent=4, sort_keys=True) + yield '
' yield 'Only values that have their' yield 'respective values honored by the confluent server.
' yield '' diff --git a/plugins/hardwaremanagement/ipmi.py b/plugins/hardwaremanagement/ipmi.py index 4ab907cb..aecc8218 100644 --- a/plugins/hardwaremanagement/ipmi.py +++ b/plugins/hardwaremanagement/ipmi.py @@ -259,9 +259,9 @@ class IpmiHandler(object): elif 'update' == self.op: self.call_ipmicmd(self.ipmicmd.set_power, self.inputdata['powerstate']) power = self.call_ipmicmd(self.ipmicmd.get_power) - print repr(power) + return msg.PowerState(node=self.node, + state=power['powerstate']) - def create(nodes, element, configmanager, inputdata): if element == '_console/session': @@ -272,7 +272,7 @@ def create(nodes, element, configmanager, inputdata): return IpmiIterator('update', nodes, element, configmanager, inputdata) def update(nodes, element, configmanager, inputdata): - create(nodes, element, configmanager, inputdata) + return create(nodes, element, configmanager, inputdata)