From 2fcc6da8ba528c5169f7394d57f90ccd2754a23c Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 30 Aug 2011 12:14:25 -0700
Subject: pep8, fix fakes

---
 nova/api/openstack/contrib/simple_tenant_usage.py            |  1 +
 nova/compute/api.py                                          | 12 ++++++------
 nova/tests/api/openstack/contrib/test_createserverext.py     |  2 ++
 nova/tests/api/openstack/contrib/test_simple_tenant_usage.py |  2 +-
 nova/tests/api/openstack/test_servers.py                     |  1 +
 5 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/contrib/simple_tenant_usage.py b/nova/api/openstack/contrib/simple_tenant_usage.py
index 363ac1451..e81aef66e 100644
--- a/nova/api/openstack/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/contrib/simple_tenant_usage.py
@@ -30,6 +30,7 @@ from webob import exc
 
 FLAGS = flags.FLAGS
 
+
 class SimpleTenantUsageController(object):
     def _hours_for(self, instance, period_start, period_stop):
         launched_at = instance['launched_at']
diff --git a/nova/compute/api.py b/nova/compute/api.py
index f1099576e..0074028e2 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -388,8 +388,8 @@ class API(base.Base):
         security_groups = []
         for security_group_name in security_group:
             group = self.db.security_group_get_by_name(context,
-                                                       context.project_id,
-                                                       security_group_name)
+                    context.project_id,
+                    security_group_name)
             security_groups.append(group['id'])
 
         for security_group_id in security_groups:
@@ -667,8 +667,8 @@ class API(base.Base):
     def add_security_group(self, context, instance_id, security_group_name):
         """Add security group to the instance"""
         security_group = self.db.security_group_get_by_name(context,
-                                                            context.project_id,
-                                                            security_group_name)
+                context.project_id,
+                security_group_name)
         # check if the server exists
         inst = self.db.instance_get(context, instance_id)
         #check if the security group is associated with the server
@@ -693,8 +693,8 @@ class API(base.Base):
     def remove_security_group(self, context, instance_id, security_group_name):
         """Remove the security group associated with the instance"""
         security_group = self.db.security_group_get_by_name(context,
-                                                            context.project_id,
-                                                            security_group_name)
+                context.project_id,
+                security_group_name)
         # check if the server exists
         inst = self.db.instance_get(context, instance_id)
         #check if the security group is associated with the server
diff --git a/nova/tests/api/openstack/contrib/test_createserverext.py b/nova/tests/api/openstack/contrib/test_createserverext.py
index e5eed14fe..f6d9ba784 100644
--- a/nova/tests/api/openstack/contrib/test_createserverext.py
+++ b/nova/tests/api/openstack/contrib/test_createserverext.py
@@ -23,6 +23,7 @@ from xml.dom import minidom
 import stubout
 import webob
 
+from nova import db
 from nova import exception
 from nova import flags
 from nova import test
@@ -76,6 +77,7 @@ class CreateserverextTest(test.TestCase):
             def __init__(self):
                 self.injected_files = None
                 self.networks = None
+                self.db = db
 
             def create(self, *args, **kwargs):
                 if 'injected_files' in kwargs:
diff --git a/nova/tests/api/openstack/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/contrib/test_simple_tenant_usage.py
index de0a6d779..2430b9d51 100644
--- a/nova/tests/api/openstack/contrib/test_simple_tenant_usage.py
+++ b/nova/tests/api/openstack/contrib/test_simple_tenant_usage.py
@@ -26,7 +26,6 @@ from nova.compute import api
 from nova.tests.api.openstack import fakes
 
 
-
 FLAGS = flags.FLAGS
 
 SERVERS = 5
@@ -59,6 +58,7 @@ def get_fake_db_instance(start, end, instance_id, tenant_id):
              'launched_at': start,
              'terminated_at': end}
 
+
 def fake_instance_get_active_by_window(self, context, begin, end, project_id):
             return [get_fake_db_instance(START,
                                          STOP,
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 3559e6de5..d065f48b6 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -3229,6 +3229,7 @@ class TestServerInstanceCreation(test.TestCase):
             def __init__(self):
                 self.injected_files = None
                 self.networks = None
+                self.db = db
 
             def create(self, *args, **kwargs):
                 if 'injected_files' in kwargs:
-- 
cgit