From 4948fed24d5e16d95f237ec95c1cd305fcc4df95 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Sun, 24 Oct 2010 16:04:35 -0700
Subject: pep 8 cleanup and typo in resize

---
 nova/api/cloud.py         | 2 ++
 nova/virt/libvirt_conn.py | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nova/api/cloud.py b/nova/api/cloud.py
index 46b342d32..b8f15019f 100644
--- a/nova/api/cloud.py
+++ b/nova/api/cloud.py
@@ -37,6 +37,7 @@ def reboot(instance_id, context=None):
              {"method": "reboot_instance",
               "args": {"instance_id": instance_ref['id']}})
 
+
 def rescue(instance_id, context):
     """Rescue the given instance."""
     instance_ref = db.instance_get_by_internal_id(context, instance_id)
@@ -46,6 +47,7 @@ def rescue(instance_id, context):
              {"method": "rescue_instance",
               "args": {"instance_id": instance_ref['id']}})
 
+
 def unrescue(instance_id, context):
     """Unrescue the given instance."""
     instance_ref = db.instance_get_by_internal_id(context, instance_id)
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 7d66d8454..0096b1400 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -99,7 +99,7 @@ class LibvirtConnection(object):
     def __init__(self, read_only):
         (self.libvirt_uri,
          template_file,
-         rescue_file)= self.get_uri_and_templates()
+         rescue_file) = self.get_uri_and_templates()
 
         self.libvirt_xml = open(template_file).read()
         self.rescue_xml = open(rescue_file).read()
@@ -258,6 +258,7 @@ class LibvirtConnection(object):
 
         d = defer.Deferred()
         timer = task.LoopingCall(f=None)
+
         def _wait_for_rescue():
             try:
                 state = self.get_info(instance['name'])['state']
@@ -273,6 +274,7 @@ class LibvirtConnection(object):
                                       power_state.SHUTDOWN)
                 timer.stop()
                 d.callback(None)
+
         timer.f = _wait_for_rescue
         timer.start(interval=0.5, now=True)
         yield d
@@ -441,7 +443,7 @@ class LibvirtConnection(object):
                                                     * 1024 * 1024 * 1024)
 
         resize = True
-        if inst['instance_type'] == 'm1.tiny' or prefix=='rescue':
+        if inst['instance_type'] == 'm1.tiny' or prefix == 'rescue-':
             resize = False
         yield disk.partition(basepath('disk-raw'), basepath('disk'),
                              local_bytes, resize, execute=execute)
-- 
cgit