X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py;h=93532c8477110bfcb045d7517f649b97b8afc2c5;hb=a2af1e9dd995420730a334a610d53e381d259e54;hp=6ee4138b2838d8e9ed22f1a9a59803f36bdd363e;hpb=8085488086c48577deaf26fcc11d1be02a6ee140;p=sliver-openvswitch.git

diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
index 6ee4138b2..93532c847 100644
--- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
+++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
@@ -1,11 +1,18 @@
-# Copyright (c) Citrix Systems 2008. All rights reserved.
-# xsconsole is proprietary software.
+# Copyright (c) 2007-2011 Citrix Systems Inc.
+# Copyright (c) 2009,2010,2011 Nicira Networks.
 #
-# Xen, the Xen logo, XenCenter, XenMotion are trademarks or registered
-# trademarks of Citrix Systems, Inc., in the United States and other
-# countries.
-
-# Copyright (c) 2009, 2010 Nicira Networks.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 only.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 from XSConsoleLog import *
 
@@ -79,7 +86,7 @@ class VSwitchConfig:
     @staticmethod
     def Get(action):
         try:
-            arg = [vsctl, "-vANY:console:emer"] + action.split()
+            arg = [vsctl, "--timeout=30", "-vANY:console:off"] + action.split()
             output = ShellPipe(arg).Stdout()
         except StandardError, e:
             XSLogError("config retrieval error: " + str(e))
@@ -102,10 +109,7 @@ class VSwitchControllerDialogue(Dialogue):
         self.xs_version = data.host.software_version.product_version('')
         pool = data.GetPoolForThisHost()
         if pool is not None:
-            if self.xs_version == "5.5.0":
-                self.controller = pool.get("other_config", {}).get("vSwitchController", "")
-            else:
-                self.controller = pool.get("vswitch_controller", "")
+            self.controller = pool.get("vswitch_controller", "")
         else:
             self.controller = ""
 
@@ -118,8 +122,6 @@ class VSwitchControllerDialogue(Dialogue):
                       lambda: self.syncController()),
 #             ChoiceDef(Lang("Restart ovs-vswitchd"),
 #                       lambda: self.restartService("vswitch")),
-#             ChoiceDef(Lang("Restart ovs-brcompatd"),
-#                       lambda: self.restartService("vswitch-brcompatd"))
             ]
         self.menu = Menu(self, None, Lang("Configure Open vSwitch"), choiceDefs)
 
@@ -243,13 +245,7 @@ class VSwitchControllerDialogue(Dialogue):
         if len(pools) > 1:
             XSLogFatal(Lang("More than one pool for host."))
             return
-        if self.xs_version == "5.5.0":
-            key = "vSwitchController"
-            session.xenapi.pool.remove_from_other_config(pools[0], key)
-            if value != None:
-                session.xenapi.pool.add_to_other_config(pools[0], key, value)
-        else:
-            session.xenapi.pool.set_vswitch_controller(value)
+        session.xenapi.pool.set_vswitch_controller(value)
         Data.Inst().Update()
 
     def _updateActiveServers(self, session):
@@ -287,18 +283,14 @@ class XSFeatureVSwitch:
 
         pool = data.GetPoolForThisHost()
         if pool is not None:
-            if (xs_version == "5.5.0"):
-                dbController = pool.get("other_config", {}).get("vSwitchController", "")
-            else:
-                dbController = pool.get("vswitch_controller", "")
+            dbController = pool.get("vswitch_controller", "")
         else:
             dbController = ""
 
         if dbController == "":
             dbController = Lang("<None>")
         inPane.AddStatusField(Lang("Controller (config)", 20), dbController)
-        controller = VSwitchConfig.Get("get Open_vSwitch . managers")
-        controller = controller.strip('[]"')
+        controller = VSwitchConfig.Get("get-manager")
 
         if controller == "":
             controller = Lang("<None>")
@@ -312,11 +304,6 @@ class XSFeatureVSwitch:
         inPane.AddStatusField(Lang("ovsdb-server status", 20),
                               VSwitchService.Inst("openvswitch", "ovsdb-server").status())
 
-        # Only XenServer 5.5.0 runs ovs-brcompatd
-        if (xs_version == "5.5.0"):
-            inPane.AddStatusField(Lang("ovs-brcompatd status", 20),
-                   VSwitchService.Inst("openvswitch", "ovs-brcompatd").status())
-
         inPane.AddKeyHelpField( {
             Lang("<Enter>") : Lang("Reconfigure"),
             Lang("<F5>") : Lang("Refresh")