# Bridge table and duplicates its value to the preferred "xs-network-uuids".
import getopt
+import logging, logging.handlers
import os
import signal
import subprocess
import sys
-import syslog
import time
import XenAPI
import ovs.daemon
import ovs.db.idl
+s_log = logging.getLogger("ovs-external-ids")
+l_handler = logging.handlers.RotatingFileHandler(
+ "/var/log/openvswitch/ovs-external-ids.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)
+
vsctl="/usr/bin/ovs-vsctl"
session = None
force_run = False
session.xenapi.login_with_password("", "")
except:
session = None
- syslog.syslog(syslog.LOG_WARNING,
- "ovs-external-ids: Couldn't login to XAPI")
+ s_log.warning("Couldn't login to XAPI")
return False
return True
# record of XAPI.
def get_bridge_id(br_name, default=None):
if not init_session():
+ s_log.warning("Failed to get bridge id %s because"
+ " XAPI session could not be initialized" % br_name)
return default
for n in session.xenapi.network.get_all():
# 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.
-def get_iface_id(if_name, default=None):
+def get_iface_id(if_name, xs_vif_uuid):
if not if_name.startswith("vif"):
- return default
-
- domain,device = if_name.strip("vif").split(".")
+ # Treat whatever was passed into 'xs_vif_uuid' as a default
+ # value for non-VIFs.
+ return xs_vif_uuid
if not init_session():
- return default
-
- for n in session.xenapi.VM.get_all():
- if session.xenapi.VM.get_domid(n) == domain:
- vifs = session.xenapi.VM.get_VIFs(n)
- for vif in vifs:
- rec = session.xenapi.VIF.get_record(vif)
- if rec['device'] == device:
- return rec['other_config'].get('nicira-iface-id', default)
- return None
+ s_log.warning("Failed to get interface id %s because"
+ " XAPI session could not be initialized" % if_name)
+ return xs_vif_uuid
+ try:
+ vif = session.xenapi.VIF.get_by_uuid(xs_vif_uuid)
+ rec = session.xenapi.VIF.get_record(vif)
+ return rec['other_config'].get('nicira-iface-id', xs_vif_uuid)
+ except XenAPI.Failure:
+ s_log.warning("Could not find XAPI entry for VIF %s" % if_name)
+ return xs_vif_uuid
def set_external_id(table, record, key, value):
col = 'external-ids:"' + key + '"="' + value + '"'
cmd = [vsctl, "--timeout=30", "-vANY:console:emer", "set", table, record, col]
exitcode = subprocess.call(cmd)
if exitcode != 0:
- syslog.syslog(syslog.LOG_WARNING,
- "ovs-external-ids: Couldn't call ovs-vsctl")
+ s_log.warning("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
continue
if force_run:
+ s_log.info("Forced to re-run as the result of a SIGHUP")
bridges = {}
interfaces = {}
force_run = False
if __name__ == '__main__':
try:
main(sys.argv)
- except error.Error, e:
- sys.stderr.write("%s\n" % e)
- sys.exit(1)
+ except SystemExit:
+ # Let system.exit() calls complete normally
+ raise
+ except:
+ s_log.exception("traceback")
+ sys.exit(ovs.daemon.RESTART_EXIT_CODE)