# ovs-vswitchd configuration that are managed in the xapi database when
# integrated with Citrix management tools.
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# 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 os
import subprocess
import syslog
+import re
vsctl="/usr/bin/ovs-vsctl"
+ofctl="/usr/bin/ovs-ofctl"
cacert_filename="/etc/openvswitch/vswitchd.cacert"
# Delete the CA certificate, so that we go back to boot-strapping mode
raise XenAPIPlugin.Failure("NO_POOL_FOR_HOST", [])
if len(pools) > 1:
raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", [])
+ new_controller = False
pool = session.xenapi.pool.get_record(pools[0])
controller = pool.get("vswitch_controller", "")
ret_str = ""
except:
pass
setControllerCfg(controller)
+ new_controller = True
ret_str += "Successfully set controller to %s. " % controller
try:
bton = {}
- for n in session.xenapi.network.get_all():
- rec = session.xenapi.network.get_record(n)
+ for rec in session.xenapi.network.get_all_records().values():
try:
bton[rec['bridge']] = rec
except KeyError:
pass
+ # If new controller, get management MAC addresses from XAPI now
+ # in case fail_mode set to secure which may affect XAPI access
+ mgmt_bridge = None
+ host_mgmt_mac = None
+ host_mgmt_device = None
+ pool_mgmt_macs = {}
+ if new_controller:
+ recs = session.xenapi.PIF.get_all_records_where('field "management"="true"')
+ for rec in recs.itervalues():
+ pool_mgmt_macs[rec.get('MAC')] = rec.get('device')
+
dib_changed = False
fail_mode_changed = False
for bridge in vswitchCfgQuery(['list-br']).split():
if not xapi_dib:
xapi_dib = ''
- ovs_dib = vswitchCfgQuery(['get', 'Bridge', bridge,
+ ovs_dib = vswitchCfgQuery(['--', '--if-exists', 'get', 'Bridge',
+ bridge,
'other_config:disable-in-band']).strip('"')
# Do nothing if setting is invalid, and warn the user.
"fail_mode=%s" % fail_mode])
fail_mode_changed = True
+ # Determine local mgmt MAC address if host being added to secure
+ # pool so we can add default flows to allow management traffic
+ if new_controller and fail_mode_changed and pool_fail_mode == "secure":
+ oc = vswitchCfgQuery(["get", "Bridge", bridge, "other-config"])
+ m = re.match('.*hwaddr="([0-9a-fA-F:].*)".*', oc)
+ if m and m.group(1) in pool_mgmt_macs.keys():
+ mgmt_bridge = bridge
+ host_mgmt_mac = m.group(1)
+ host_mgmt_device = pool_mgmt_macs[host_mgmt_mac]
+
+ if host_mgmt_mac is not None and mgmt_bridge is not None and \
+ host_mgmt_device is not None:
+ tp = "idle_timeout=0,priority=0"
+ port = vswitchCfgQuery(["get", "interface", host_mgmt_device, "ofport"])
+ addFlow(mgmt_bridge, "%s,in_port=%s,arp,nw_proto=1,actions=local" % \
+ (tp, port))
+ addFlow(mgmt_bridge, "%s,in_port=local,arp,dl_src=%s,actions=%s" % \
+ (tp, host_mgmt_mac, port))
+ addFlow(mgmt_bridge, "%s,in_port=%s,dl_dst=%s,actions=local" % \
+ (tp, port, host_mgmt_mac))
+ addFlow(mgmt_bridge, "%s,in_port=local,dl_src=%s,actions=%s" % \
+ (tp, host_mgmt_mac, port))
+
if dib_changed:
ret_str += "Updated in-band management. "
if fail_mode_changed:
"--", "set-manager", 'ssl:' + controller + ':6632'])
def vswitchCfgQuery(action_args):
- cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args
+ cmd = [vsctl, "-vconsole:off"] + action_args
output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()
if len(output) == 0 or output[0] == None:
output = ""
return output
def vswitchCfgMod(action_args):
- cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args
+ cmd = [vsctl, "--timeout=5", "-vconsole:off"] + action_args
exitcode = subprocess.call(cmd)
if exitcode != 0:
raise XenAPIPlugin.Failure("VSWITCH_CONFIG_MOD_FAILURE",
[ str(exitcode) ])
return "Successfully reset configuration"
+
+def addFlow(switch, flow):
+ cmd = [ofctl, "add-flow", switch, flow]
+ exitcode = subprocess.call(cmd)
+ if exitcode != 0:
+ raise XenAPIPlugin.Failure("VSWITCH_ADD_FLOW_FAILURE",
+ [ str(exitcode) , str(switch), str(flow) ])
if __name__ == "__main__":
XenAPIPlugin.dispatch({"update": update,