-#!/usr/bin/python
-# Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+#! /usr/bin/env python
+# Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
import XenAPI
import ovs.dirs
-from ovs.db import error
-from ovs.db import types
import ovs.daemon
import ovs.db.idl
import ovs.unixctl
import ovs.unixctl.server
+import six
vlog = ovs.vlog.Vlog("ovs-xapi-sync")
session = None
try:
session = XenAPI.xapi_local()
session.xenapi.login_with_password("", "")
- except XenAPI.Failure, e:
+ except XenAPI.Failure as e:
session = None
vlog.warn("Couldn't login to XAPI (%s)" % e)
return False
" XAPI session could not be initialized" % br_name)
return None
- recs = session.xenapi.network.get_all_records_where('field "bridge"="%s"' % br_name)
+ recs = session.xenapi.network.get_all_records_where(
+ 'field "bridge"="%s"' % br_name)
if len(recs) > 0:
- return recs.values()[0]
+ return next(six.itervalues(recs))
return None
+
# There are possibilities when multiple xs-network-uuids are set for a bridge.
# In cases like that, we should choose the bridge-id associated with the bridge
# name.
xapi_down = True
return default
+
# 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
while True:
unixctl_server.run()
if exiting:
- break;
+ break
idl.run()
if not xapi_down and not flush_cache and seqno == idl.change_seqno:
txn = ovs.db.idl.Transaction(idl)
new_bridges = {}
- for row in idl.tables["Bridge"].rows.itervalues():
- if row.name in bridges:
- bridge_id_cache = bridges[row.name]
- else:
- # New bridge.
+ for row in six.itervalues(idl.tables["Bridge"].rows):
+ bridge_id = bridges.get(row.name)
+ if bridge_id is None:
+ # Configure the new bridge.
update_fail_mode(row)
update_in_band_mgmt(row)
- bridge_id_cache = get_bridge_id(row.name)
- bridge_id = bridge_id_cache
- if bridge_id is None:
- bridge_id = row.external_ids.get("xs-network-uuids")
- if bridge_id and len(bridge_id.split(";")) > 1:
- bridge_ids = bridge_id.split(";")
- bridge_id = get_single_bridge_id(bridge_ids, row.name, "")
- if bridge_id:
- bridge_id_cache = bridge_id
+ # Get the correct bridge_id, if we can.
+ bridge_id = get_bridge_id(row.name)
+ if bridge_id is None:
+ xs_network_uuids = row.external_ids.get("xs-network-uuids")
+ if xs_network_uuids:
+ bridge_ids = xs_network_uuids.split(";")
+ if len(bridge_ids) == 1:
+ bridge_id = bridge_ids[0]
+ else:
+ bridge_id = get_single_bridge_id(bridge_ids,
+ row.name)
+ set_external_id(row, "bridge-id", bridge_id)
if bridge_id is not None:
- set_external_id(row, "bridge-id", bridge_id.split(";")[0])
-
- new_bridges[row.name] = bridge_id_cache
+ new_bridges[row.name] = bridge_id
bridges = new_bridges
iface_by_name = {}
- for row in idl.tables["Interface"].rows.itervalues():
+ for row in six.itervalues(idl.tables["Interface"].rows):
iface_by_name[row.name] = row
new_iface_ids = {}
new_vm_ids = {}
- for row in idl.tables["Interface"].rows.itervalues():
+ for row in six.itervalues(idl.tables["Interface"].rows):
# Match up paired vif and tap devices.
if row.name.startswith("vif"):
vif = row