openstack/deb-ceilometer
Code Issues Proposed changes

Update pep8 to 1.3.3

Browse Source 
This is needed to update openstack.common

Change-Id: I8410f978f38b3893b71239f97f785086ca5faffe
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2013-01-08 17:47:18 +01:00
parent edd9332323
commit 51c8a8e55c
71 changed files with 331 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/api/controllers/v2.py
View File

@ -445,7 +445,8 @@ class ResourcesController(RestController):
project=request.context.get('project_id'),
start_timestamp=start_timestamp,
end_timestamp=end_timestamp,
)]
)
]
return resources

3
ceilometer/api/v1/blueprint.py
View File

@ -371,7 +371,8 @@ def _list_events(meter,
"""Return a list of raw metering events.
"""
q_ts = _get_query_timestamps(flask.request.args)
f = storage.EventFilter(user=user,
f = storage.EventFilter(
user=user,
project=project,
source=source,
meter=meter,

3
ceilometer/compute/instance.py
View File

@ -33,8 +33,7 @@ INSTANCE_PROPERTIES = [
'ephemeral_gb',
'memory_mb',
'root_gb',
'vcpus',
]
'vcpus']
def get_metadata_from_object(instance):

3
ceilometer/compute/manager.py
View File

@ -33,8 +33,7 @@ OPTS = [
),
cfg.StrOpt('hypervisor_inspector',
default='libvirt',
help='Inspector to use for inspecting the hypervisor layer',
),
help='Inspector to use for inspecting the hypervisor layer'),
]
cfg.CONF.register_opts(OPTS)

15
ceilometer/compute/notifications.py
View File

@ -50,8 +50,7 @@ class _Base(plugin.NotificationBase):
'compute.instance.exists',
'compute.instance.delete.start',
'compute.instance.finish_resize.end',
'compute.instance.resize.revert.end',
]
'compute.instance.resize.revert.end']
@staticmethod
def get_exchange_topics(conf):
@ -96,8 +95,7 @@ class Memory(_Base):
resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata(
message),
),
message)),
]
@ -114,8 +112,7 @@ class VCpus(_Base):
resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata(
message),
),
message)),
]
@ -132,8 +129,7 @@ class RootDiskSize(_Base):
resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata(
message),
),
message)),
]
@ -150,8 +146,7 @@ class EphemeralDiskSize(_Base):
resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata(
message),
),
message)),
]

4
ceilometer/compute/nova_notifier.py
View File

@ -60,4 +60,6 @@ def notify(context, message):
instance_id = message['payload']['instance_id']
LOG.debug('polling final stats for %r', instance_id)
_agent_manager.poll_instance(context,
instance_info_source.instance_get_by_uuid(context, instance_id))
instance_info_source.instance_get_by_uuid(
context,
instance_id))

10
ceilometer/compute/pollsters.py
View File

@ -56,15 +56,13 @@ class InstancePollster(plugin.ComputePollster):
name='instance',
type=counter.TYPE_GAUGE,
unit='instance',
volume=1,
)
volume=1)
yield make_counter_from_instance(instance,
name='instance:%s' %
instance.flavor['name'],
type=counter.TYPE_GAUGE,
unit='instance',
volume=1,
)
volume=1)
class DiskIOPollster(plugin.ComputePollster):
@ -194,8 +192,8 @@ class NetPollster(plugin.ComputePollster):
metadata = copy.copy(vnic_data)
resource_metadata = dict(zip(metadata._fields, metadata))
resource_metadata['instance_id'] = instance.id
resource_metadata['instance_type'] = instance.flavor['id'] if \
instance.flavor else None,
resource_metadata['instance_type'] = \
instance.flavor['id'] if instance.flavor else None,
return counter.Counter(
name=name,

3
ceilometer/compute/virt/libvirt/inspector.py
View File

@ -126,7 +126,8 @@ class LibvirtInspector(virt_inspector.Inspector):
def inspect_disks(self, instance_name):
domain = self._lookup_by_name(instance_name)
tree = etree.fromstring(domain.XMLDesc(0))
for device in filter(bool,
for device in filter(
bool,
[target.get("dev")
for target in tree.findall('devices/disk/target')]):
disk = virt_inspector.Disk(device=device)

6
ceilometer/image/glance.py
View File

@ -61,7 +61,8 @@ class _Base(plugin.PollsterBase):
@staticmethod
def extract_image_metadata(image):
return dict((k, getattr(image, k))
for k in [
for k in
[
"status",
"is_public",
"name",
@ -77,8 +78,7 @@ class _Base(plugin.PollsterBase):
"deleted_at",
"min_ram",
"size",
]
)
])
class ImagePollster(_Base):

2
ceilometer/objectstore/swift.py
View File

@ -36,7 +36,7 @@ LOG = log.getLogger(__name__)
OPTS = [
cfg.StrOpt('reseller_prefix',
default='AUTH_',
help="Swift reseller prefix. Must be on par with "\
help="Swift reseller prefix. Must be on par with "
"reseller_prefix in proxy-server.conf."),
]

3
ceilometer/objectstore/swift_middleware.py
View File

@ -104,7 +104,8 @@ class CeilometerMiddleware(object):
"version": version,
"container": container,
"object": obj,
}),
},
),
cfg.CONF.metering_topic,
cfg.CONF.metering_secret,
cfg.CONF.counter_source)

1
ceilometer/storage/impl_mongodb.py
View File

@ -203,7 +203,6 @@ class Connection(base.Connection):
('timestamp', pymongo.ASCENDING),
('source', pymongo.ASCENDING),
], name='meter_idx')
return
def upgrade(self, version=None):
pass

4
ceilometer/storage/sqlalchemy/migration.py
View File

@ -46,8 +46,8 @@ def patched_with_engine(f, *a, **kw):
# TODO(jkoelker) When migrate 0.7.3 is released and nova depends
# on that version or higher, this can be removed
MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3')
if (not hasattr(migrate, '__version__') or
dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION):
if (not hasattr(migrate, '__version__')
or dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION):
migrate_util.with_engine = patched_with_engine

16
ceilometer/storage/sqlalchemy/models.py
View File

@ -78,12 +78,16 @@ Base = declarative_base(cls=CeilometerBase)
sourceassoc = Table('sourceassoc', Base.metadata,
Column('meter_id', Integer, ForeignKey("meter.id")),
Column('project_id', String(255), ForeignKey("project.id")),
Column('resource_id', String(255), ForeignKey("resource.id")),
Column('user_id', String(255), ForeignKey("user.id")),
Column('source_id', String(255), ForeignKey("source.id"))
)
Column('meter_id', Integer,
ForeignKey("meter.id")),
Column('project_id', String(255),
ForeignKey("project.id")),
Column('resource_id', String(255),
ForeignKey("resource.id")),
Column('user_id', String(255),
ForeignKey("user.id")),
Column('source_id', String(255),
ForeignKey("source.id")))
class Source(Base):

4
ceilometer/storage/sqlalchemy/session.py
View File

@ -178,8 +178,8 @@ def get_engine():
_ENGINE.connect()
break
except OperationalError, e:
if (remaining != 'infinite' and remaining == 0) or \
not is_db_connection_error(e.args[0]):
if (remaining != 'infinite' and remaining == 0) \
or not is_db_connection_error(e.args[0]):
raise
return _ENGINE

3
ceilometer/volume/notifications.py
View File

@ -61,8 +61,7 @@ class _Base(plugin.NotificationBase):
def get_event_types():
return ['volume.exists',
'volume.create.end',
'volume.delete.start',
]
'volume.delete.start']
class Volume(_Base):

9
tests/api/v1/test_list_events.py
View File

@ -46,8 +46,7 @@ class TestListEvents(tests_api.TestBase):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}
'tag': 'self.counter'}
),
counter.Counter(
'instance',
@ -59,8 +58,7 @@ class TestListEvents(tests_api.TestBase):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}
'tag': 'self.counter'}
),
counter.Counter(
'instance',
@ -72,8 +70,7 @@ class TestListEvents(tests_api.TestBase):
'resource-id-alternate',
timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2',
}
'tag': 'self.counter2'}
),
]:
msg = meter.meter_message_from_counter(cnt,

15
tests/api/v1/test_list_meters.py
View File

@ -54,8 +54,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}),
'tag': 'self.counter'}),
counter.Counter(
'meter.test',
'cumulative',
@ -66,8 +65,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 11, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}),
'tag': 'self.counter'}),
counter.Counter(
'meter.mine',
'gauge',
@ -78,8 +76,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id2',
timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server',
'tag': 'two.counter',
}),
'tag': 'two.counter'}),
counter.Counter(
'meter.test',
'cumulative',
@ -90,8 +87,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id3',
timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server',
'tag': 'three.counter',
}),
'tag': 'three.counter'}),
counter.Counter(
'meter.mine',
'gauge',
@ -102,8 +98,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id4',
timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server',
'tag': 'four.counter',
})]:
'tag': 'four.counter'})]:
msg = meter.meter_message_from_counter(cnt,
cfg.CONF.metering_secret,
'test_list_resources')

6
tests/api/v1/test_list_projects.py
View File

@ -52,8 +52,7 @@ class TestListProjects(tests_api.TestBase):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}
'tag': 'self.counter'}
)
msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret,
@ -71,8 +70,7 @@ class TestListProjects(tests_api.TestBase):
'resource-id-alternate',
timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2',
}
'tag': 'self.counter2'}
)
msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret,

16
tests/api/v1/test_list_resources.py
View File

@ -54,8 +54,8 @@ class TestListResources(tests_api.TestBase):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}),
'tag': 'self.counter'},
),
counter.Counter(
'instance',
'cumulative',
@ -66,8 +66,8 @@ class TestListResources(tests_api.TestBase):
'resource-id-alternate',
timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2',
}),
'tag': 'self.counter2'},
),
counter.Counter(
'instance',
'cumulative',
@ -78,8 +78,8 @@ class TestListResources(tests_api.TestBase):
'resource-id2',
timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter3',
}),
'tag': 'self.counter3'},
),
counter.Counter(
'instance',
'cumulative',
@ -90,8 +90,8 @@ class TestListResources(tests_api.TestBase):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter4',
})]:
'tag': 'self.counter4'}
)]:
msg = meter.meter_message_from_counter(cnt,
cfg.CONF.metering_secret,
'test_list_resources')

6
tests/api/v2/test_acl.py
View File

@ -53,7 +53,8 @@ class TestAPIACL(FunctionalTest):
headers={
"X-Roles": "Member",
"X-Tenant-Name": "admin",
"X-Tenant-Id": "bc23a9d531064583ace8f67dad60f6bb",
"X-Tenant-Id":
"bc23a9d531064583ace8f67dad60f6bb",
})
self.assertEqual(response.status_int, 401)
@ -78,6 +79,7 @@ class TestAPIACL(FunctionalTest):
headers={
"X-Roles": "admin",
"X-Tenant-Name": "admin",
"X-Tenant-Id": "bc23a9d531064583ace8f67dad60f6bb",
"X-Tenant-Id":
"bc23a9d531064583ace8f67dad60f6bb",
})
self.assertEqual(response.status_int, 200)

15
tests/api/v2/test_list_meters.py
View File

@ -53,8 +53,7 @@ class TestListMeters(FunctionalTest):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}),
'tag': 'self.counter'}),
counter.Counter(
'meter.test',
'cumulative',
@ -65,8 +64,7 @@ class TestListMeters(FunctionalTest):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 11, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}),
'tag': 'self.counter'}),
counter.Counter(
'meter.mine',
'gauge',
@ -77,8 +75,7 @@ class TestListMeters(FunctionalTest):
'resource-id2',
timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2',
}),
'tag': 'self.counter2'}),
counter.Counter(
'meter.test',
'cumulative',
@ -89,8 +86,7 @@ class TestListMeters(FunctionalTest):
'resource-id3',
timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter3',
}),
'tag': 'self.counter3'}),
counter.Counter(
'meter.mine',
'gauge',
@ -101,8 +97,7 @@ class TestListMeters(FunctionalTest):
'resource-id4',
timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter4',
})]:
'tag': 'self.counter4'})]:
msg = meter.meter_message_from_counter(cnt,
cfg.CONF.metering_secret,
'test_source')

3
tests/api/v2/test_list_users.py
View File

@ -50,8 +50,7 @@ class TestListUsers(FunctionalTest):
'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter',
}
'tag': 'self.counter'}
)
msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret,

13
tests/compute/test_instance.py
View File

@ -50,7 +50,8 @@ class TestLocationMetadata(unittest.TestCase):
# Mimics an instance returned from nova api call
self.INSTANCE_PROPERTIES = {'name': 'display name',
'OS-EXT-SRV-ATTR:instance_name': 'instance-000001',
'OS-EXT-SRV-ATTR:instance_name':
'instance-000001',
'reservation_id': 'reservation id',
'architecture': 'x86_64',
'availability_zone': 'zone1',
@ -64,11 +65,9 @@ class TestLocationMetadata(unittest.TestCase):
'vcpus': 1,
'image': {'id': 1,
'links': [{"rel": "bookmark",
'href': 2}],
},
'href': 2}]},
'flavor': {'id': 1},
'hostId': '1234-5678',
}
'hostId': '1234-5678'}
self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
self.instance.host = 'made-up-hostname'
@ -101,5 +100,5 @@ class TestLocationMetadata(unittest.TestCase):
self.INSTANCE_PROPERTIES['image'] = ''
self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
md = instance.get_metadata_from_object(self.instance)
assert md['image_ref'] == None
assert md['image_ref_url'] == None
self.assertEqual(md['image_ref'], None)
self.assertEqual(md['image_ref_url'], None)

6
tests/compute/test_manager.py
View File

@ -51,8 +51,7 @@ class TestRunTasks(base.TestCase):
project_id='test',
resource_id='test_run_tasks',
timestamp=datetime.datetime.utcnow().isoformat(),
resource_metadata={'name': 'Pollster',
},
resource_metadata={'name': 'Pollster'},
)
def get_counters(self, manager, instance):
@ -98,5 +97,4 @@ class TestRunTasks(base.TestCase):
assert list(actual[0]) == [self.Pollster.test_data,
cfg.CONF.metering_topic,
cfg.CONF.metering_secret,
cfg.CONF.counter_source,
]
cfg.CONF.counter_source]

9
tests/compute/test_notifications.py
View File

@ -220,8 +220,7 @@ INSTANCE_FINISH_RESIZE_END = {
u'ramdisk_id':
u'5f23128e-5525-46d8-bc66-9c30cd87141a',
u'base_image_ref':
u'a130b9d9-e00e-436e-9782-836ccef06e8a'
},
u'a130b9d9-e00e-436e-9782-836ccef06e8a'},
u'architecture': None,
u'os_type': None
},
@ -278,8 +277,7 @@ INSTANCE_RESIZE_REVERT_END = {
u'ramdisk_id':
u'5f23128e-5525-46d8-bc66-9c30cd87141a',
u'base_image_ref':
u'a130b9d9-e00e-436e-9782-836ccef06e8a'
},
u'a130b9d9-e00e-436e-9782-836ccef06e8a'},
u'architecture': None,
u'os_type': None
},
@ -290,7 +288,8 @@ INSTANCE_RESIZE_REVERT_END = {
class TestNotifications(unittest.TestCase):
def test_process_notification(self):
info = notifications.Instance.process_notification(
INSTANCE_CREATE_END)[0]
INSTANCE_CREATE_END
)[0]
for name, actual, expected in [
('counter_name', info.name, 'instance'),

6
tests/compute/test_pollsters.py
View File

@ -100,7 +100,8 @@ class TestNetPollster(TestPollsterBase):
super(TestNetPollster, self).setUp()
def test_get_counters(self):
vnic0 = virt_inspector.Interface(name='vnet0',
vnic0 = virt_inspector.Interface(
name='vnet0',
fref='fa163e71ec6e',
mac='fa:16:3e:71:ec:6d',
parameters=dict(ip='10.0.0.2',
@ -109,7 +110,8 @@ class TestNetPollster(TestPollsterBase):
dhcp_server='10.0.0.1'))
stats0 = virt_inspector.InterfaceStats(rx_bytes=1L, rx_packets=2L,
tx_bytes=3L, tx_packets=4L)
vnic1 = virt_inspector.Interface(name='vnet1',
vnic1 = virt_inspector.Interface(
name='vnet1',
fref='fa163e71ec6f',
mac='fa:16:3e:71:ec:6e',
parameters=dict(ip='192.168.0.3',

6
tests/objectstore/test_swift_middleware.py
View File

@ -30,8 +30,10 @@ class FakeApp(object):
self.body = body
def __call__(self, env, start_response):
start_response('200 OK', [('Content-Type', 'text/plain'),
('Content-Length', str(sum(map(len, self.body))))])
start_response('200 OK', [
('Content-Type', 'text/plain'),
('Content-Length', str(sum(map(len, self.body))))
])
while env['wsgi.input'].read(5):
pass
return self.body

3
tests/storage/test_impl_mongodb.py
View File

@ -264,8 +264,7 @@ class ResourceTest(MongoDBEngineTestBase):
start_ts = datetime.datetime(2012, 7, 2, 10, 42)
end_ts = datetime.datetime(2012, 7, 2, 10, 43)
resources = list(self.conn.get_resources(start_timestamp=start_ts,
end_timestamp=end_ts)
)
end_timestamp=end_ts))
resource_ids = [r['resource_id'] for r in resources]
expected = set(['resource-id-2'])
assert set(resource_ids) == expected

6
tests/storage/test_impl_sqlalchemy.py
View File

@ -162,8 +162,7 @@ class SQLAlchemyEngineTestBase(SQLAlchemyEngineSubBase):
resource_id='resource-id-%s' % i,
timestamp=datetime.datetime(2012, 7, 2, 10, 40 + i),
resource_metadata={'display_name': 'test-server',
'tag': 'counter-%s' % i,
}
'tag': 'counter-%s' % i},
)
msg = meter.meter_message_from_counter(c, cfg.CONF.metering_secret,
'test')
@ -278,8 +277,7 @@ class ResourceTest(SQLAlchemyEngineTestBase):
start_ts = datetime.datetime(2012, 7, 2, 10, 42)
end_ts = datetime.datetime(2012, 7, 2, 10, 43)
resources = list(self.conn.get_resources(start_timestamp=start_ts,
end_timestamp=end_ts)
)
end_timestamp=end_ts))
resource_ids = [r['resource_id'] for r in resources]
assert set(resource_ids) == set(['resource-id-2'])

3
tests/test_publish.py
View File

@ -38,8 +38,7 @@ class TestPublish(base.TestCase):
project_id='test',
resource_id='test_run_tasks',
timestamp=datetime.datetime.utcnow().isoformat(),
resource_metadata={'name': 'TestPublish',
},
resource_metadata={'name': 'TestPublish'},
)
def faux_notify(self, context, topic, msg):

1
tools/test-requires
View File

@ -1,6 +1,5 @@
nose
coverage
pep8>=1.0
mock
mox
Babel>=0.9.6

1
tools/test-requires-folsom
View File

@ -1,7 +1,6 @@
http://tarballs.openstack.org/nova/nova-stable-folsom.tar.gz
nose
coverage
pep8>=1.0
mock
mox
# NOTE(dhellmann): Ming is necessary to provide the Mongo-in-memory

2
tox.ini
View File

@ -20,7 +20,7 @@ setenv=CEILOMETER_TEST_LIVE=1
commands = {toxinidir}/run_tests.sh --no-path-adjustment --with-coverage --cover-erase --cover-package=ceilometer --cover-inclusive []
[testenv:pep8]
deps = pep8==1.1
deps = pep8==1.3.3
commands = pep8 --repeat --show-source ceilometer setup.py bin/ceilometer-agent-central bin/ceilometer-agent-compute bin/ceilometer-collector bin/ceilometer-api tests
[testenv:venv]