session.xenapi.login_with_password("", "")
except:
session = None
- syslog.syslog(syslog.LOG_WARNING,
- "monitor-external-ids: Couldn't login to XAPI")
+ syslog.syslog(syslog.LOG_WARNING,
+ "ovs-external-ids: Couldn't login to XAPI")
return False
return True
-# By default, the "bridge-id" external id in the Bridge table is the
+# 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
# record of XAPI.
continue
return rec['other_config'].get('nicira-bridge-id', default)
-# By default, the "iface-id" external id in the Interface table is the
+# 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
# record of XAPI.
cmd = [vsctl, "--timeout=30", "-vANY:console:emer", "set", table, record, col]
exitcode = subprocess.call(cmd)
if exitcode != 0:
- syslog.syslog(syslog.LOG_WARNING,
- "monitor-external-ids: Couldn't call ovs-vsctl")
+ syslog.syslog(syslog.LOG_WARNING,
+ "ovs-external-ids: Couldn't call ovs-vsctl")
# XAPI on XenServer 5.6 uses the external-id "network-uuids" for internal
-# networks, but we now prefer "xs-network-uuids". Look for its use and
+# networks, but we now prefer "xs-network-uuids". Look for its use and
# write our preferred external-id.
def update_network_uuids(name, ids):
if ids["network-uuids"] and not ids["xs-network-uuids"]:
- set_external_id("Bridge", name, "xs-network-uuids",
+ set_external_id("Bridge", name, "xs-network-uuids",
ids["network-uuids"])
def update_bridge_id(name, ids):
new_columns[column_name] = column
table.columns = new_columns
return table
-
+
def monitor_uuid_schema_cb(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(
except getopt.GetoptError, geo:
sys.stderr.write("%s: %s\n" % (ovs.util.PROGRAM_NAME, geo.msg))
sys.exit(1)
-
+
for key, value in options:
if key in ['-h', '--help']:
usage()
sys.stderr.write("%s: unhandled option %s\n"
% (ovs.util.PROGRAM_NAME, key))
sys.exit(1)
-
+
if len(args) != 1:
sys.stderr.write("%s: exactly one nonoption argument is required "
"(use --help for help)\n" % ovs.util.PROGRAM_NAME)
sys.exit(1)
ovs.daemon.die_if_already_running()
-
+
remote = args[0]
idl = ovs.db.idl.Idl(remote, "Open_vSwitch", monitor_uuid_schema_cb)
time.sleep(1)
signal.signal(signal.SIGHUP, handler)
-
+
bridges = {}
interfaces = {}
while True:
if force_run:
bridges = {}
interfaces = {}
- force_run = False
+ force_run = False
new_bridges = {}
for rec in idl.data["Bridge"].itervalues():
network_uuids = rec.external_ids.get("network-uuids")
new_bridges[name] = {"xs-network-uuids": xs_network_uuids,
"network-uuids": network_uuids}
-
+
new_interfaces = {}
for rec in idl.data["Interface"].itervalues():
name = rec.name.as_scalar()
xs_vif_uuid = rec.external_ids.get("xs-vif-uuid")
new_interfaces[name] = {"xs-vif-uuid": xs_vif_uuid}
-
+
if bridges != new_bridges:
for name,ids in new_bridges.items():
# Network uuids shouldn't change in the life of a bridge,
if (name not in interfaces) or (interfaces[name] != ids):
update_iface_id(name, ids)
interfaces = new_interfaces
-
+
if __name__ == '__main__':
try:
main(sys.argv)