openstack/aodh
Code Issues Proposed changes

Merge "Remove redundant parentheses"

Browse Source
This commit is contained in:
Jenkins 2014-07-16 08:08:27 +00:00 committed by Gerrit Code Review
commit 2443d7efbe
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/alarm/partition/coordination.py
View File

@ -230,7 +230,7 @@ class PartitionCoordinator(object):
created_alarms = list(set(alarms) - self.last_alarms) created_alarms = list(set(alarms) - self.last_alarms)
LOG.debug(_('newly created alarms %s') % created_alarms) LOG.debug(_('newly created alarms %s') % created_alarms)
sufficient_deletion = self._deletion_requires_rebalance(alarms) sufficient_deletion = self._deletion_requires_rebalance(alarms)
if (assuming or sufficient_deletion or self.presence_changed): if assuming or sufficient_deletion or self.presence_changed:
still_ahead = self._distribute(alarms, rebalance=True) still_ahead = self._distribute(alarms, rebalance=True)
elif created_alarms: elif created_alarms:
still_ahead = self._distribute(list(created_alarms), still_ahead = self._distribute(list(created_alarms),

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

@ -372,7 +372,7 @@ def _validate_query(query, db_func, internal_keys=None,
allow_timestamps) allow_timestamps)
has_search_offset_query = _validate_timestamp_fields(query, has_search_offset_query = _validate_timestamp_fields(query,
'search_offset', 'search_offset',
('eq'), 'eq',
allow_timestamps) allow_timestamps)
if has_search_offset_query and not has_timestamp_query: if has_search_offset_query and not has_timestamp_query:
@ -388,7 +388,7 @@ def _validate_query(query, db_func, internal_keys=None,
if i.field not in ('timestamp', 'search_offset'): if i.field not in ('timestamp', 'search_offset'):
key = translation.get(i.field, i.field) key = translation.get(i.field, i.field)
operator = i.op operator = i.op
if (key in valid_keys or _is_field_metadata(i.field)): if key in valid_keys or _is_field_metadata(i.field):
if operator == 'eq': if operator == 'eq':
if key == 'enabled': if key == 'enabled':
i._get_value_as_type('boolean') i._get_value_as_type('boolean')
@ -595,7 +595,7 @@ def _make_link(rel_name, url, type, type_arg, query=None):
if query: if query:
query_str = '?q.field=%s&q.value=%s' % (query['field'], query_str = '?q.field=%s&q.value=%s' % (query['field'],
query['value']) query['value'])
return Link(href=('%s/v2/%s/%s%s') % (url, type, type_arg, query_str), return Link(href='%s/v2/%s/%s%s' % (url, type, type_arg, query_str),
rel=rel_name) rel=rel_name)

2
ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py
View File

@ -52,7 +52,7 @@ class TestComputeDurationByResource(v2.FunctionalTest,
def get_interval(event_filter, period, groupby, aggregate): def get_interval(event_filter, period, groupby, aggregate):
self.assertIsNotNone(event_filter.start) self.assertIsNotNone(event_filter.start)
self.assertIsNotNone(event_filter.end) self.assertIsNotNone(event_filter.end)
if (event_filter.start > end or event_filter.end < start): if event_filter.start > end or event_filter.end < start:
return [] return []
duration_start = max(event_filter.start, start) duration_start = max(event_filter.start, start)
duration_end = min(event_filter.end, end) duration_end = min(event_filter.end, end)