mirror of
https://github.com/openvswitch/ovs
synced 2025-08-22 18:07:40 +00:00
b302f315b3
A user reported a failure of test 2364 "vlog - RFC5424 facility - Python2" with an exit code that says that the test-unixctl process died from an uncaught exception. Unfortunately the exception didn't show up in the log. This commit should make the exception show up (it deletes some boilerplate we use in our Python-based daemons to make them restart themselves on failure, which isn't needed or appropriate for a test script). Reported-by: Sanket Sudake <sanket@infracloud.io> Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-May/046840.html Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Numan Siddique <nusiddiq@redhat.com>
91 lines
2.5 KiB
Python
91 lines
2.5 KiB
Python
# 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.
|
|
# You may obtain a copy of the License at:
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import argparse
|
|
|
|
import ovs.daemon
|
|
import ovs.unixctl
|
|
import ovs.unixctl.server
|
|
|
|
vlog = ovs.vlog.Vlog("test-unixctl")
|
|
exiting = False
|
|
|
|
|
|
def unixctl_exit(conn, unused_argv, aux):
|
|
assert aux == "aux_exit"
|
|
global exiting
|
|
|
|
exiting = True
|
|
conn.reply(None)
|
|
|
|
|
|
def unixctl_echo(conn, argv, aux):
|
|
assert aux == "aux_echo"
|
|
conn.reply(str(argv))
|
|
|
|
|
|
def unixctl_echo_error(conn, argv, aux):
|
|
assert aux == "aux_echo_error"
|
|
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
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(
|
|
description="Open vSwitch unixctl test program for Python")
|
|
parser.add_argument("--unixctl", help="UNIXCTL socket location or 'none'.")
|
|
|
|
ovs.daemon.add_args(parser)
|
|
ovs.vlog.add_args(parser)
|
|
args = parser.parse_args()
|
|
ovs.daemon.handle_args(args)
|
|
ovs.vlog.handle_args(args)
|
|
|
|
ovs.daemon.daemonize_start()
|
|
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)
|
|
|
|
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)
|
|
ovs.daemon.daemonize_complete()
|
|
|
|
vlog.info("Entering run loop.")
|
|
poller = ovs.poller.Poller()
|
|
while not exiting:
|
|
server.run()
|
|
server.wait(poller)
|
|
if exiting:
|
|
poller.immediate_wake()
|
|
poller.block()
|
|
server.close()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|