From e44f085ed464a3397e3bf89a3e5355e538c71a65 Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date: Wed, 9 Mar 2011 19:16:26 +0100
Subject: Fixed pep8 issues

---
 bin/nova-manage           | 5 +++--
 nova/db/api.py            | 7 +++++--
 nova/db/sqlalchemy/api.py | 7 +++++--
 nova/network/manager.py   | 4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 45437d7e7..7dfc3c045 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -552,8 +552,9 @@ class NetworkCommands(object):
         if network.project_id is not None:
             raise ValueError(_('Network must be disassociated from project %s'
                                ' before delete' % network.project_id))
-        db.network_delete_safe(context.get_admin_context(), network.id)  
-  
+        db.network_delete_safe(context.get_admin_context(), network.id)
+
+
 class ServiceCommands(object):
     """Enable and disable running services"""
 
diff --git a/nova/db/api.py b/nova/db/api.py
index 7ad99c1f4..5c34a02e4 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -459,6 +459,7 @@ def network_associate(context, project_id):
     """Associate a free network to a project."""
     return IMPL.network_associate(context, project_id)
 
+
 def network_count(context):
     """Return the number of networks."""
     return IMPL.network_count(context)
@@ -488,9 +489,9 @@ def network_create_safe(context, values):
     """
     return IMPL.network_create_safe(context, values)
 
+
 def network_delete_safe(context, network_id):
-    """Delete network with key network_id
-     
+    """Delete network with key network_id.
     This method assumes that the network is not associated with any project
     """
     return IMPL.network_delete_safe(context, network_id)
@@ -531,10 +532,12 @@ def network_get_by_bridge(context, bridge):
     """Get a network by bridge or raise if it does not exist."""
     return IMPL.network_get_by_bridge(context, bridge)
 
+
 def network_get_by_cidr(context, cidr):
     """Get a network by cidr or raise if it does not exist"""
     return IMPL.network_get_by_cidr(context, cidr)
 
+
 def network_get_by_instance(context, instance_id):
     """Get a network by instance id or raise if it does not exist."""
     return IMPL.network_get_by_instance(context, instance_id)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 90730d325..3a1162a17 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1042,12 +1042,14 @@ def network_create_safe(context, values):
     except IntegrityError:
         return None
 
+
 @require_admin_context
 def network_delete_safe(context, network_id):
     session = get_session()
     with session.begin():
-        network_ref = network_get(context, network_id=network_id, session=session)
-        session.delete(network_ref)        
+        network_ref = network_get(context, network_id=network_id, \
+                                  session=session)
+        session.delete(network_ref)
 
 
 @require_admin_context
@@ -1134,6 +1136,7 @@ def network_get_by_cidr(context, cidr):
                                   cidr)
     return result
 
+
 @require_admin_context
 def network_get_by_instance(_context, instance_id):
     session = get_session()
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 39da031eb..3dfc48934 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -568,11 +568,11 @@ class VlanManager(NetworkManager):
                 network_ref = db.network_get_by_cidr(context, cidr)
             except exception.NotFound:
                 pass
-            
+
             if network_ref is not None:
                 raise ValueError(_('Network with cidr %s already exists' %
                                    cidr))
-            
+
             network_ref = self.db.network_create_safe(context, net)
             if network_ref:
                 self._create_fixed_ips(context, network_ref['id'])
-- 
cgit