updates per review

5 files changed, 15 insertions, 17 deletions

diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 91dc8173b..77bc926c2 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -122,13 +122,13 @@ class FakeConnection(object):
         """
         Rescue the specified instance.
         """
-        return
+        pass
 
     def unrescue(self, instance):
         """
         Unrescue the specified instance.
         """
-        return
+        pass
 
     def destroy(self, instance):
         """
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 715e7234c..ba51f8f69 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -215,7 +215,7 @@ class LibvirtConnection(object):
             self._cleanup(instance)
             done.send()
 
-        greenthread.spawn(_wait_for_time)
+        greenthread.spawn(_wait_for_timer)
         return done
 
     def _cleanup(self, instance):
@@ -365,9 +365,9 @@ class LibvirtConnection(object):
 
         if virsh_output.startswith('/dev/'):
             logging.info('cool, it\'s a device')
-            r = utils.execute("sudo dd if=%s iflag=nonblock" %
-                              virsh_output, check_exit_code=False)
-            return r[0]
+            out, err = utils.execute("sudo dd if=%s iflag=nonblock" %
+                                     virsh_output, check_exit_code=False)
+            return out
         else:
             return ''
 
@@ -388,8 +388,7 @@ class LibvirtConnection(object):
         console_log = os.path.join(FLAGS.instances_path, instance['name'],
                                    'console.log')
         
-        utils.execute('sudo chown %d %s' % (os.getuid(),
-                      console_log))
+        utils.execute('sudo chown %d %s' % (os.getuid(), console_log))
 
         if FLAGS.libvirt_type == 'xen':
             # Xen is special
@@ -476,7 +475,6 @@ class LibvirtConnection(object):
                                                     ['local_gb']
                                                     * 1024 * 1024 * 1024)
 
-        resize = inst['instance_type'] != 'm1.tiny'
         resize = True
         if inst['instance_type'] == 'm1.tiny' or prefix == 'rescue-':
             resize = False
@@ -743,7 +741,7 @@ class NWFilterFirewall(object):
         if callable(xml):
             xml = xml()
 
-        # execute in a native thread and block until done
+        # execute in a native thread and block current greenthread until done
         tpool.execute(self._conn.nwfilterDefineXML, xml)
 
     @staticmethod
diff --git a/nova/virt/xenapi/network_utils.py b/nova/virt/xenapi/network_utils.py
index d8632f393..012954394 100644
--- a/nova/virt/xenapi/network_utils.py
+++ b/nova/virt/xenapi/network_utils.py
@@ -30,10 +30,9 @@ class NetworkHelper():
 
     @classmethod
     def find_network_with_bridge(cls, session, bridge):
-        """ Return the network on which the bridge is attached, if found """
+        """ Return the network on which the bridge is attached, if found."""
         expr = 'field "bridge" = "%s"' % bridge
-        networks = session.call_xenapi('network.get_all_records_where',
-                                       expr)
+        networks = session.call_xenapi('network.get_all_records_where', expr)
         if len(networks) == 1:
             return networks.keys()[0]
         elif len(networks) > 1:
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index b6b92b926..3034df9e1 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -107,8 +107,7 @@ class VMOps(object):
         if vdis:
             for vdi in vdis:
                 try:
-                    task = self._session.call_xenapi('Async.VDI.destroy',
-                                                     vdi)
+                    task = self._session.call_xenapi('Async.VDI.destroy', vdi)
                     self._session.wait_for_task(task)
                 except XenAPI.Failure, exc:
                     logging.warn(exc)
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index df8e42d34..424311133 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -175,9 +175,11 @@ class XenAPISession(object):
         The task is polled until it completes."""
 
         done = event.Event()
-        loop = utis.LoopingTask(self._poll_task, task, done)
+        loop = utils.LoopingTask(self._poll_task, task, done)
         loop.start(FLAGS.xenapi_task_poll_interval, now=True)
-        return done.wait()
+        rv = done.wait()
+        loop.stop()
+        return rv
 
     def _poll_task(self, task, done):
         """Poll the given XenAPI task, and fire the given Deferred if we