From: Ethan Jackson Date: Fri, 23 Sep 2011 22:24:10 +0000 (-0700) Subject: tests: test-jsonrpc.py whitespace cleanup. X-Git-Tag: v1.3.0~224 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e60a5e26371a7079a9ffcc57d2f96b8ee9de7da9;p=sliver-openvswitch.git tests: test-jsonrpc.py whitespace cleanup. Pleases pep8. --- diff --git a/tests/test-jsonrpc.py b/tests/test-jsonrpc.py index fda9a038d..781f1f473 100644 --- a/tests/test-jsonrpc.py +++ b/tests/test-jsonrpc.py @@ -23,6 +23,7 @@ import ovs.jsonrpc import ovs.poller import ovs.stream + def handle_rpc(rpc, msg): done = False reply = None @@ -43,11 +44,12 @@ def handle_rpc(rpc, msg): else: rpc.error(errno.EPROTO) sys.stderr.write("unsolicited JSON-RPC reply or error\n") - + if reply: rpc.send(reply) return done + def do_listen(name): error, pstream = ovs.stream.PassiveStream.open(name) if error: @@ -98,6 +100,7 @@ def do_listen(name): poller.block() pstream.close() + def do_request(name, method, params_string): params = ovs.json.from_string(params_string) msg = ovs.jsonrpc.Message.create_request(method, params) @@ -123,11 +126,12 @@ def do_request(name, method, params_string): if error: sys.stderr.write("error waiting for reply: %s\n" % os.strerror(error)) sys.exit(1) - + print ovs.json.to_string(msg.to_json()) rpc.close() - + + def do_notify(name, method, params_string): params = ovs.json.from_string(params_string) msg = ovs.jsonrpc.Message.create_notify(method, params) @@ -152,6 +156,7 @@ def do_notify(name, method, params_string): rpc.close() + def main(argv): try: options, args = getopt.gnu_getopt( @@ -198,6 +203,7 @@ def main(argv): func(*args) + def usage(): sys.stdout.write("""\ %s: JSON-RPC test utility for Python @@ -214,6 +220,6 @@ Other options: """) sys.exit(0) + if __name__ == '__main__': main(sys.argv) -