openstack/aodh
Code Issues Proposed changes

Merge "Remove the collector submodule"

Browse Source
This commit is contained in:
Jenkins 2013-11-27 12:57:12 +00:00 committed by Gerrit Code Review
commit ad59e791fa
6 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ceilometer/collector/service.py → ceilometer/collector.py
View File

0
ceilometer/collector/__init__.py
View File

2
ceilometer/publisher/udp.py
View File

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

7
ceilometer/tests/collector/test_service.py → ceilometer/tests/test_collector.py
View File

@ -15,9 +15,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
"""Tests for ceilometer/agent/service.py
"""
import socket import socket
import mock import mock
@ -26,7 +23,7 @@ import msgpack
from stevedore import extension from stevedore import extension
from stevedore.tests import manager as test_manager 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.openstack.common.fixture import config
from ceilometer import sample from ceilometer import sample
from ceilometer.tests import base as tests_base from ceilometer.tests import base as tests_base
@ -37,7 +34,7 @@ class TestCollector(tests_base.BaseTestCase):
super(TestCollector, self).setUp() super(TestCollector, self).setUp()
self.CONF = self.useFixture(config.Config()).conf self.CONF = self.useFixture(config.Config()).conf
self.CONF.set_override("connection", "log://", group='database') 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( self.counter = sample.Sample(
name='foobar', name='foobar',
type='bad', type='bad',

2
etc/ceilometer/ceilometer.conf.sample
View File

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

2
setup.cfg
View File

@ -122,7 +122,7 @@ console_scripts =
ceilometer-agent-notification = ceilometer.notification:agent ceilometer-agent-notification = ceilometer.notification:agent
ceilometer-dbsync = ceilometer.storage:dbsync ceilometer-dbsync = ceilometer.storage:dbsync
ceilometer-expirer = ceilometer.storage:expirer 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-evaluator = ceilometer.alarm.service:alarm_evaluator
ceilometer-alarm-notifier = ceilometer.alarm.service:alarm_notifier ceilometer-alarm-notifier = ceilometer.alarm.service:alarm_notifier