X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=91ada47abeecf1bf1b88abc6e49f510e70ffaba6;hb=8cdf0349740c3e1a73af9aa6209bb22be952cd37;hp=ef10ce792338fd16a16db8187f6f1391529c47ee;hpb=40043044700de567251236d2e4afa89e02b9d1c2;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 ef10ce792..91ada47ab 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync @@ -32,20 +32,14 @@ import time 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") -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) - +s_log = logging.getLogger("ovs-xapi-sync") vsctl="/usr/bin/ovs-vsctl" session = None force_run = False @@ -118,20 +112,31 @@ def get_iface_id(if_name, xs_vif_uuid): return xs_vif_uuid def call_vsctl(args): - cmd = [vsctl, "--timeout=30", "-vANY:console:emer"] + 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_external_id(table, record, key, value): - col = 'external-ids:"' + key + '"="' + value + '"' - call_vsctl(["set", table, record, col]) +def set_or_delete(d, key, value): + if value is None: + if key in d: + del d[key] + return True + else: + if d.get(key) != value: + 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(name): - rec = get_network_by_bridge(name) - +def update_fail_mode(row): + rec = get_network_by_bridge(row.name) if not rec: return @@ -146,76 +151,57 @@ def update_fail_mode(name): if fail_mode not in ['standalone', 'secure']: fail_mode = 'standalone' - call_vsctl(["set", "bridge", name, "fail_mode=" + fail_mode]) - -def update_in_band_mgmt(name): - rec = get_network_by_bridge(name) + 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: return dib = rec['other_config'].get('vswitch-disable-in-band') - if not dib: - call_vsctl(['remove', 'bridge', name, 'other_config', - 'disable-in-band']) - elif dib in ['true', 'false']: - call_vsctl(['set', 'bridge', name, - 'other_config:disable-in-band=' + dib]) - else: - s_log.warning('"' + dib + '"' - "isn't a valid setting for other_config:disable-in-band on " + - name) -def update_bridge_id(name, ids): - id = get_bridge_id(name, ids.get("xs-network-uuids")) + 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)) + elif set_or_delete(other_config, 'disable-in-band', dib): + row.other_config = other_config - if not id: +def update_bridge_id(row): + id_ = get_bridge_id(row.name, row.external_ids.get("xs-network-uuids")) + if not id_: return - primary_id = id.split(";")[0] - - if ids.get("bridge-id") != primary_id: - set_external_id("Bridge", name, "bridge-id", primary_id) - ids["bridge-id"] = primary_id - -def update_iface_id(name, ids): - id = get_iface_id(name, ids.get("xs-vif-uuid")) - if ids.get("iface-id") != id and id: - set_external_id("Interface", name, "iface-id", id) - ids["iface-id"] = id + set_external_id(row, "bridge-id", id_.split(";")[0]) -def keep_table_columns(schema, table_name, column_types): +def keep_table_columns(schema, table_name, columns): table = schema.tables.get(table_name) if not table: raise error.Error("schema has no %s table" % table_name) new_columns = {} - for column_name, column_type in column_types.iteritems(): + for column_name in columns: column = table.columns.get(column_name) if not column: raise error.Error("%s table schema lacks %s column" % (table_name, column_name)) - if column.type != column_type: - raise error.Error("%s column in %s table has type \"%s\", " - "expected type \"%s\"" - % (column_name, table_name, - column.type.toEnglish(), - column_type.toEnglish())) new_columns[column_name] = column table.columns = new_columns return table -def monitor_uuid_schema_cb(schema): +def prune_schema(schema): string_type = types.Type(types.BaseType(types.StringType)) string_map_type = types.Type(types.BaseType(types.StringType), types.BaseType(types.StringType), 0, sys.maxint) new_tables = {} - for table_name in ("Bridge", "Interface"): - new_tables[table_name] = keep_table_columns( - schema, table_name, {"name": string_type, - "external_ids": string_map_type}) + new_tables["Bridge"] = keep_table_columns( + schema, "Bridge", ("name", "external_ids", "other_config", + "fail_mode")) + new_tables["Interface"] = keep_table_columns( + schema, "Interface", ("name", "external_ids")) schema.tables = new_tables def usage(): @@ -226,7 +212,7 @@ def usage(): print " -h, --help display this help message" sys.exit(0) -def handler(signum, frame): +def handler(signum, _): global force_run if (signum == signal.SIGHUP): force_run = True @@ -234,6 +220,13 @@ def handler(signum, frame): def main(argv): 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) + try: options, args = getopt.gnu_getopt( argv[1:], 'h', ['help'] + ovs.daemon.LONG_OPTIONS) @@ -255,7 +248,10 @@ def main(argv): sys.exit(1) remote = args[0] - idl = ovs.db.idl.Idl(remote, "Open_vSwitch", monitor_uuid_schema_cb) + schema_file = "%s/vswitch.ovsschema" % ovs.dirs.PKGDATADIR + schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schema_file)) + prune_schema(schema) + idl = ovs.db.idl.Idl(remote, schema) ovs.daemon.daemonize() @@ -266,8 +262,8 @@ def main(argv): signal.signal(signal.SIGHUP, handler) - bridges = {} - interfaces = {} + bridges = {} # Map from bridge name to xs_network_uuids + interfaces = {} # Map from interface name to while True: if not force_run and not idl.run(): poller = ovs.poller.Poller() @@ -281,49 +277,77 @@ def main(argv): interfaces = {} force_run = False + txn = ovs.db.idl.Transaction(idl) + new_bridges = {} - for rec in idl.data["Bridge"].itervalues(): - name = rec.name.as_scalar() - xs_network_uuids = rec.external_ids.get("xs-network-uuids") - bridge_id = rec.external_ids.get("bridge-id") - new_bridges[name] = {"xs-network-uuids": xs_network_uuids, - "bridge-id": bridge_id} + for row in idl.tables["Bridge"].rows.itervalues(): + old_xnu = bridges.get(row.name) + new_xnu = row.external_ids.get("xs-network-uuids", "") + if old_xnu is None: + # 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) + new_bridges[row.name] = new_xnu + bridges = new_bridges + + iface_by_name = {} + for row in idl.tables["Interface"].rows.itervalues(): + iface_by_name[row.name] = row new_interfaces = {} - for rec in idl.data["Interface"].itervalues(): - name = rec.name.as_scalar() - xs_vif_uuid = rec.external_ids.get("xs-vif-uuid") - iface_id = rec.external_ids.get("iface-id") - new_interfaces[name] = {"xs-vif-uuid": xs_vif_uuid, - "iface-id": iface_id} - - #Tap devices take their xs-vif-uuid from their corresponding vif - for name in new_interfaces: - if not name.startswith("tap"): - continue - - vif = name.replace("tap", "vif", 1) - - if vif in new_interfaces: - xs_vif_uuid = new_interfaces[vif]["xs-vif-uuid"] - new_interfaces[name]["xs-vif-uuid"] = xs_vif_uuid - - if bridges != new_bridges: - for name,ids in new_bridges.items(): - if name not in bridges: - update_fail_mode(name) - update_in_band_mgmt(name) - - if (name not in bridges) or (bridges[name] != ids): - update_bridge_id(name, ids) - - bridges = new_bridges - - if interfaces != new_interfaces: - for name,ids in new_interfaces.items(): - if (name not in interfaces) or (interfaces[name] != ids): - update_iface_id(name, ids) - interfaces = new_interfaces + for row in idl.tables["Interface"].rows.itervalues(): + # Match up paired vif and tap devices. + if row.name.startswith("vif"): + vif = row + tap = iface_by_name.get("tap%s" % row.name[3:]) + elif row.name.startswith("tap"): + tap = row + vif = iface_by_name.get("vif%s" % row.name[3:]) + else: + tap = vif = None + + # Several tap external-ids need to be copied from the vif. + if row == tap and vif: + keys = ["attached-mac", + "xs-network-uuid", + "xs-vif-uuid", + "xs-vm-uuid"] + 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. + # + # (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) + + # 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. + # + # A tap on its own shouldn't happen, and we don't know + # anything about other kinds of devices, so we don't use + # an iface-status for those devices at all. + if vif and tap: + set_external_id(tap, "iface-status", "active") + set_external_id(vif, "iface-status", "inactive") + elif vif: + set_external_id(vif, "iface-status", "active") + else: + set_external_id(row, "iface-status", None) + + new_interfaces[row.name] = new_xvu + interfaces = new_interfaces + + txn.commit_block() if __name__ == '__main__': try: