openstack/placement
Code Issues Proposed changes

Merge "Use oslo.messaging per-call monitoring"

Browse Source
This commit is contained in:
Zuul 2018-06-14 21:55:37 +00:00 committed by Gerrit Code Review
commit df9e8c8dd5
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -81,7 +81,7 @@ oslo.context==2.19.2
oslo.db==4.27.0 oslo.db==4.27.0
oslo.i18n==3.15.3 oslo.i18n==3.15.3
oslo.log==3.36.0 oslo.log==3.36.0
oslo.messaging==5.29.0 oslo.messaging==6.3.0
oslo.middleware==3.31.0 oslo.middleware==3.31.0
oslo.policy==1.35.0 oslo.policy==1.35.0
oslo.privsep==1.23.0 oslo.privsep==1.23.0

2
nova/conf/__init__.py
View File

@ -55,6 +55,7 @@ from nova.conf import powervm
from nova.conf import quota from nova.conf import quota
from nova.conf import rdp from nova.conf import rdp
from nova.conf import remote_debug from nova.conf import remote_debug
from nova.conf import rpc
from nova.conf import scheduler from nova.conf import scheduler
from nova.conf import serial_console from nova.conf import serial_console
from nova.conf import service from nova.conf import service
@ -107,6 +108,7 @@ placement.register_opts(CONF)
powervm.register_opts(CONF) powervm.register_opts(CONF)
quota.register_opts(CONF) quota.register_opts(CONF)
rdp.register_opts(CONF) rdp.register_opts(CONF)
rpc.register_opts(CONF)
scheduler.register_opts(CONF) scheduler.register_opts(CONF)
serial_console.register_opts(CONF) serial_console.register_opts(CONF)
service.register_opts(CONF) service.register_opts(CONF)

6
nova/tests/fixtures.py
View File

@ -484,13 +484,15 @@ class CellDatabases(fixtures.Fixture):
executor='eventlet', executor='eventlet',
serializer=serializer) serializer=serializer)
def _wrap_get_client(self, target, version_cap=None, serializer=None): def _wrap_get_client(self, target, version_cap=None, serializer=None,
call_monitor_timeout=None):
"""Mirror rpc.get_client() but with our special sauce.""" """Mirror rpc.get_client() but with our special sauce."""
serializer = CheatingSerializer(serializer) serializer = CheatingSerializer(serializer)
return messaging.RPCClient(rpc.TRANSPORT, return messaging.RPCClient(rpc.TRANSPORT,
target, target,
version_cap=version_cap, version_cap=version_cap,
serializer=serializer) serializer=serializer,
call_monitor_timeout=call_monitor_timeout)
def add_cell_database(self, connection_str, default=False): def add_cell_database(self, connection_str, default=False):
"""Add a cell database to the fixture. """Add a cell database to the fixture.

2
requirements.txt
View File

@ -43,7 +43,7 @@ oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0
oslo.db>=4.27.0 # Apache-2.0 oslo.db>=4.27.0 # Apache-2.0
oslo.rootwrap>=5.8.0 # Apache-2.0 oslo.rootwrap>=5.8.0 # Apache-2.0
oslo.messaging>=5.29.0 # Apache-2.0 oslo.messaging>=6.3.0 # Apache-2.0
oslo.policy>=1.35.0 # Apache-2.0 oslo.policy>=1.35.0 # Apache-2.0
oslo.privsep>=1.23.0 # Apache-2.0 oslo.privsep>=1.23.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0