Merge lp:~ewanmellor/nova/lp651887 into lp:~hudson-openstack/nova/trunk

[Ewan Mellor]

Bug #651887: xenapi list_instances completely broken

  Don't just compute the result for list_instances -- return it!

[Jay Pipes (jaypipes)]

hmm, how did this get past our test suite...

review: Approve

=== modified file 'nova/virt/xenapi.py'
--- nova/virt/xenapi.py	2010-09-10 09:56:22 +0000
+++ nova/virt/xenapi.py	2010-09-30 09:28:42 +0000
@@ -103,8 +103,8 @@
         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):