Move meter.py into collector directory

With multiple publisher support, metering becomes only one type of
publisher, thus move the meter.py into collector.

The publish.py should be moved to publisher directory as only meter
publisher in future.

Change-Id: I3b4f5dac3cd46c77dc077ff6acbba79284640428
Signed-off-by: Yunhong, Jiang <yunhong.jiang@intel.com>

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

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__)
 

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

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

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

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

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
 

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

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

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

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

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

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

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

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
 

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

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
 

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

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

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

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

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

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():

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
 

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

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