diff options
| author | Andy Smith <code@term.ie> | 2010-12-10 11:53:17 -0800 |
|---|---|---|
| committer | Andy Smith <code@term.ie> | 2010-12-10 11:53:17 -0800 |
| commit | c835c441981a17764931390bc1ace6121ab100a4 (patch) | |
| tree | 32eb5d264e16991da817aa39cfa6bf149b7b73c7 | |
| parent | e3aae367c2d449bfc25216865f37182953b535f4 (diff) | |
port new patches
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 13871b479..b6b92b926 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -126,14 +126,13 @@ class VMOps(object): rec = self._session.get_xenapi().VM.get_record(vm) return VMHelper.compile_info(rec) - @defer.inlineCallbacks def get_diagnostics(self, instance_id): """Return data about VM diagnostics""" - vm = yield VMHelper.lookup(self._session, instance_id) + vm = VMHelper.lookup(self._session, instance_id) if vm is None: raise Exception("instance not present %s" % instance_id) - rec = yield self._session.get_xenapi().VM.get_record(vm) - defer.returnValue(VMHelper.compile_diagnostics(self._session, rec)) + rec = self._session.get_xenapi().VM.get_record(vm) + return VMHelper.compile_diagnostics(self._session, rec) def get_console_output(self, instance): """ Return snapshot of console """ |