X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=8f5885a9878f085a8038f93d8dbddf04b1a4c32f;hb=8084c0119cc9b6125697a316e03256d0d4555749;hp=43af406787b6b989bb24da9b8f16ead749593520;hpb=753a774f5cd50ffb0c65102faee6e8968dfe9eaf;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 43af40678..8f5885a98 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync @@ -35,11 +35,18 @@ from ovs.db import error from ovs.db import types import ovs.daemon import ovs.db.idl +import ovs.unixctl -root_prefix = '' # Prefix for absolute file names, for testing. vlog = ovs.vlog.Vlog("ovs-xapi-sync") session = None force_run = False +exiting = False + + +def unixctl_exit(conn, unused_argv, unused_aux): + global exiting + exiting = True + conn.reply(None) # Set up a session to interact with XAPI. @@ -113,6 +120,30 @@ def get_iface_id(if_name, xs_vif_uuid): return xs_vif_uuid +# 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): if value is None: if key in d: @@ -169,14 +200,6 @@ def update_in_band_mgmt(row): 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_: - return - - 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: @@ -215,7 +238,7 @@ def main(): 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", + parser.add_argument("--root-prefix", metavar="DIR", default='', help="Use DIR as alternate root directory" " (for testing).") @@ -225,10 +248,6 @@ def main(): 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)) @@ -237,19 +256,32 @@ def main(): ovs.daemon.daemonize() + ovs.unixctl.command_register("exit", "", 0, 0, unixctl_exit, None) + error, unixctl_server = ovs.unixctl.UnixctlServer.create(None) + if error: + ovs.util.ovs_fatal(error, "could not create unixctl server", vlog) + # This daemon is usually started before XAPI, but to complete our # tasks, we need it. Wait here until it's up. - cookie_file = root_prefix + "/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 + bridges = {} # Map from bridge name to nicira-bridge-id 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(): + unixctl_server.run() + if exiting: + break; + + idl.run() + if not force_run and seqno == idl.change_seqno: poller = ovs.poller.Poller() + unixctl_server.wait(poller) idl.wait(poller) poller.block() continue @@ -258,21 +290,30 @@ def main(): vlog.info("Forced to re-run as the result of a SIGHUP") bridges = {} iface_ids = {} + vm_ids = {} force_run = False + seqno = idl.change_seqno txn = ovs.db.idl.Transaction(idl) new_bridges = {} 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: + if row.name in bridges: + nbd = bridges[row.name] + else: # New bridge. update_fail_mode(row) update_in_band_mgmt(row) + nbd = get_bridge_id(row.name) + + bridge_id = nbd + if bridge_id is None: + bridge_id = row.external_ids.get("xs-network-uuids") + + if bridge_id is not None: + set_external_id(row, "bridge-id", bridge_id.split(";")[0]) - update_bridge_id(row) - new_bridges[row.name] = new_xnu + new_bridges[row.name] = nbd bridges = new_bridges iface_by_name = {} @@ -280,6 +321,7 @@ def main(): iface_by_name[row.name] = row 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"): @@ -315,6 +357,17 @@ def main(): 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. # @@ -329,9 +382,13 @@ def main(): else: set_external_id(row, "iface-status", None) iface_ids = new_iface_ids + vm_ids = new_vm_ids txn.commit_block() + unixctl_server.close() + idl.close() + if __name__ == '__main__': try: