#!/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.
import argparse
import os
import signal
-import subprocess
import sys
import time
import ovs.dirs
from ovs.db import error
from ovs.db import types
-import ovs.util
import ovs.daemon
import ovs.db.idl
-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
return xs_vif_uuid
-def call_vsctl(args):
- cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args
- exitcode = subprocess.call(cmd)
- if exitcode != 0:
- vlog.warn("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):
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:
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).")
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))
# 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
- interfaces = {} # Map from interface name to xs-vif-uuid
+ 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():
+ idl.run()
+ if not force_run and seqno == idl.change_seqno:
poller = ovs.poller.Poller()
idl.wait(poller)
poller.block()
if force_run:
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)
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)
- 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
+ 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])
+
+ new_bridges[row.name] = nbd
bridges = new_bridges
iface_by_name = {}
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"):
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.
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()
git://git.onelab.eu / sliver-openvswitch.git / blobdiff