From f03c926a7d28ee35789048ea53c36cd452ed3571 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Fri, 5 Aug 2011 14:28:22 -0500
Subject: Allow actions queries by UUID and PEP8 fixes.

---
 nova/api/direct.py           |  1 +
 nova/api/openstack/common.py |  3 ++-
 nova/db/sqlalchemy/api.py    | 10 ++++++++--
 nova/tests/test_image.py     |  2 ++
 nova/tests/test_xenapi.py    |  1 -
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/nova/api/direct.py b/nova/api/direct.py
index 139c46d63..fdd2943d2 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -48,6 +48,7 @@ import nova.api.openstack.wsgi
 # Global storage for registering modules.
 ROUTES = {}
 
+
 def register_service(path, handle):
     """Register a service handle at a given path.
 
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 715b9e4a4..4548c2c75 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -154,7 +154,8 @@ def remove_version_from_href(href):
 
     """
     parsed_url = urlparse.urlsplit(href)
-    new_path = re.sub(r'^/v[0-9]+\.[0-9]+(/|$)', r'\1', parsed_url.path, count=1)
+    new_path = re.sub(r'^/v[0-9]+\.[0-9]+(/|$)', r'\1', parsed_url.path,
+            count=1)
 
     if new_path == parsed_url.path:
         msg = _('href %s does not contain version') % href
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index ce12ba4e0..f469dc0e5 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1426,9 +1426,14 @@ def instance_action_create(context, values):
 def instance_get_actions(context, instance_id):
     """Return the actions associated to the given instance id"""
     session = get_session()
+
+    if utils.is_uuid_like(instance_id):
+        instance = instance_get_by_uuid(context, instance_id, session)
+        instance_id = instance.id
+
     return session.query(models.InstanceActions).\
         filter_by(instance_id=instance_id).\
-        all()
+       all()
 
 
 ###################
@@ -3301,7 +3306,8 @@ def instance_type_extra_specs_delete(context, instance_type_id, key):
 
 
 @require_context
-def instance_type_extra_specs_get_item(context, instance_type_id, key, session=None):
+def instance_type_extra_specs_get_item(context, instance_type_id, key,
+        session=None):
     if not session:
         session = get_session()
 
diff --git a/nova/tests/test_image.py b/nova/tests/test_image.py
index 5ec8812f3..9680d6f2b 100644
--- a/nova/tests/test_image.py
+++ b/nova/tests/test_image.py
@@ -22,6 +22,7 @@ from nova import exception
 from nova import test
 import nova.image
 
+
 class _ImageTestCase(test.TestCase):
     def setUp(self):
         super(_ImageTestCase, self).setUp()
@@ -126,6 +127,7 @@ class _ImageTestCase(test.TestCase):
         index = self.image_service.index(self.context)
         self.assertEquals(len(index), 0)
 
+
 class FakeImageTestCase(_ImageTestCase):
     def setUp(self):
         super(FakeImageTestCase, self).setUp()
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 8048e5341..dfc1eeb0a 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -767,7 +767,6 @@ class XenAPIMigrateInstance(test.TestCase):
         conn = xenapi_conn.get_connection(False)
         conn.migrate_disk_and_power_off(instance, '127.0.0.1')
 
-
     def test_revert_migrate(self):
         instance = db.instance_create(self.context, self.values)
         self.called = False
-- 
cgit