X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-unixctl.py;h=ab03479bea2412d3a2df47418753c7d895df95e7;hb=77a922c7e53c3e9a2618d1f1a622bb2442f535b0;hp=c262a958da9ca92104afe99fb5bef4fcf5586348;hpb=f4ec6ff479ace8f9b893f883557235f2ea6bab8f;p=openvswitch diff --git a/tests/test-unixctl.py b/tests/test-unixctl.py index c262a958..ab03479b 100644 --- a/tests/test-unixctl.py +++ b/tests/test-unixctl.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Nicira Networks. +# Copyright (c) 2012 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ import sys import ovs.daemon import ovs.unixctl +import ovs.unixctl.server vlog = ovs.vlog.Vlog("test-unixctl") exiting = False @@ -39,6 +40,11 @@ def unixctl_echo_error(conn, argv, aux): conn.reply_error(str(argv)) +def unixctl_log(conn, argv, unused_aux): + vlog.info(str(argv[0])) + conn.reply(None) + + def unixctl_block(conn, unused_argv, unused_aux): pass @@ -55,7 +61,7 @@ def main(): ovs.vlog.handle_args(args) ovs.daemon.daemonize_start() - error, server = ovs.unixctl.UnixctlServer.create(args.unixctl) + error, server = ovs.unixctl.server.UnixctlServer.create(args.unixctl) if error: ovs.util.ovs_fatal(error, "could not create unixctl server at %s" % args.unixctl, vlog) @@ -63,6 +69,7 @@ def main(): ovs.unixctl.command_register("exit", "", 0, 0, unixctl_exit, "aux_exit") ovs.unixctl.command_register("echo", "[arg ...]", 1, 2, unixctl_echo, "aux_echo") + ovs.unixctl.command_register("log", "[arg ...]", 1, 2, unixctl_log, None) ovs.unixctl.command_register("echo_error", "[arg ...]", 1, 2, unixctl_echo_error, "aux_echo_error") ovs.unixctl.command_register("block", "", 0, 0, unixctl_block, None)