X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=f458654468917f56361bc4e5f9c357c66ed5061d;hb=1b0fdca5faa8674a5e67f7435a43b361fca003cf;hp=b2d935833c10d40d339ac5105714add5edc89211;hpb=7f76372156020c305de539ef6b1ab13f8cb19de0;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 b2d935833..f45865446 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync @@ -23,7 +23,8 @@ # - Set the fail-mode on internal bridges. import getopt -import logging, logging.handlers +import logging +import logging.handlers import os import signal import subprocess @@ -39,11 +40,13 @@ import ovs.util import ovs.daemon import ovs.db.idl +root_prefix = '' # Prefix for absolute file names, for testing. s_log = logging.getLogger("ovs-xapi-sync") -vsctl="/usr/bin/ovs-vsctl" +vsctl = "/usr/bin/ovs-vsctl" session = None force_run = False + # Set up a session to interact with XAPI. # # On system start-up, OVS comes up before XAPI, so we can't log into the @@ -57,13 +60,14 @@ 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") + s_log.warning("Couldn't login to XAPI (%s)" % e) return False return True + def get_network_by_bridge(br_name): if not init_session(): s_log.warning("Failed to get bridge id %s because" @@ -77,6 +81,7 @@ def get_network_by_bridge(br_name): return None + # By default, the "bridge-id" external id in the Bridge table is the # same as "xs-network-uuids". This may be overridden by defining a # "nicira-bridge-id" key in the "other_config" field of the network @@ -88,6 +93,7 @@ def get_bridge_id(br_name, default=None): return rec['other_config'].get('nicira-bridge-id', default) return None + # By default, the "iface-id" external id in the Interface table is the # same as "xs-vif-uuid". This may be overridden by defining a # "nicira-iface-id" key in the "other_config" field of the VIF @@ -111,12 +117,14 @@ def get_iface_id(if_name, xs_vif_uuid): s_log.warning("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") + def set_or_delete(d, key, value): if value is None: if key in d: @@ -128,11 +136,13 @@ def set_or_delete(d, key, value): return True return False + def set_external_id(row, key, value): external_ids = row.external_ids if set_or_delete(external_ids, key, value): row.external_ids = external_ids + # XenServer does not call interface-reconfigure on internal networks, # which is where the fail-mode would normally be set. def update_fail_mode(row): @@ -146,7 +156,8 @@ def update_fail_mode(row): pools = session.xenapi.pool.get_all() if len(pools) == 1: prec = session.xenapi.pool.get_record(pools[0]) - fail_mode = prec['other_config'].get('vswitch-controller-fail-mode') + fail_mode = prec['other_config'].get( + 'vswitch-controller-fail-mode') if fail_mode not in ['standalone', 'secure']: fail_mode = 'standalone' @@ -154,6 +165,7 @@ def update_fail_mode(row): if row.fail_mode != fail_mode: row.fail_mode = fail_mode + def update_in_band_mgmt(row): rec = get_network_by_bridge(row.name) if not rec: @@ -168,6 +180,7 @@ def update_in_band_mgmt(row): elif set_or_delete(other_config, 'disable-in-band', dib): row.other_config = other_config + def update_bridge_id(row): id_ = get_bridge_id(row.name, row.external_ids.get("xs-network-uuids")) if not id_: @@ -175,6 +188,7 @@ def update_bridge_id(row): set_external_id(row, "bridge-id", id_.split(";")[0]) + def keep_table_columns(schema, table_name, columns): table = schema.tables.get(table_name) if not table: @@ -190,6 +204,7 @@ def keep_table_columns(schema, table_name, columns): table.columns = new_columns return table + def prune_schema(schema): new_tables = {} new_tables["Bridge"] = keep_table_columns( @@ -199,32 +214,42 @@ def prune_schema(schema): schema, "Interface", ("name", "external_ids")) 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" + print """\ +Other options: + --root-prefix=DIR Use DIR as alternate root directory (for testing). + -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): global force_run - l_handler = logging.handlers.RotatingFileHandler( + s_log.addHandler(logging.StreamHandler()) + try: + 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) + l_formatter = logging.Formatter('%(filename)s: %(levelname)s: %(message)s') + l_handler.setFormatter(l_formatter) + s_log.addHandler(l_handler) + except IOError, e: + logging.basicConfig() + s_log.warn("failed to open logfile (%s)" % e) s_log.setLevel(logging.INFO) try: options, args = getopt.gnu_getopt( - argv[1:], 'h', ['help'] + ovs.daemon.LONG_OPTIONS) + argv[1:], 'h', ['help', 'root-prefix='] + ovs.daemon.LONG_OPTIONS) except getopt.GetoptError, geo: sys.stderr.write("%s: %s\n" % (ovs.util.PROGRAM_NAME, geo.msg)) sys.exit(1) @@ -232,6 +257,9 @@ def main(argv): for key, value in options: if key in ['-h', '--help']: usage() + elif key == '--root-prefix': + global root_prefix + root_prefix = value elif not ovs.daemon.parse_opt(key, value): sys.stderr.write("%s: unhandled option %s\n" % (ovs.util.PROGRAM_NAME, key)) @@ -252,13 +280,14 @@ 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) bridges = {} # Map from bridge name to xs_network_uuids - interfaces = {} # Map from interface name to + interfaces = {} # Map from interface name to xs-vif-uuid while True: if not force_run and not idl.run(): poller = ovs.poller.Poller() @@ -268,9 +297,9 @@ def main(argv): if force_run: s_log.info("Forced to re-run as the result of a SIGHUP") - bridges = {} + bridges = {} interfaces = {} - force_run = False + force_run = False txn = ovs.db.idl.Transaction(idl) @@ -344,6 +373,7 @@ def main(argv): txn.commit_block() + if __name__ == '__main__': try: main(sys.argv)