diff options
author | Justin Pettit <jpettit@nicira.com> | 2009-07-28 22:16:50 -0700 |
---|---|---|
committer | Justin Pettit <jpettit@nicira.com> | 2009-07-28 22:16:50 -0700 |
commit | a5e54d9b6f8002f34cc792df69e6eda68cf95223 (patch) | |
tree | 5667dbde61b4f79f86dd04a5bc1be2c8ea9731bf /xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py | |
parent | 4cff83cbad9c0ccd8575a001c7345066a2e6fa00 (diff) | |
parent | 3cdc31a4c3ab312cf41b00845d1316aff181ab1b (diff) |
Merge commit 'origin/citrix'
Conflicts:
configure.ac
Diffstat (limited to 'xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py')
-rw-r--r-- | xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py index 45231395..dbd00a45 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py @@ -32,6 +32,17 @@ class VSwitchService: if self.processname == None: self.processname = name + def version(self): + try: + output = ShellPipe(["service", self.name, "version"]).Stdout() + except StandardError, e: + log.error("version retrieval error: " + str(e)) + return "<unknown>" + for line in output: + if self.processname in line: + return line.split()[-1] + return "<unknown>" + def status(self): try: output = ShellPipe(["service", self.name, "status"]).Stdout() @@ -40,12 +51,12 @@ class VSwitchService: return "<unknown>" if len(output) == 0: return "<unknown>" - for l in output: - if self.processname not in l: + for line in output: + if self.processname not in line: continue - elif "running" in l: + elif "running" in line: return "Running" - elif "stop" in l: + elif "stop" in line: return "Stopped" else: return "<unknown>" @@ -262,8 +273,8 @@ class XSFeatureVSwitch: inPane.NewLine() - versionStr = data.host.other_config({}).get("vSwitchVersion", "<Unknown>") - inPane.AddStatusField(Lang("Version", 20), versionStr) + inPane.AddStatusField(Lang("Version", 20), + VSwitchService.Inst("vswitch", "ovs-vswitchd").version()) inPane.NewLine() |