openstack/ironic
Code Issues Proposed changes

Merge "Remove oslo-incubator references"

Browse Source
This commit is contained in:
Jenkins 2016-08-05 22:40:46 +00:00 committed by Gerrit Code Review
commit 5085c90eff
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/common/context.py
View File

@ -16,7 +16,7 @@ from oslo_context import context
class RequestContext(context.RequestContext):
"""Extends security contexts from the OpenStack common library."""
"""Extends security contexts from the oslo.context library."""
def __init__(self, auth_token=None, domain_id=None, domain_name=None,
user=None, tenant=None, is_admin=False, is_public_api=False,

5
ironic/common/rpc.py
View File

@ -30,12 +30,7 @@ ALLOWED_EXMODS = [
]
EXTRA_EXMODS = []
# NOTE(lucasagomes): The ironic.openstack.common.rpc entries are for
# backwards compat with IceHouse rpc_backend configuration values.
TRANSPORT_ALIASES = {
'ironic.openstack.common.rpc.impl_kombu': 'rabbit',
'ironic.openstack.common.rpc.impl_qpid': 'qpid',
'ironic.openstack.common.rpc.impl_zmq': 'zmq',
'ironic.rpc.impl_kombu': 'rabbit',
'ironic.rpc.impl_qpid': 'qpid',
'ironic.rpc.impl_zmq': 'zmq',

4
ironic/tests/unit/api/test_hooks.py
View File

@ -103,9 +103,9 @@ def fake_headers(admin=False):
class TestNoExceptionTracebackHook(base.BaseApiTest):
TRACE = [u'Traceback (most recent call last):',
u' File "/opt/stack/ironic/ironic/openstack/common/rpc/amqp.py",'
u' File "/opt/stack/ironic/ironic/common/rpc/amqp.py",'
' line 434, in _process_data\\n **args)',
u' File "/opt/stack/ironic/ironic/openstack/common/rpc/'
u' File "/opt/stack/ironic/ironic/common/rpc/'
'dispatcher.py", line 172, in dispatch\\n result ='
' getattr(proxyobj, method)(ctxt, **kwargs)']
MSG_WITHOUT_TRACE = "Test exception message."