openstack/aodh
Code Issues Proposed changes

Merge "swift: configure RPC service correctly"

Browse Source
This commit is contained in:
Jenkins 2013-02-14 01:13:34 +00:00 committed by Gerrit Code Review
commit 5c82b1ee95
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/objectstore/swift_middleware.py
View File

@ -27,6 +27,7 @@ from ceilometer.openstack.common import cfg
from ceilometer.openstack.common import context
from ceilometer.openstack.common import timeutils
from ceilometer import pipeline
from ceilometer import service
from swift.common.utils import split_path
@ -51,7 +52,7 @@ class CeilometerMiddleware(object):
def __init__(self, app, conf):
self.app = app
cfg.CONF([], project='ceilometer')
service.prepare_service()
publisher_manager = dispatch.NameDispatchExtensionManager(
namespace=pipeline.PUBLISHER_NAMESPACE,
check_func=lambda x: True,

5
tests/objectstore/test_swift_middleware.py
View File

@ -23,6 +23,7 @@ from webob import Request
from ceilometer.tests import base
from ceilometer.objectstore import swift_middleware
from ceilometer import pipeline
from ceilometer.openstack.common import cfg
class FakeApp(object):
@ -60,6 +61,10 @@ class TestSwiftMiddleware(base.TestCase):
def start_response(*args):
pass
def test_rpc_setup(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
self.assertEqual(cfg.CONF.control_exchange, 'ceilometer')
def test_get(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
req = Request.blank('/1.0/account/container/obj',