resolve pylint warnings

2 files changed, 45 insertions, 78 deletions

diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index afb6a8f1b..afa6e9140 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -135,12 +135,12 @@ class CloudTestCase(test.TestCase):
 
     def test_describe_availability_zones(self):
         """Makes sure describe_availability_zones works and filters results."""
-        service1 = db.service_create(self.context, {'host': 'host1_describe_zones',
+        service1 = db.service_create(self.context, {'host': 'host1_zones',
                                          'binary': "nova-compute",
                                          'topic': 'compute',
                                          'report_count': 0,
                                          'availability_zone': "zone1"})
-        service2 = db.service_create(self.context, {'host': 'host2_describe_zones',
+        service2 = db.service_create(self.context, {'host': 'host2_zones',
                                          'binary': "nova-compute",
                                          'topic': 'compute',
                                          'report_count': 0,
@@ -150,17 +150,18 @@ class CloudTestCase(test.TestCase):
         db.service_destroy(self.context, service1['id'])
         db.service_destroy(self.context, service2['id'])
 
-        
     def test_describe_instances(self):
         """Makes sure describe_instances works and filters results."""
-        inst1 = db.instance_create(self.context, {'reservation_id': 'a', 'host': 'host1'})
-        inst2 = db.instance_create(self.context, {'reservation_id': 'a', 'host': 'host2'})
-        compute1 = db.service_create(self.context, {'host': 'host1',
-                                                    'availability_zone': 'zone1',
-                                                    'topic': "compute"})
-        compute2 = db.service_create(self.context, {'host': 'host2',
-                                                    'availability_zone': 'zone2',
-                                                    'topic': "compute"})
+        inst1 = db.instance_create(self.context, {'reservation_id': 'a',
+                                                  'host': 'host1'})
+        inst2 = db.instance_create(self.context, {'reservation_id': 'a',
+                                                  'host': 'host2'})
+        comp1 = db.service_create(self.context, {'host': 'host1',
+                                                 'availability_zone': 'zone1',
+                                                 'topic': "compute"})
+        comp2 = db.service_create(self.context, {'host': 'host2',
+                                                 'availability_zone': 'zone2',
+                                                 'topic': "compute"})
         result = self.cloud.describe_instances(self.context)
         result = result['reservationSet'][0]
         self.assertEqual(len(result['instancesSet']), 2)
@@ -171,13 +172,12 @@ class CloudTestCase(test.TestCase):
         self.assertEqual(len(result['instancesSet']), 1)
         self.assertEqual(result['instancesSet'][0]['instanceId'],
                          instance_id)
-        self.assertEqual(result['instancesSet'][0]\
+        self.assertEqual(result['instancesSet'][0]
                          ['placement']['availabilityZone'], 'zone2')
         db.instance_destroy(self.context, inst1['id'])
         db.instance_destroy(self.context, inst2['id'])
-        db.service_destroy(self.context, compute1['id'])
-        db.service_destroy(self.context, compute2['id'])
-
+        db.service_destroy(self.context, comp1['id'])
+        db.service_destroy(self.context, comp2['id'])
 
     def test_console_output(self):
         image_id = FLAGS.default_image
@@ -257,21 +257,19 @@ class CloudTestCase(test.TestCase):
                 LOG.debug(_("Terminating instance %s"), instance_id)
                 rv = self.compute.terminate_instance(instance_id)
 
-
     def test_describe_instances(self):
         """Makes sure describe_instances works."""
         instance1 = db.instance_create(self.context, {'host': 'host2'})
-        service1 = db.service_create(self.context, {'host': 'host2',
-                                                    'availability_zone': 'zone1',
-                                                    'topic': "compute"})
+        comp1 = db.service_create(self.context, {'host': 'host2',
+                                                 'availability_zone': 'zone1',
+                                                 'topic': "compute"})
         result = self.cloud.describe_instances(self.context)
-        self.assertEqual(result['reservationSet'][0]\
-                         ['instancesSet'][0]\
+        self.assertEqual(result['reservationSet'][0]
+                         ['instancesSet'][0]
                          ['placement']['availabilityZone'], 'zone1')
         db.instance_destroy(self.context, instance1['id'])
-        db.service_destroy(self.context, service1['id'])
+        db.service_destroy(self.context, comp1['id'])
 
-        
     def test_instance_update_state(self):
         def instance(num):
             return {
@@ -321,7 +319,6 @@ class CloudTestCase(test.TestCase):
         #    data = self.cloud.get_metadata(instance(i)['private_dns_name'])
         #    self.assert_(data['meta-data']['ami-id'] == 'ami-%s' % i)
 
-
     @staticmethod
     def _fake_set_image_description(ctxt, image_id, description):
         from nova.objectstore import handler
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index 127d666e4..ce4262ccf 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -76,6 +76,7 @@ class SchedulerTestCase(test.TestCase):
         self.mox.ReplayAll()
         scheduler.named_method(ctxt, 'topic', num=7)
 
+        
 class ZoneSchedulerTestCase(test.TestCase):
     """Test case for zone scheduler"""
     def setUp(self):
@@ -95,70 +96,39 @@ class ZoneSchedulerTestCase(test.TestCase):
         service.created_at = datetime.datetime.utcnow()
         return service
 
-
     def test_with_two_zones(self):
         scheduler = manager.SchedulerManager()
         ctxt = context.get_admin_context()
-        service_list =  [
-                        self._create_service_model(id=1, host='host1', zone='zone1'), 
-                        self._create_service_model(id=2, host='host2', zone='zone2'),
-                        self._create_service_model(id=3, host='host3', zone='zone2'),
-                        self._create_service_model(id=4, host='host4', zone='zone2'),
-                        self._create_service_model(id=5, host='host5', zone='zone2')
-                        ]
+        service_list = [self._create_service_model(id=1,
+                                                   host='host1',
+                                                   zone='zone1'),
+                        self._create_service_model(id=2,
+                                                   host='host2',
+                                                   zone='zone2'),
+                        self._create_service_model(id=3,
+                                                   host='host3',
+                                                   zone='zone2'),
+                        self._create_service_model(id=4,
+                                                   host='host4',
+                                                   zone='zone2'),
+                        self._create_service_model(id=5,
+                                                   host='host5',
+                                                   zone='zone2')]
         self.mox.StubOutWithMock(db, 'service_get_all_by_topic')
-        db.service_get_all_by_topic(IgnoreArg(), IgnoreArg()).AndReturn(service_list)
+        arg = IgnoreArg()
+        db.service_get_all_by_topic(arg, arg).AndReturn(service_list)
         self.mox.StubOutWithMock(rpc, 'cast', use_mock_anything=True)
         rpc.cast(ctxt,
                  'compute.host1',
                  {'method': 'run_instance',
-                  'args':{'instance_id': 'i-ffffffff',
-                          'availability_zone': 'zone1'}})
+                  'args': {'instance_id': 'i-ffffffff',
+                           'availability_zone': 'zone1'}})
         self.mox.ReplayAll()
-        scheduler.run_instance(ctxt, 'compute', instance_id='i-ffffffff', availability_zone='zone1')
-
-
-class ZoneSchedulerTestCase(test.TestCase):
-    """Test case for zone scheduler"""
-    def setUp(self):
-        super(ZoneSchedulerTestCase, self).setUp()
-        self.flags(scheduler_driver='nova.scheduler.zone.ZoneScheduler')
+        scheduler.run_instance(ctxt,
+                               'compute',
+                               instance_id='i-ffffffff',
+                               availability_zone='zone1')
 
-    def _create_service_model(self, **kwargs):
-        service = db.sqlalchemy.models.Service()
-        service.host = kwargs['host']
-        service.disabled = False
-        service.deleted = False
-        service.report_count = 0
-        service.binary = 'nova-compute'
-        service.topic = 'compute'
-        service.id = kwargs['id']
-        service.availability_zone = kwargs['zone']
-        service.created_at = datetime.datetime.utcnow()
-        return service
-
-
-    def test_with_two_zones(self):
-        scheduler = manager.SchedulerManager()
-        ctxt = context.get_admin_context()
-        service_list =  [
-                        self._create_service_model(id=1, host='host1', zone='zone1'),
-                        self._create_service_model(id=2, host='host2', zone='zone2'),
-                        self._create_service_model(id=3, host='host3', zone='zone2'),
-                        self._create_service_model(id=4, host='host4', zone='zone2'),
-                        self._create_service_model(id=5, host='host5', zone='zone2')
-                        ]
-        self.mox.StubOutWithMock(db, 'service_get_all_by_topic')
-        db.service_get_all_by_topic(IgnoreArg(), IgnoreArg()).AndReturn(service_list)
-        self.mox.StubOutWithMock(rpc, 'cast', use_mock_anything=True)
-        rpc.cast(ctxt,
-                 'compute.host1',
-                 {'method': 'run_instance',
-                  'args':{'instance_id': 'i-ffffffff',
-                          'availability_zone': 'zone1'}})
-        self.mox.ReplayAll()
-        scheduler.run_instance(ctxt, 'compute', instance_id='i-ffffffff', availability_zone='zone1')
-        
 
 class SimpleDriverTestCase(test.TestCase):
     """Test case for simple driver"""