X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=85795e0e6004f7b8241ba4692653119bb71b848b;hb=d422c1189901d34125cd2d46552391c333d1f647;hp=7109609ecc52f6b22a924b0c25075137509ca719;hpb=e75a14703b902feacf665e6893b0565e409ca175;p=sliver-openvswitch.git diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync index 7109609ec..85795e0e6 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync @@ -22,9 +22,7 @@ # - Set the "iface-id" key in the Interface table. # - Set the fail-mode on internal bridges. -import getopt -import logging -import logging.handlers +import argparse import os import signal import subprocess @@ -40,7 +38,8 @@ import ovs.util import ovs.daemon import ovs.db.idl -s_log = logging.getLogger("ovs-xapi-sync") +root_prefix = '' # Prefix for absolute file names, for testing. +vlog = ovs.vlog.Vlog("ovs-xapi-sync") vsctl = "/usr/bin/ovs-vsctl" session = None force_run = False @@ -59,9 +58,9 @@ def init_session(): try: session = XenAPI.xapi_local() session.xenapi.login_with_password("", "") - except: + except XenAPI.Failure, e: session = None - s_log.warning("Couldn't login to XAPI") + vlog.warn("Couldn't login to XAPI (%s)" % e) return False return True @@ -69,7 +68,7 @@ def init_session(): def get_network_by_bridge(br_name): if not init_session(): - s_log.warning("Failed to get bridge id %s because" + vlog.warn("Failed to get bridge id %s because" " XAPI session could not be initialized" % br_name) return None @@ -104,7 +103,7 @@ def get_iface_id(if_name, xs_vif_uuid): return xs_vif_uuid if not init_session(): - s_log.warning("Failed to get interface id %s because" + vlog.warn("Failed to get interface id %s because" " XAPI session could not be initialized" % if_name) return xs_vif_uuid @@ -113,7 +112,7 @@ def get_iface_id(if_name, xs_vif_uuid): rec = session.xenapi.VIF.get_record(vif) return rec['other_config'].get('nicira-iface-id', xs_vif_uuid) except XenAPI.Failure: - s_log.warning("Could not find XAPI entry for VIF %s" % if_name) + vlog.warn("Could not find XAPI entry for VIF %s" % if_name) return xs_vif_uuid @@ -121,7 +120,7 @@ def call_vsctl(args): cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args exitcode = subprocess.call(cmd) if exitcode != 0: - s_log.warning("Couldn't call ovs-vsctl") + vlog.warn("Couldn't call ovs-vsctl") def set_or_delete(d, key, value): @@ -174,8 +173,8 @@ def update_in_band_mgmt(row): other_config = row.other_config if dib and dib not in ['true', 'false']: - s_log.warning('"%s" isn\'t a valid setting for ' - "other_config:disable-in-band on %s" % (dib, row.name)) + vlog.warn('"%s" isn\'t a valid setting for ' + "other_config:disable-in-band on %s" % (dib, row.name)) elif set_or_delete(other_config, 'disable-in-band', dib): row.other_config = other_config @@ -214,52 +213,33 @@ def prune_schema(schema): schema.tables = new_tables -def usage(): - print "usage: %s [OPTIONS] DATABASE" % sys.argv[0] - print "where DATABASE is a socket on which ovsdb-server is listening." - ovs.daemon.usage() - print "Other options:" - print " -h, --help display this help message" - sys.exit(0) - - def handler(signum, _): global force_run if (signum == signal.SIGHUP): force_run = True -def main(argv): +def main(): global force_run - l_handler = logging.handlers.RotatingFileHandler( - "/var/log/openvswitch/ovs-xapi-sync.log") - l_formatter = logging.Formatter('%(filename)s: %(levelname)s: %(message)s') - l_handler.setFormatter(l_formatter) - s_log.addHandler(l_handler) - s_log.setLevel(logging.INFO) + parser = argparse.ArgumentParser() + parser.add_argument("database", metavar="DATABASE", + help="A socket on which ovsdb-server is listening.") + parser.add_argument("--root-prefix", metavar="DIR", + help="Use DIR as alternate root directory" + " (for testing).") - try: - options, args = getopt.gnu_getopt( - argv[1:], 'h', ['help'] + ovs.daemon.LONG_OPTIONS) - except getopt.GetoptError, geo: - sys.stderr.write("%s: %s\n" % (ovs.util.PROGRAM_NAME, geo.msg)) - sys.exit(1) - - for key, value in options: - if key in ['-h', '--help']: - usage() - elif not ovs.daemon.parse_opt(key, value): - sys.stderr.write("%s: unhandled option %s\n" - % (ovs.util.PROGRAM_NAME, key)) - sys.exit(1) - - if len(args) != 1: - sys.stderr.write("%s: exactly one nonoption argument is required " - "(use --help for help)\n" % ovs.util.PROGRAM_NAME) - sys.exit(1) - - remote = args[0] + ovs.vlog.add_args(parser) + ovs.daemon.add_args(parser) + args = parser.parse_args() + ovs.vlog.handle_args(args) + ovs.daemon.handle_args(args) + + global root_prefix + if args.root_prefix: + root_prefix = args.root_prefix + + remote = args.database schema_file = "%s/vswitch.ovsschema" % ovs.dirs.PKGDATADIR schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schema_file)) prune_schema(schema) @@ -269,7 +249,8 @@ def main(argv): # This daemon is usually started before XAPI, but to complete our # tasks, we need it. Wait here until it's up. - while not os.path.exists("/var/run/xapi_init_complete.cookie"): + cookie_file = root_prefix + "/var/run/xapi_init_complete.cookie" + while not os.path.exists(cookie_file): time.sleep(1) signal.signal(signal.SIGHUP, handler) @@ -284,7 +265,7 @@ def main(argv): continue if force_run: - s_log.info("Forced to re-run as the result of a SIGHUP") + vlog.info("Forced to re-run as the result of a SIGHUP") bridges = {} interfaces = {} force_run = False @@ -364,10 +345,10 @@ def main(argv): if __name__ == '__main__': try: - main(sys.argv) + main() except SystemExit: # Let system.exit() calls complete normally raise except: - s_log.exception("traceback") + vlog.exception("traceback") sys.exit(ovs.daemon.RESTART_EXIT_CODE)