diff --git a/ceilometer/meter.py b/ceilometer/collector/meter.py similarity index 100% rename from ceilometer/meter.py rename to ceilometer/collector/meter.py diff --git a/ceilometer/collector/service.py b/ceilometer/collector/service.py index ec1ce4d72..924c15319 100644 --- a/ceilometer/collector/service.py +++ b/ceilometer/collector/service.py @@ -18,8 +18,8 @@ from stevedore import extension +from ceilometer.collector import meter from ceilometer import extension_manager -from ceilometer import meter from ceilometer import publish from ceilometer import service from ceilometer import storage diff --git a/ceilometer/publish.py b/ceilometer/publish.py index 2f35ff1e5..0f51d02e5 100644 --- a/ceilometer/publish.py +++ b/ceilometer/publish.py @@ -18,10 +18,10 @@ """Publish a counter using the preferred RPC mechanism. """ +from ceilometer.collector import meter from ceilometer.openstack.common import cfg from ceilometer.openstack.common import log from ceilometer.openstack.common import rpc -from ceilometer import meter LOG = log.getLogger(__name__) diff --git a/tests/api/v1/test_list_events.py b/tests/api/v1/test_list_events.py index 361f3a40a..0d48d6049 100644 --- a/tests/api/v1/test_list_events.py +++ b/tests/api/v1/test_list_events.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_list_meters.py b/tests/api/v1/test_list_meters.py index 6dbecfc4f..79f86b19f 100644 --- a/tests/api/v1/test_list_meters.py +++ b/tests/api/v1/test_list_meters.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_list_projects.py b/tests/api/v1/test_list_projects.py index 9256e8669..91ee9a952 100644 --- a/tests/api/v1/test_list_projects.py +++ b/tests/api/v1/test_list_projects.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_list_resources.py b/tests/api/v1/test_list_resources.py index 66dadaa8e..627cfeb95 100644 --- a/tests/api/v1/test_list_resources.py +++ b/tests/api/v1/test_list_resources.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_list_sources.py b/tests/api/v1/test_list_sources.py index d5c8d029d..49d15a08f 100644 --- a/tests/api/v1/test_list_sources.py +++ b/tests/api/v1/test_list_sources.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_list_users.py b/tests/api/v1/test_list_users.py index c688d07b9..70a83de7c 100644 --- a/tests/api/v1/test_list_users.py +++ b/tests/api/v1/test_list_users.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_max_project_volume.py b/tests/api/v1/test_max_project_volume.py index 0d81cfd90..3b97932fa 100644 --- a/tests/api/v1/test_max_project_volume.py +++ b/tests/api/v1/test_max_project_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_max_resource_volume.py b/tests/api/v1/test_max_resource_volume.py index f17f0a9fd..5fb2ae85f 100644 --- a/tests/api/v1/test_max_resource_volume.py +++ b/tests/api/v1/test_max_resource_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_sum_project_volume.py b/tests/api/v1/test_sum_project_volume.py index 946258d28..92e201796 100644 --- a/tests/api/v1/test_sum_project_volume.py +++ b/tests/api/v1/test_sum_project_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v1/test_sum_resource_volume.py b/tests/api/v1/test_sum_resource_volume.py index 1d2b6c5cc..7f2082fd6 100644 --- a/tests/api/v1/test_sum_resource_volume.py +++ b/tests/api/v1/test_sum_resource_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests import api as tests_api diff --git a/tests/api/v2/test_list_events.py b/tests/api/v2/test_list_events.py index e8db9fdee..21ae7868e 100644 --- a/tests/api/v2/test_list_events.py +++ b/tests/api/v2/test_list_events.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from .base import FunctionalTest diff --git a/tests/api/v2/test_list_meters.py b/tests/api/v2/test_list_meters.py index 79c9f6c58..2ec59f89e 100644 --- a/tests/api/v2/test_list_meters.py +++ b/tests/api/v2/test_list_meters.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from .base import FunctionalTest diff --git a/tests/api/v2/test_list_projects.py b/tests/api/v2/test_list_projects.py index 2ba21b4d5..240f9be18 100644 --- a/tests/api/v2/test_list_projects.py +++ b/tests/api/v2/test_list_projects.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg diff --git a/tests/api/v2/test_list_resources.py b/tests/api/v2/test_list_resources.py index c27dd38c5..5c7e832b3 100644 --- a/tests/api/v2/test_list_resources.py +++ b/tests/api/v2/test_list_resources.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from .base import FunctionalTest diff --git a/tests/api/v2/test_list_users.py b/tests/api/v2/test_list_users.py index 4f5c37ff8..07f5b9407 100644 --- a/tests/api/v2/test_list_users.py +++ b/tests/api/v2/test_list_users.py @@ -21,8 +21,8 @@ import datetime import logging +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg diff --git a/tests/api/v2/test_max_project_volume.py b/tests/api/v2/test_max_project_volume.py index b4b05ac87..a4488feb6 100644 --- a/tests/api/v2/test_max_project_volume.py +++ b/tests/api/v2/test_max_project_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from ceilometer.tests.db import require_map_reduce diff --git a/tests/api/v2/test_max_resource_volume.py b/tests/api/v2/test_max_resource_volume.py index ad757a3fc..cb0c9b175 100644 --- a/tests/api/v2/test_max_resource_volume.py +++ b/tests/api/v2/test_max_resource_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from .base import FunctionalTest diff --git a/tests/api/v2/test_sum_project_volume.py b/tests/api/v2/test_sum_project_volume.py index 4b1457e2c..d3bf7272e 100644 --- a/tests/api/v2/test_sum_project_volume.py +++ b/tests/api/v2/test_sum_project_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from .base import FunctionalTest diff --git a/tests/api/v2/test_sum_resource_volume.py b/tests/api/v2/test_sum_resource_volume.py index 14322d8cc..5ed5e61d5 100644 --- a/tests/api/v2/test_sum_resource_volume.py +++ b/tests/api/v2/test_sum_resource_volume.py @@ -20,8 +20,8 @@ import datetime +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer.openstack.common import cfg from .base import FunctionalTest diff --git a/tests/collector/test_manager.py b/tests/collector/test_manager.py index 9e88669f8..65a0c6642 100644 --- a/tests/collector/test_manager.py +++ b/tests/collector/test_manager.py @@ -25,7 +25,7 @@ from mock import patch from stevedore import extension from stevedore.tests import manager as test_manager -from ceilometer import meter +from ceilometer.collector import meter from ceilometer.collector import service from ceilometer.openstack.common import cfg from ceilometer.storage import base diff --git a/tests/test_meter.py b/tests/collector/test_meter.py similarity index 99% rename from tests/test_meter.py rename to tests/collector/test_meter.py index cabf2df7a..dab0da153 100644 --- a/tests/test_meter.py +++ b/tests/collector/test_meter.py @@ -18,8 +18,8 @@ """Tests for ceilometer.meter """ +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter def test_compute_signature_change_key(): diff --git a/tests/storage/test_impl_mongodb.py b/tests/storage/test_impl_mongodb.py index 7e6b50381..693250731 100644 --- a/tests/storage/test_impl_mongodb.py +++ b/tests/storage/test_impl_mongodb.py @@ -51,8 +51,8 @@ import unittest import mox +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer import storage from ceilometer.tests.db import TestConnection, require_map_reduce diff --git a/tests/storage/test_impl_sqlalchemy.py b/tests/storage/test_impl_sqlalchemy.py index c1628fc64..ba49d5ee7 100644 --- a/tests/storage/test_impl_sqlalchemy.py +++ b/tests/storage/test_impl_sqlalchemy.py @@ -23,8 +23,8 @@ import re import sqlalchemy import unittest +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer import storage from ceilometer.storage import migration from ceilometer.openstack.common import cfg diff --git a/tools/make_test_data.py b/tools/make_test_data.py index bfcfb57c5..b6e686522 100755 --- a/tools/make_test_data.py +++ b/tools/make_test_data.py @@ -25,8 +25,8 @@ import datetime import logging import sys +from ceilometer.collector import meter from ceilometer import counter -from ceilometer import meter from ceilometer import storage from ceilometer.openstack.common import cfg from ceilometer.openstack.common import timeutils