From f87314da2a7314c728965ae7ca45857d83ada951 Mon Sep 17 00:00:00 2001 From: liu-sheng Date: Thu, 6 Mar 2014 11:28:50 +0800 Subject: [PATCH] Fix some spelling mistakes and a incorrect url Change-Id: Id122cd98d133496e423847274d7abdbfd54262af --- MAINTAINERS | 2 +- ceilometer/api/controllers/v2.py | 2 +- ceilometer/event/trait_plugins.py | 2 +- ceilometer/hardware/plugin.py | 10 +++++----- ceilometer/storage/impl_sqlalchemy.py | 2 +- ceilometer/tests/alarm/evaluator/test_threshold.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4b948071f..fa3883205 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2,7 +2,7 @@ The current members of ceilometer-core are listed here: - https://launchpad.net/~ceilometer-core/+members#active + https://launchpad.net/~ceilometer-drivers/+members#active This group can +2 and approve patches in Ceilometer. However, they may choose to seek feedback from the appropriate specialist maintainer before diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py index 96f6878ad..952c1edf8 100644 --- a/ceilometer/api/controllers/v2.py +++ b/ceilometer/api/controllers/v2.py @@ -1442,7 +1442,7 @@ class AlarmThresholdRule(_Base): "The number of historical periods to evaluate the threshold" exclude_outliers = wsme.wsattr(bool, default=False) - "Whether datapoints with anomolously low sample counts are excluded" + "Whether datapoints with anomalously low sample counts are excluded" def __init__(self, query=None, **kwargs): if query: diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py index 82434d348..c5fa97ecd 100644 --- a/ceilometer/event/trait_plugins.py +++ b/ceilometer/event/trait_plugins.py @@ -131,7 +131,7 @@ class BitfieldTraitPlugin(TraitPluginBase): keys: path: jsonpath of field to match. bit: (int) number of bit to set (lsb is bit 0) - value: set bit if corrosponding field's value + value: set bit if corresponding field's value matches this. If value is not provided, bit will be set if the field exists (and is non-null), regardless of it's value. diff --git a/ceilometer/hardware/plugin.py b/ceilometer/hardware/plugin.py index 863f64713..3e6e5ecec 100644 --- a/ceilometer/hardware/plugin.py +++ b/ceilometer/hardware/plugin.py @@ -75,14 +75,14 @@ class HardwarePollster(plugin.CentralPollster): # because of the interface requirement return () - def generate_samples(self, host_url, datas): - """Generate an interable Sample from the datas returned by inspector + def generate_samples(self, host_url, data): + """Generate an iterable Sample from the data returned by inspector :param host_url: host url of the endpoint - :param datas: list of data returned by the corresponding inspector + :param data: list of data returned by the corresponding inspector """ - return (self.generate_one_sample(host_url, data) for data in datas) + return (self.generate_one_sample(host_url, datum) for datum in data) @abc.abstractmethod def generate_one_sample(self, host_url, c_data): @@ -91,7 +91,7 @@ class HardwarePollster(plugin.CentralPollster): :param host_url: host url of the endpoint :param c_data: data returned by the corresponding inspector, of one of the types defined in the file - ceiloemter.hardware.inspector.base.CPUStats + ceilometer.hardware.inspector.base.CPUStats """ def _get_inspector(self, parsed_url): diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index 6a491c729..a6f969a77 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -422,7 +422,7 @@ class Connection(base.Connection): :param project: Optional ID for project that owns the resource. :param source: Optional source filter. :param start_timestamp: Optional modified timestamp start range. - :param start_timestamp_op: Optonal start time operator, like gt, ge. + :param start_timestamp_op: Optional start time operator, like gt, ge. :param end_timestamp: Optional modified timestamp end range. :param end_timestamp_op: Optional end time operator, like lt, le. :param metaquery: Optional dict with metadata to match on. diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py index ba429eb4d..023e1ce7b 100644 --- a/ceilometer/tests/alarm/evaluator/test_threshold.py +++ b/ceilometer/tests/alarm/evaluator/test_threshold.py @@ -364,7 +364,7 @@ class TestEvaluate(base.TestEvaluatorBase): with mock.patch('ceilometerclient.client.get_client', return_value=self.api_client): # most recent datapoints inside threshold but with - # anomolously low sample count + # anomalously low sample count threshold = self.alarms[0].rule['threshold'] avgs = [self._get_stat('avg', threshold + (v if v < 10 else -v), @@ -406,7 +406,7 @@ class TestEvaluate(base.TestEvaluatorBase): with mock.patch('ceilometerclient.client.get_client', return_value=self.api_client): # most recent datapoints outside threshold but with - # anomolously low sample count + # anomalously low sample count threshold = self.alarms[0].rule['threshold'] avgs = [self._get_stat('avg', threshold - (v if v < 9 else -v),