X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py;h=fdbbc0ed4c8923a6ba987f18985476e3c9b334f1;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=93532c8477110bfcb045d7517f649b97b8afc2c5;hpb=c1a543a8d6d2847983b6b0defd1e19777da85715;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 93532c847..fdbbc0ed4 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) 2009,2010,2011,2012,2013 Nicira, Inc. # Copyright (c) 2007-2011 Citrix Systems Inc. -# Copyright (c) 2009,2010,2011 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 @@ -86,7 +86,7 @@ class VSwitchConfig: @staticmethod def Get(action): try: - arg = [vsctl, "--timeout=30", "-vANY:console:off"] + action.split() + arg = [vsctl, "-vconsole:off"] + action.split() output = ShellPipe(arg).Stdout() except StandardError, e: XSLogError("config retrieval error: " + str(e))