diff options
Diffstat (limited to 'ceilometer')
| -rw-r--r-- | ceilometer/objectstore/swift.py | 2 | ||||
| -rw-r--r-- | ceilometer/opts.py | 9 | ||||
| -rw-r--r-- | ceilometer/tests/unit/objectstore/test_swift.py | 2 | ||||
| -rw-r--r-- | ceilometer/tests/unit/publisher/test_monasca_data_filter.py | 6 |
4 files changed, 5 insertions, 14 deletions
diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index c0a27201..9a5b852c 100644 --- a/ceilometer/objectstore/swift.py +++ b/ceilometer/objectstore/swift.py @@ -93,7 +93,7 @@ class _Base(plugin_base.PollsterBase): yield (t.id, swift_api_method( None, keystone_client.get_auth_token(ksclient), - http_conn)) + http_conn=http_conn)) except ClientException as e: if e.http_status == 404: LOG.warning("Swift tenant id %s not found.", t.id) diff --git a/ceilometer/opts.py b/ceilometer/opts.py index 6fded19d..496de95c 100644 --- a/ceilometer/opts.py +++ b/ceilometer/opts.py @@ -85,14 +85,7 @@ def list_opts(): 'left empty, per-deployment central agent and per-host ' 'compute agent won\'t do workload ' 'partitioning and will only function correctly if a ' - 'single instance of that service is running.'), - cfg.FloatOpt( - 'check_watchers', - default=10.0, - deprecated_for_removal=True, - deprecated_reason='This parameter is no longer used.', - help='Number of seconds between checks to see if group ' - 'membership has changed'), + 'single instance of that service is running.') ]), ('event', ceilometer.event.converter.OPTS), ('hardware', itertools.chain( diff --git a/ceilometer/tests/unit/objectstore/test_swift.py b/ceilometer/tests/unit/objectstore/test_swift.py index c2bdd3fc..31283087 100644 --- a/ceilometer/tests/unit/objectstore/test_swift.py +++ b/ceilometer/tests/unit/objectstore/test_swift.py @@ -207,7 +207,7 @@ class TestSwiftPollster(testscenarios.testcase.WithScenarios, self.assertEqual(expected, mock_connection.call_args_list) expected = [mock.call(None, self.manager._auth_token, - mock_connection.return_value) + http_conn=mock_connection.return_value) for t in ASSIGNED_TENANTS] self.assertEqual(expected, mock_method.call_args_list) diff --git a/ceilometer/tests/unit/publisher/test_monasca_data_filter.py b/ceilometer/tests/unit/publisher/test_monasca_data_filter.py index 915652f5..d2b364da 100644 --- a/ceilometer/tests/unit/publisher/test_monasca_data_filter.py +++ b/ceilometer/tests/unit/publisher/test_monasca_data_filter.py @@ -17,7 +17,6 @@ import datetime from unittest import mock -from oslo_utils import timeutils from oslotest import base from ceilometer import monasca_opts @@ -140,9 +139,8 @@ class TestMonUtils(base.BaseTestCase): self.assertEqual(s.project_id, r['dimensions'].get('project_id')) self.assertEqual(s.resource_id, r['dimensions'].get('resource_id')) # 2015-04-07T20:07:06.156986 compare upto millisec - monasca_ts = \ - timeutils.iso8601_from_timestamp(r['timestamp'] / 1000.0, - microsecond=True)[:23] + monasca_ts = datetime.datetime.utcfromtimestamp( + r['timestamp'] / 1000.0).isoformat()[:23] self.assertEqual(s.timestamp[:23], monasca_ts) def test_process_sample_field_mappings(self): |