Use flake8 instead of pep8

flake8 is pluggable and supports running hacking checks via a plugin.

Fixes bug 1172444

Change-Id: Ie0b11544aaa3b1602ceced61941ab2cb30a7dc17

bin/ceilometer-send-counter

@@ -97,13 +97,14 @@ pipeline_manager = pipeline.setup_pipeline(
 
 with pipeline_manager.publisher(context.get_admin_context(),
                                 cfg.CONF.counter_source) as p:
-    p([counter.Counter(name=cfg.CONF.counter_name,
-                                    type=cfg.CONF.counter_type,
-                                    unit=cfg.CONF.counter_unit,
-                                    volume=cfg.CONF.counter_volume,
-                                    user_id=cfg.CONF.counter_user,
-                                    project_id=cfg.CONF.counter_project,
-                                    resource_id=cfg.CONF.counter_resource,
-                                    timestamp=cfg.CONF.counter_timestamp,
-                                    resource_metadata=cfg.CONF.counter_metadata
-                                    and eval(cfg.CONF.counter_metadata))])
+    p([counter.Counter(
+        name=cfg.CONF.counter_name,
+        type=cfg.CONF.counter_type,
+        unit=cfg.CONF.counter_unit,
+        volume=cfg.CONF.counter_volume,
+        user_id=cfg.CONF.counter_user,
+        project_id=cfg.CONF.counter_project,
+        resource_id=cfg.CONF.counter_resource,
+        timestamp=cfg.CONF.counter_timestamp,
+        resource_metadata=cfg.CONF.counter_metadata and eval(
+            cfg.CONF.counter_metadata))])

ceilometer/storage/impl_hbase.py

@@ -223,9 +223,6 @@ def record_metering_data(self, data):
             project['f:s_%s' % data['source']] = "1"
             self.project.put(data['project_id'], project)
 
-        # Record the updated resource metadata.
-        received_timestamp = timeutils.utcnow()
-
         resource = self.resource.row(data['resource_id'])
         new_meter = "%s!%s!%s" % (
             data['counter_name'], data['counter_type'], data['counter_unit'])

ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py

@@ -18,6 +18,8 @@
 
 from sqlalchemy import MetaData, Table, Column, DateTime
 
+from ceilometer.openstack.common import timeutils
+
 meta = MetaData()
 
 

tests/agentbase.py

@@ -243,6 +243,6 @@ def test_interval_exception_isolation(self):
 
         polling_tasks = self.mgr.setup_polling_tasks()
         self.assertEqual(len(polling_tasks.keys()), 1)
-        task = polling_tasks.get(10)
+        polling_tasks.get(10)
         self.mgr.interval_task(polling_tasks.get(10))
         self.assertEqual(len(self.publisher.counters), 0)

tests/api/v2/test_post_samples.py

@@ -60,26 +60,6 @@ def test_one(self):
 
         self.assertEquals(s1, data.json)
 
-    def test_one(self):
-        s1 = [{'counter_name': 'apples',
-               'counter_type': 'gauge',
-               'counter_unit': 'instance',
-               'counter_volume': 1,
-               'resource_id': 'bd9431c1-8d69-4ad3-803a-8d4a6b89fd36',
-               'project_id': '35b17138-b364-4e6a-a131-8f3099c5be68',
-               'user_id': 'efd87807-12d2-4b38-9c70-5f5c2ac427ff',
-               'resource_metadata': {'name1': 'value1',
-                                     'name2': 'value2'}}]
-
-        data = self.post_json('/meters/apples/', s1)
-
-        # timestamp not given so it is generated.
-        s1[0]['timestamp'] = data.json[0]['timestamp']
-        # source is generated if not provided.
-        s1[0]['source'] = '%s:openstack' % s1[0]['project_id']
-
-        self.assertEquals(s1, data.json)
-
     def test_wrong_project_id(self):
         '''
         do not accept cross posting samples to different projects

tests/objectstore/test_swift_middleware.py

@@ -74,7 +74,7 @@ def start_response(*args):
             pass
 
     def test_rpc_setup(self):
-        app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
+        swift_middleware.CeilometerMiddleware(FakeApp(), {})
         self.assertEqual(cfg.CONF.control_exchange, 'ceilometer')
 
     def test_get(self):
@@ -103,7 +103,7 @@ def test_put(self):
                             environ={'REQUEST_METHOD': 'PUT',
                                      'wsgi.input':
                                      StringIO.StringIO('some stuff')})
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
         self.assertEqual(len(counters), 2)
         data = counters[0]
@@ -124,7 +124,7 @@ def test_post(self):
                             environ={'REQUEST_METHOD': 'POST',
                                      'wsgi.input':
                                      StringIO.StringIO('some other stuff')})
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
         self.assertEqual(len(counters), 2)
         data = counters[0]
@@ -143,7 +143,7 @@ def test_head(self):
         app = swift_middleware.CeilometerMiddleware(FakeApp(body=['']), {})
         req = Request.blank('/1.0/account/container/obj',
                             environ={'REQUEST_METHOD': 'HEAD'})
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
         self.assertEqual(len(counters), 1)
         data = counters[0]
@@ -162,7 +162,7 @@ def test_bogus_request(self):
         app = swift_middleware.CeilometerMiddleware(FakeApp(body=['']), {})
         req = Request.blank('/1.0/account/container/obj',
                             environ={'REQUEST_METHOD': 'BOGUS'})
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
 
         self.assertEqual(len(counters), 1)
@@ -179,7 +179,7 @@ def test_get_container(self):
         app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
         req = Request.blank('/1.0/account/container',
                             environ={'REQUEST_METHOD': 'GET'})
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
         self.assertEqual(len(counters), 2)
         data = counters[0]
@@ -192,7 +192,7 @@ def test_no_metadata_headers(self):
         app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
         req = Request.blank('/1.0/account/container',
                             environ={'REQUEST_METHOD': 'GET'})
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
         self.assertEqual(len(counters), 2)
         data = counters[0]
@@ -213,7 +213,7 @@ def test_metadata_headers(self):
                                 'X_VAR1': 'value1',
                                 'X_VAR2': 'value2'
                             })
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
         self.assertEqual(len(counters), 2)
         data = counters[0]
@@ -235,7 +235,7 @@ def test_metadata_headers_on_not_existing_header(self):
         })
         req = Request.blank('/1.0/account/container',
                             environ={'REQUEST_METHOD': 'GET'})
-        resp = list(app(req.environ, self.start_response))
+        list(app(req.environ, self.start_response))
         counters = self.pipeline_manager.pipelines[0].counters
         self.assertEqual(len(counters), 2)
         data = counters[0]