Merge "Remove the collector submodule"

ceilometer/publisher/udp.py

@@ -28,7 +28,7 @@ from ceilometer.openstack.common import log
 from ceilometer.openstack.common import network_utils
 from ceilometer import publisher
 
-cfg.CONF.import_opt('udp_port', 'ceilometer.collector.service',
+cfg.CONF.import_opt('udp_port', 'ceilometer.collector',
                     group='collector')
 
 LOG = log.getLogger(__name__)

ceilometer/tests/test_collector.py

@@ -15,9 +15,6 @@
 # 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/agent/service.py
-"""
-
 import socket
 
 import mock
@@ -26,7 +23,7 @@ import msgpack
 from stevedore import extension
 from stevedore.tests import manager as test_manager
 
-from ceilometer.collector import service
+from ceilometer import collector
 from ceilometer.openstack.common.fixture import config
 from ceilometer import sample
 from ceilometer.tests import base as tests_base
@@ -37,7 +34,7 @@ class TestCollector(tests_base.BaseTestCase):
         super(TestCollector, self).setUp()
         self.CONF = self.useFixture(config.Config()).conf
         self.CONF.set_override("connection", "log://", group='database')
-        self.srv = service.CollectorService('the-host', 'the-topic')
+        self.srv = collector.CollectorService('the-host', 'the-topic')
         self.counter = sample.Sample(
             name='foobar',
             type='bad',

etc/ceilometer/ceilometer.conf.sample

@@ -876,7 +876,7 @@
 [collector]
 
 #
-# Options defined in ceilometer.collector.service
+# Options defined in ceilometer.collector
 #
 
 # address to bind the UDP socket todisabled if set to an empty

setup.cfg

@@ -122,7 +122,7 @@ console_scripts =
     ceilometer-agent-notification = ceilometer.notification:agent
     ceilometer-dbsync = ceilometer.storage:dbsync
     ceilometer-expirer = ceilometer.storage:expirer
-    ceilometer-collector = ceilometer.collector.service:collector
+    ceilometer-collector = ceilometer.collector:collector
     ceilometer-alarm-evaluator = ceilometer.alarm.service:alarm_evaluator
     ceilometer-alarm-notifier = ceilometer.alarm.service:alarm_notifier