ret_str += "Successfully set controller to %s. " % controller
try:
- fail_mode = pool["other_config"]["vswitch-controller-fail-mode"]
+ pool_fail_mode = pool["other_config"]["vswitch-controller-fail-mode"]
except KeyError, e:
- fail_mode = None
+ pool_fail_mode = None
- if fail_mode != 'secure':
- fail_mode = 'standalone'
+ bton = {}
+
+ for n in session.xenapi.network.get_all():
+ rec = session.xenapi.network.get_record(n)
+ try:
+ bton[rec['bridge']] = rec
+ except KeyError:
+ pass
fail_mode_changed = False
for bridge in vswitchCfgQuery(['list-br']).split():
bridge_fail_mode = vswitchCfgQuery(["get", "Bridge",
bridge, "fail_mode"]).strip('[]"')
+ try:
+ fail_mode = bton[bridge]["other_config"]["vswitch-controller-fail-mode"]
+ except KeyError, e:
+ fail_mode = None
+
+ if fail_mode not in ['secure', 'standalone']:
+ fail_mode = pool_fail_mode
+
+ if fail_mode != 'secure':
+ fail_mode = 'standalone'
+
if bridge_fail_mode != fail_mode:
vswitchCfgMod(['--', 'set', 'Bridge', bridge,
"fail_mode=%s" % fail_mode])
fail_mode_changed = True
if fail_mode_changed:
- ret_str += "Set fail_mode to %s. " % fail_mode
+ ret_str += "Updated fail_mode. "
if ret_str != '':
return ret_str
return "No change to configuration"
def vswitchCurrentController():
- controller = vswitchCfgQuery(["get", "Open_vSwitch",
- ".", "managers"]).strip('[]"')
+ controller = vswitchCfgQuery(["get-manager"])
if controller == "":
return controller
if len(controller) < 4 or controller[0:4] != "ssl:":
return controller.split(':')[1]
def removeControllerCfg():
- vswitchCfgMod(["--", "clear", "Open_vSwitch", ".", "managers",
+ vswitchCfgMod(["--", "del-manager",
"--", "del-ssl"])
def setControllerCfg(controller):
# /etc/xensource/xapi-ssl.pem is mentioned twice below because it
# contains both the private key and the certificate.
- vswitchCfgMod(["--", "clear", "Open_vSwitch", ".", "managers",
+ vswitchCfgMod(["--", "del-manager",
"--", "del-ssl",
"--", "--bootstrap", "set-ssl",
"/etc/xensource/xapi-ssl.pem",
"/etc/xensource/xapi-ssl.pem",
cacert_filename,
- "--", "set", "Open_vSwitch", ".",
- 'managers="ssl:' + controller + ':6632"'])
+ "--", "set-manager", 'ssl:' + controller + ':6632'])
def vswitchCfgQuery(action_args):
cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args