pep8 cleaning

3 files changed, 28 insertions, 26 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index c1dc06557..13a082b44 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -37,8 +37,6 @@ terminating it.
 
 import datetime
 import os
-import random
-import string
 import socket
 import sys
 import tempfile
@@ -54,7 +52,7 @@ from nova import rpc
 from nova import utils
 from nova.compute import power_state
 from nova.virt import driver
-from nova.network import api as network_api
+from nova import network
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('instances_path', '$state_path/instances',
@@ -74,8 +72,8 @@ flags.DEFINE_integer('live_migration_retry_count', 30,
 flags.DEFINE_integer("rescue_timeout", 0,
                      "Automatically unrescue an instance after N seconds."
                      " Set to 0 to disable.")
-flags.DEFINE_bool('auto_assign_floating_ip', False, 'Autoassigning floating'
-                                                   ' ip to VM')
+flags.DEFINE_bool('auto_assign_floating_ip', False,
+                  'Autoassigning floating ip to VM')
 
 LOG = logging.getLogger('nova.compute.manager')
 
@@ -135,7 +133,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         self.network_manager = utils.import_object(FLAGS.network_manager)
         self.volume_manager = utils.import_object(FLAGS.volume_manager)
-        self.network_api = network_api.API()
+        self.network_api = network.API()
         super(ComputeManager, self).__init__(service_name="compute",
                                              *args, **kwargs)
 
@@ -248,18 +246,18 @@ class ComputeManager(manager.SchedulerDependentManager):
                                        instance_id,
                                        power_state.SHUTDOWN)
 
-        if not FLAGS.stub_network:
-            if FLAGS.auto_assign_floating_ip:
-                public_ip = self.network_api.allocate_floating_ip(context)
+        if not FLAGS.stub_network and FLAGS.auto_assign_floating_ip:
+            public_ip = self.network_api.allocate_floating_ip(context)
 
-                self.db.floating_ip_set_auto_assigned(context, public_ip)
-                fixed_ip = self.db.fixed_ip_get_by_address(context, address)
-                floating_ip = self.db.floating_ip_get_by_address(context,
-                                                                 public_ip)
+            self.db.floating_ip_set_auto_assigned(context, public_ip)
+            fixed_ip = self.db.fixed_ip_get_by_address(context, address)
+            floating_ip = self.db.floating_ip_get_by_address(context,
+                                                             public_ip)
 
-                self.network_api.associate_floating_ip(context, floating_ip,
-                                                    fixed_ip,
-                                                    affect_auto_assigned=True)
+            self.network_api.associate_floating_ip(context,
+                                                   floating_ip,
+                                                   fixed_ip,
+                                                   affect_auto_assigned=True)
         self._update_state(context, instance_id)
 
     @exception.wrap_exception
@@ -280,14 +278,17 @@ class ComputeManager(manager.SchedulerDependentManager):
                 # NOTE(vish): Right now we don't really care if the ip is
                 #             disassociated.  We may need to worry about
                 #             checking this later.
-                self.network_api.disassociate_floating_ip(context, address,
-                                                    affect_auto_assigned=True)
-                if FLAGS.auto_assign_floating_ip \
-                        and floating_ip.get('auto_assigned'):
+                self.network_api.disassociate_floating_ip(context,
+                                                          address,
+                                                          True)
+                if (FLAGS.auto_assign_floating_ip
+                        and floating_ip.get('auto_assigned')):
                     LOG.debug(_("Deallocating floating ip %s"),
-                                    floating_ip['address'], context=context)
-                    self.network_api.release_floating_ip(context, address,
-                                                    affect_auto_assigned=True)
+                              floating_ip['address'],
+                              context=context)
+                    self.network_api.release_floating_ip(context,
+                                                         address,
+                                                         True)
 
             address = fixed_ip['address']
             if address:
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py b/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
index f3767b29f..64d6df77f 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
@@ -22,6 +22,7 @@ from migrate import *
 
 meta = MetaData()
 
+
 c_auto_assigned = Column('auto_assigned', Boolean, default=False)
 
 
diff --git a/nova/network/api.py b/nova/network/api.py
index 61db646ae..1d8193b28 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -52,7 +52,7 @@ class API(base.Base):
                          "args": {"project_id": context.project_id}})
 
     def release_floating_ip(self, context, address,
-                            affect_auto_assigned = False):
+                            affect_auto_assigned=False):
         floating_ip = self.db.floating_ip_get_by_address(context, address)
         if not affect_auto_assigned and floating_ip.get('auto_assigned'):
             return
@@ -66,7 +66,7 @@ class API(base.Base):
                   "args": {"floating_address": floating_ip['address']}})
 
     def associate_floating_ip(self, context, floating_ip, fixed_ip,
-                              affect_auto_assigned = False):
+                              affect_auto_assigned=False):
         if isinstance(fixed_ip, str) or isinstance(fixed_ip, unicode):
             fixed_ip = self.db.fixed_ip_get_by_address(context, fixed_ip)
         floating_ip = self.db.floating_ip_get_by_address(context, floating_ip)
@@ -97,7 +97,7 @@ class API(base.Base):
                            "fixed_address": fixed_ip['address']}})
 
     def disassociate_floating_ip(self, context, address,
-                                 affect_auto_assigned = False):
+                                 affect_auto_assigned=False):
         floating_ip = self.db.floating_ip_get_by_address(context, address)
         if not affect_auto_assigned and floating_ip.get('auto_assigned'):
             return