projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Fix ovsdb-server crash when specifying nonexistent file.
[openvswitch]
/
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 99dd15d8da52bdd5d7ca958c0443b305ee0b108c..6ecf4784f9d9cda8f5f279a638b318266a38a46d 100644
(file)
--- a/
xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
+++ b/
xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
@@
-79,7
+79,8
@@
class VSwitchConfig:
@staticmethod
def Get(action):
try:
@staticmethod
def Get(action):
try:
- output = ShellPipe([vsctl, "-vANY:console:emer", action]).Stdout()
+ arg = [vsctl, "-vANY:console:emer"] + action.split()
+ output = ShellPipe(arg).Stdout()
except StandardError, e:
XSLogError("config retrieval error: " + str(e))
return "<unknown>"
except StandardError, e:
XSLogError("config retrieval error: " + str(e))
return "<unknown>"
@@
-283,11
+284,13
@@
class XSFeatureVSwitch:
if dbController == "":
dbController = Lang("<None>")
inPane.AddStatusField(Lang("Controller (config)", 20), dbController)
if dbController == "":
dbController = Lang("<None>")
inPane.AddStatusField(Lang("Controller (config)", 20), dbController)
- controller = VSwitchConfig.Get("get-controller")
+ controller = VSwitchConfig.Get("get Open_vSwitch . managers")
+ controller = controller.strip('[]"')
+
if controller == "":
controller = Lang("<None>")
elif controller[0:4] == "ssl:":
if controller == "":
controller = Lang("<None>")
elif controller[0:4] == "ssl:":
- controller = controller
[4:
]
+ controller = controller
.split(':')[1
]
inPane.AddStatusField(Lang("Controller (in-use)", 20), controller)
inPane.NewLine()
inPane.AddStatusField(Lang("Controller (in-use)", 20), controller)
inPane.NewLine()