xenserver: Revert only the XenServer scripts no longer replaced by OVS.

[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..721fe64 100755 (executable)
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -84,33 +84,43 @@ 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
 
+    fail_mode_changed = False
+    for bridge in vswitchCfgQuery(['list-br']).split():
+        bridge = vswitchCfgQuery(['br-to-parent', bridge])
         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
@@ -118,8 +128,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 +137,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