OS-55: PEP8 fixes

3 files changed, 23 insertions, 23 deletions

diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py
index 4a0d1cc3c..c47fba5f3 100644
--- a/nova/tests/db/fakes.py
+++ b/nova/tests/db/fakes.py
@@ -23,6 +23,7 @@ from nova import db
 from nova import utils
 from nova.compute import instance_types
 
+
 class FakeModel(object):
     """ Stubs out for model """
     def __init__(self, values):
@@ -37,6 +38,7 @@ class FakeModel(object):
         else:
             raise NotImplementedError()
 
+
 def stub_out_db_instance_api(stubs):
     """ Stubs out the db API for creating Instances """
 
@@ -67,12 +69,12 @@ def stub_out_db_instance_api(stubs):
 
     stubs.Set(db, 'instance_create', fake_instance_create)
 
-def stub_out_db_network_api(stubs, injected = False):
+
+def stub_out_db_network_api(stubs, injected=False):
     """Stubs out the db API for retrieving networks"""
     network_fields = {
-            'bridge': 'xenbr0',
-            'injected': injected
-            }
+        'bridge': 'xenbr0',
+        'injected': injected}
 
     if injected:
         network_fields.update({
@@ -80,8 +82,7 @@ def stub_out_db_network_api(stubs, injected = False):
             'gateway': '10.0.0.1',
             'broadcast': '10.0.0.255',
             'dns': '10.0.0.2',
-            'ra_server': None
-            })
+            'ra_server': None})
 
     def fake_network_get_by_instance(context, instance_id):
         return FakeModel(network_fields)
@@ -90,5 +91,5 @@ def stub_out_db_network_api(stubs, injected = False):
         return '10.0.0.3'
 
     stubs.Set(db, 'network_get_by_instance', fake_network_get_by_instance)
-    stubs.Set(db, 'instance_get_fixed_address', fake_instance_get_fixed_address)
-
+    stubs.Set(db, 'instance_get_fixed_address',
+        fake_instance_get_fixed_address)
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index c94aeefd1..f7f7102a8 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -213,7 +213,7 @@ class XenAPIVMTestCase(test.TestCase):
 
         check()
 
-    def check_vm_record(self, conn, check_injection = False):
+    def check_vm_record(self, conn, check_injection=False):
         instances = conn.list_instances()
         self.assertEquals(instances, [1])
 
@@ -244,13 +244,13 @@ class XenAPIVMTestCase(test.TestCase):
 
         # Check that the VM is running according to XenAPI.
         self.assertEquals(vm['power_state'], 'Running')
-        
+
         if check_injection:
             xenstore_data = xenapi_fake.VM_get_xenstore_data(vm_ref)
             key_prefix = 'vm-data/vif/22_33_2A_B3_CC_DD/tcpip/'
             tcpip_data = dict([(k.replace(key_prefix, ''), v)
                 for k, v in xenstore_data.iteritems()
-                if k.startswith(key_prefix) ])
+                if k.startswith(key_prefix)])
 
             self.assertEquals(tcpip_data, {
                 'BroadcastAddress/data/0': '10.0.0.255',
@@ -270,11 +270,10 @@ class XenAPIVMTestCase(test.TestCase):
                 'NameServer/type': 'string',
                 'SubnetMask/data/0': '255.255.255.0',
                 'SubnetMask/name': 'SubnetMask',
-                'SubnetMask/type': 'multi_sz'
-             })
+                'SubnetMask/type': 'multi_sz'})
 
     def _test_spawn(self, image_id, kernel_id, ramdisk_id,
-        check_injection = False):
+        check_injection=False):
         stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
         values = {'name': 1,
                   'id': 1,
@@ -289,7 +288,7 @@ class XenAPIVMTestCase(test.TestCase):
         conn = xenapi_conn.get_connection(False)
         instance = db.instance_create(values)
         conn.spawn(instance)
-        self.check_vm_record(conn, check_injection = check_injection)
+        self.check_vm_record(conn, check_injection=check_injection)
 
     def test_spawn_raw_objectstore(self):
         FLAGS.xenapi_image_service = 'objectstore'
@@ -309,9 +308,9 @@ class XenAPIVMTestCase(test.TestCase):
 
     def test_spawn_netinject(self):
         FLAGS.xenapi_image_service = 'glance'
-        db_fakes.stub_out_db_network_api(self.stubs, injected = True)
-        self._test_spawn(1, 2, 3, check_injection = True)
-        
+        db_fakes.stub_out_db_network_api(self.stubs, injected=True)
+        self._test_spawn(1, 2, 3, check_injection=True)
+
     def tearDown(self):
         super(XenAPIVMTestCase, self).tearDown()
         self.manager.delete_project(self.project)
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 3cfc8e5f9..027855592 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -173,20 +173,20 @@ class FakeSessionForVMTests(fake.SessionBase):
 
     def VM_get_VIFs(self, session_ref, vm_ref):
         return (['0', '1', '2'])
-            
+
     def VIF_get_device(self, session_ref, vif_ref):
         return ('1', '0', '2')[int(vif_ref)]
-    
+
     def VIF_get_MAC(self, session_ref, vif_ref):
         return (
             '11:22:2a:b3:CC:dd',
             '22:33:2a:b3:CC:dd',
-            '44:44:2a:b3:CC:dd'
-            )[int(vif_ref)]
-            
+            '44:44:2a:b3:CC:dd')[int(vif_ref)]
+
     def VM_add_to_xenstore_data(self, session_ref, vm_ref, key, value):
         fake.VM_add_to_xenstore_data(vm_ref, key, value)
 
+
 class FakeSessionForVolumeTests(fake.SessionBase):
     """ Stubs out a XenAPISession for Volume tests """
     def __init__(self, uri):