Merge "Move dispatcher a level up"

ceilometer/dispatcher/database.py

@@ -16,7 +16,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from ceilometer.collector import dispatcher
+from ceilometer import dispatcher
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer.publisher import rpc as publisher_rpc

ceilometer/dispatcher/file.py

@@ -21,7 +21,7 @@ import logging.handlers
 
 from oslo.config import cfg
 
-from ceilometer.collector import dispatcher
+from ceilometer import dispatcher
 
 file_dispatcher_opts = [
     cfg.StrOpt('file_path',

ceilometer/tests/dispatcher/test_db.py

@@ -15,13 +15,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/collector/dispatcher/database.py
-"""
 import datetime
 
 import mock
 
-from ceilometer.collector.dispatcher import database
+from ceilometer.dispatcher import database
 from ceilometer.openstack.common.fixture import config
 from ceilometer.openstack.common import test
 from ceilometer.publisher import rpc

ceilometer/tests/dispatcher/test_file.py

@@ -15,14 +15,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/collector/dispatcher/file.py
-"""
-
 import logging.handlers
 import os
 import tempfile
 
-from ceilometer.collector.dispatcher import file
+from ceilometer.dispatcher import file
 from ceilometer.openstack.common.fixture import config
 from ceilometer.openstack.common import test
 from ceilometer.publisher import rpc

doc/source/install/manual.rst

@@ -499,8 +499,8 @@ configured in ceilometer configuration file. These two dispatchers are
 shipped in the Ceilometer egg and defined in the entry_points as follows::
 
    [ceilometer.dispatcher]
-   file = ceilometer.collector.dispatcher.file:FileDispatcher
+   file = ceilometer.dispatcher.file:FileDispatcher
-   database = ceilometer.collector.dispatcher.database:DatabaseDispatcher
+   database = ceilometer.dispatcher.database:DatabaseDispatcher
 
 To use both dispatchers on a Ceilometer collector service, add the following
 line in file ceilometer.conf::

etc/ceilometer/ceilometer.conf.sample

@@ -746,7 +746,7 @@
 [dispatcher_file]
 
 #
-# Options defined in ceilometer.collector.dispatcher.file
+# Options defined in ceilometer.dispatcher.file
 #
 
 # Name and the location of the file to record meters. (string

setup.cfg

@@ -127,8 +127,8 @@ console_scripts =
     ceilometer-alarm-notifier = ceilometer.alarm.service:alarm_notifier
 
 ceilometer.dispatcher =
-    database = ceilometer.collector.dispatcher.database:DatabaseDispatcher
+    database = ceilometer.dispatcher.database:DatabaseDispatcher
-    file = ceilometer.collector.dispatcher.file:FileDispatcher
+    file = ceilometer.dispatcher.file:FileDispatcher
 
 
 [build_sphinx]