git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-bugtool: Add ovs-ofctl commands to bugtool plugin scripts.
[sliver-openvswitch.git]
/
xenserver
/
usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
diff --git
a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
index
dab9c77
..
fdbbc0e
100644
(file)
--- a/
xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
+++ b/
xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
@@
-1,5
+1,5
@@
-# Copyright (c) 200
7-2010 Citrix Systems
Inc.
-# Copyright (c) 200
9,2010,2011 Nicira Networks
.
+# Copyright (c) 200
9,2010,2011,2012,2013 Nicira,
Inc.
+# Copyright (c) 200
7-2011 Citrix Systems 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
#
# 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:
@staticmethod
def Get(action):
try:
- arg = [vsctl, "-
-timeout=30", "-vANY:console:emer
"] + action.split()
+ arg = [vsctl, "-
vconsole:off
"] + action.split()
output = ShellPipe(arg).Stdout()
except StandardError, e:
XSLogError("config retrieval error: " + str(e))
output = ShellPipe(arg).Stdout()
except StandardError, e:
XSLogError("config retrieval error: " + str(e))