Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / xenserver / etc_xapi.d_plugins_openvswitch-cfg-update

diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index a4d97f5..f001d2f 100755 (executable)
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -55,15 +55,7 @@ def update(session, args):
     if len(pools) > 1:
         raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", [])
     pool = session.xenapi.pool.get_record(pools[0])
-    try:
-        try:
-            controller = pool["vswitch_controller"]
-        except KeyError:
-            # On systems older than XenServer 5.6.0, we needed to store
-            # the key in "other_config".
-            controller = pool["other_config"]["vSwitchController"]
-    except KeyError, e:
-        controller = ""
+    controller = pool.get("vswitch_controller", "")
     ret_str = ""
     currentController = vswitchCurrentController()
     if controller == "" and currentController != "":
@@ -84,33 +76,75 @@ def update(session, args):
         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 = {}
 
-    fail_mode_changed = False
-    for (p, rec) in session.xenapi.PIF.get_all_records().items():
+    for n in session.xenapi.network.get_all():
+        rec = session.xenapi.network.get_record(n)
         try:
-            network = session.xenapi.network.get_record(rec['network'])
-            bridge = network['bridge']
-        except Exception, e:
-            syslog.syslog("%s: failed to get bridge name (%s)" %
-                    (script, str(e)))
-            continue
+            bton[rec['bridge']] = rec
+        except KeyError:
+            pass
 
+    dib_changed = False
+    fail_mode_changed = False
+    for bridge in vswitchCfgQuery(['list-br']).split():
+        network = bton[bridge]
+        bridge = vswitchCfgQuery(['br-to-parent', bridge])
+
+        xapi_dib = network['other_config'].get('vswitch-disable-in-band')
+        if not xapi_dib:
+            xapi_dib = ''
+
+        ovs_dib = vswitchCfgQuery(['--', '--if-exists', 'get', 'Bridge',
+                                   bridge,
+                                   'other_config:disable-in-band']).strip('"')
+
+        # Do nothing if setting is invalid, and warn the user.
+        if xapi_dib not in ['true', 'false', '']:
+            ret_str += '"' + xapi_dib + '"' + \
+                ' is an invalid value for vswitch-disable-in-band on ' + \
+                bridge + '  '
+
+        # Change bridge disable-in-band option if XAPI and OVS states differ.
+        elif xapi_dib != ovs_dib:
+            # 'true' or 'false'
+            if xapi_dib:
+                vswitchCfgMod(['--', 'set', 'Bridge', bridge,
+                               'other_config:disable-in-band=' + xapi_dib])
+            # '' or None
+            else:
+                vswitchCfgMod(['--', 'remove', 'Bridge', bridge,
+                               'other_config', 'disable-in-band'])
+            dib_changed = True
+
+        # Change bridge fail_mode if XAPI state differs from OVS state.
         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 dib_changed:
+        ret_str += "Updated in-band management.  "
     if fail_mode_changed:
-        ret_str += "Set fail_mode to %s.  " % fail_mode
+        ret_str += "Updated fail_mode.  "
 
     if ret_str != '':
         return ret_str
@@ -118,8 +152,7 @@ def update(session, args):
         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:":
@@ -128,20 +161,19 @@ def vswitchCurrentController():
         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