X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=79a6bde124e78cfb2a3b7db1b745e7c98bc40e6e;hb=d2cee5a48ebe850ccb72cd1e860a90e5ec0248fd;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..79a6bde12 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2009, 2010, 2011 Nicira Networks +# Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,12 +22,9 @@ # - 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 import sys import time @@ -36,12 +33,10 @@ import XenAPI import ovs.dirs from ovs.db import error from ovs.db import types -import ovs.util import ovs.daemon import ovs.db.idl -s_log = logging.getLogger("ovs-xapi-sync") -vsctl = "/usr/bin/ovs-vsctl" +vlog = ovs.vlog.Vlog("ovs-xapi-sync") session = None force_run = False @@ -59,9 +54,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 +64,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 +99,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,15 +108,32 @@ 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 -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") +# By default, the "vm-id" external id in the Interface table is the +# same as "xs-vm-uuid". This may be overridden by defining a +# "nicira-vm-id" key in the "other_config" field of the VM +# record of XAPI. +def get_vm_id(if_name, xs_vm_uuid): + if not if_name.startswith("vif") and not if_name.startswith("tap"): + # Treat whatever was passed into 'xs_vm_uuid' as a default + # value for non-VIFs. + return xs_vm_uuid + + if not init_session(): + vlog.warn("Failed to get vm id for interface id %s because" + " XAPI session could not be initialized" % if_name) + return xs_vm_uuid + + try: + vm = session.xenapi.VM.get_by_uuid(xs_vm_uuid) + rec = session.xenapi.VM.get_record(vm) + return rec['other_config'].get('nicira-vm-id', xs_vm_uuid) + except XenAPI.Failure: + vlog.warn("Could not find XAPI entry for VIF %s" % if_name) + return xs_vm_uuid def set_or_delete(d, key, value): @@ -174,8 +186,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 +226,29 @@ 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", default='', + 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) + + 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,25 +258,31 @@ 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 = args.root_prefix + "/var/run/xapi_init_complete.cookie" + while not os.path.exists(cookie_file): time.sleep(1) signal.signal(signal.SIGHUP, handler) bridges = {} # Map from bridge name to xs_network_uuids - interfaces = {} # Map from interface name to xs-vif-uuid + iface_ids = {} # Map from xs-vif-uuid to iface-id + vm_ids = {} # Map from xs-vm-uuid to vm-id + seqno = idl.change_seqno # Sequence number when we last processed the db while True: - if not force_run and not idl.run(): + idl.run() + if not force_run and seqno == idl.change_seqno: poller = ovs.poller.Poller() idl.wait(poller) poller.block() 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 = {} + iface_ids = {} + vm_ids = {} force_run = False + seqno = idl.change_seqno txn = ovs.db.idl.Transaction(idl) @@ -299,9 +294,8 @@ def main(argv): # New bridge. update_fail_mode(row) update_in_band_mgmt(row) - if new_xnu != old_xnu: - # New bridge or bridge's xs-network-uuids has changed. - update_bridge_id(row) + + update_bridge_id(row) new_bridges[row.name] = new_xnu bridges = new_bridges @@ -309,7 +303,8 @@ def main(argv): for row in idl.tables["Interface"].rows.itervalues(): iface_by_name[row.name] = row - new_interfaces = {} + new_iface_ids = {} + new_vm_ids = {} for row in idl.tables["Interface"].rows.itervalues(): # Match up paired vif and tap devices. if row.name.startswith("vif"): @@ -330,17 +325,31 @@ def main(argv): for k in keys: set_external_id(row, k, vif.external_ids.get(k)) - # If it's a new interface or its xs-vif-uuid has changed, then - # obtain the iface-id from XAPI. + # Map from xs-vif-uuid to iface-id. # # (A tap's xs-vif-uuid comes from its vif. That falls out # naturally from the copy loop above.) - new_xvu = row.external_ids.get("xs-vif-uuid", "") - old_xvu = interfaces.get(row.name) - if old_xvu != new_xvu: - iface_id = get_iface_id(row.name, new_xvu) - if iface_id and row.external_ids.get("iface-id") != iface_id: - set_external_id(row, "iface-id", iface_id) + xvu = row.external_ids.get("xs-vif-uuid") + if xvu: + iface_id = (new_iface_ids.get(xvu) + or iface_ids.get(xvu) + or get_iface_id(row.name, xvu)) + new_iface_ids[xvu] = iface_id + else: + # No xs-vif-uuid therefore no iface-id. + iface_id = None + set_external_id(row, "iface-id", iface_id) + + # Map from xs-vm-uuid to vm-id. + xvmu = row.external_ids.get("xs-vm-uuid") + if xvmu: + vm_id = (new_vm_ids.get(xvmu) + or vm_ids.get(xvmu) + or get_vm_id(row.name, xvmu)) + new_vm_ids[xvmu] = vm_id + else: + vm_id = None + set_external_id(row, "vm-id", vm_id) # When there's a vif and a tap, the tap is active (used for # traffic). When there's just a vif, the vif is active. @@ -355,19 +364,18 @@ def main(argv): set_external_id(vif, "iface-status", "active") else: set_external_id(row, "iface-status", None) - - new_interfaces[row.name] = new_xvu - interfaces = new_interfaces + iface_ids = new_iface_ids + vm_ids = new_vm_ids txn.commit_block() 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)