X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=xenserver%2Fusr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py;h=f62eaa8876a97a9ba0c060e3d0cff2c5dd70c296;hb=8a77bb2ec8d25a61955bbb041cf1e45e8966da76;hp=dab9c7733f3307970fe70424e05aa6f8911434f7;hpb=34edeccfd8d4273844d12c85fe38ec47002c47cd;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 dab9c7733..f62eaa887 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py @@ -1,5 +1,5 @@ -# Copyright (c) 2007-2010 Citrix Systems Inc. -# Copyright (c) 2009,2010,2011 Nicira Networks. +# Copyright (c) 2007-2011 Citrix Systems Inc. +# Copyright (c) 2009,2010,2011,2012 Nicira, Inc. # # 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 @@ -86,7 +86,7 @@ class VSwitchConfig: @staticmethod def Get(action): try: - arg = [vsctl, "--timeout=30", "-vANY:console:emer"] + action.split() + arg = [vsctl, "--timeout=30", "-vconsole:off"] + action.split() output = ShellPipe(arg).Stdout() except StandardError, e: XSLogError("config retrieval error: " + str(e))