datapath: Use unicast Netlink sockets for upcalls.

[openvswitch] / tests / test-jsonrpc.py

diff --git a/tests/test-jsonrpc.py b/tests/test-jsonrpc.py
index 064457e2908f8f04d229d07608fa26f0b7f5b159..781f1f473002c981645a006498994c47911a3767 100644 (file)
--- 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(
@@ -177,7 +182,7 @@ def main(argv):
     args = args[1:]
     if not command_name in commands:
         sys.stderr.write("%s: unknown command \"%s\" "
-                         "(use --help for help)\n" % (argv0, command_name))
+                         "(use --help for help)\n" % (argv[0], command_name))
         sys.exit(1)
 
     func, n_args = commands[command_name]
@@ -185,19 +190,20 @@ def main(argv):
         if len(args) < n_args[0]:
             sys.stderr.write("%s: \"%s\" requires at least %d arguments but "
                              "only %d provided\n"
-                             % (argv0, command_name, n_args, len(args)))
+                             % (argv[0], command_name, n_args, len(args)))
             sys.exit(1)
     elif type(n_args) == int:
         if len(args) != n_args:
             sys.stderr.write("%s: \"%s\" requires %d arguments but %d "
                              "provided\n"
-                             % (argv0, command_name, n_args, len(args)))
+                             % (argv[0], command_name, n_args, len(args)))
             sys.exit(1)
     else:
         assert False
 
     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)
-