From: Justin Pettit <jpettit@nicira.com>
Date: Mon, 7 Mar 2011 00:54:58 +0000 (-0800)
Subject: xenserver: Remove other_config option for setting controller.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cd1276311130c6b6576cff47aea1068c42b7829;p=openvswitch

xenserver: Remove other_config option for setting controller.

Since XenServer 5.6, "vswitch_controller" has been a first-class key for
setting the Open vSwitch controller.  Prior to that, we stored it in
"other_config".  Since we no longer support such old versions, we can
remove references to the "other_config" option.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
---

diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index e2dc939f..e1c85461 100755
--- 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 != "":