summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEwan Mellor <emellor@silver>2010-09-30 10:21:44 +0100
committerEwan Mellor <emellor@silver>2010-09-30 10:21:44 +0100
commit8c21cc52b1ba007fc12964ea5973290a3f660662 (patch)
treebdeaf38ee3eb52f84631a365fc32737dfbb1261d
parent5654c7848048ecad0aef020b96001aed3e5c1bdc (diff)
Bug #651887: xenapi list_instances completely broken
Don't just compute the result for list_instances -- return it!
-rw-r--r--nova/virt/xenapi.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/xenapi.py b/nova/virt/xenapi.py
index 1c6de4403..0d06b1fce 100644
--- a/nova/virt/xenapi.py
+++ b/nova/virt/xenapi.py
@@ -103,8 +103,8 @@ class XenAPIConnection(object):
self._conn.login_with_password(user, pw)
def list_instances(self):
- result = [self._conn.xenapi.VM.get_name_label(vm) \
- for vm in self._conn.xenapi.VM.get_all()]
+ return [self._conn.xenapi.VM.get_name_label(vm) \
+ for vm in self._conn.xenapi.VM.get_all()]
@defer.inlineCallbacks
def spawn(self, instance):