diff options
| -rw-r--r-- | .zuul.yaml | 1 | ||||
| -rw-r--r-- | lower-constraints.txt | 1 | ||||
| -rw-r--r-- | oslo_messaging/_drivers/amqp1_driver/controller.py | 6 | ||||
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 22 | ||||
| -rw-r--r-- | oslo_messaging/rpc/server.py | 2 | ||||
| -rw-r--r-- | oslo_messaging/tests/test_exception_serialization.py | 20 | ||||
| -rw-r--r-- | releasenotes/notes/disable-mandatory-flag-a6210a534f3853f0.yaml | 5 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 2 | ||||
| -rw-r--r-- | tox.ini | 4 |
9 files changed, 35 insertions, 28 deletions
@@ -108,7 +108,6 @@ - check-requirements - lib-forward-testing-python3 - openstack-cover-jobs - - openstack-lower-constraints-jobs - openstack-python3-wallaby-jobs - periodic-stable-jobs - publish-openstack-docs-pti diff --git a/lower-constraints.txt b/lower-constraints.txt index 9e5d76b..7d47a54 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -66,7 +66,6 @@ requests==2.14.2 requestsexceptions==1.2.0 rfc3986==0.3.1 Routes==2.3.1 -six==1.10.0 smmap==0.9.0 snowballstemmer==1.2.1 statsd==3.2.1 diff --git a/oslo_messaging/_drivers/amqp1_driver/controller.py b/oslo_messaging/_drivers/amqp1_driver/controller.py index 6297507..5451cab 100644 --- a/oslo_messaging/_drivers/amqp1_driver/controller.py +++ b/oslo_messaging/_drivers/amqp1_driver/controller.py @@ -1022,9 +1022,9 @@ class Controller(pyngus.ConnectionEventHandler): def _do_connect(self): """Establish connection and reply subscription on processor thread.""" host = self.hosts.current - conn_props = {'properties': {u'process': self._command, - u'pid': self._pid, - u'node': self._node}} + conn_props = {'properties': {'process': self._command, + 'pid': self._pid, + 'node': self._node}} # only set hostname in the AMQP 1.0 Open performative if the message # bus can interpret it as the virtual host. We leave it unspecified # since apparently noone can agree on how it should be used otherwise! diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index f436cbe..0d7673e 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -169,12 +169,16 @@ rabbit_opts = [ default=2, help='How often times during the heartbeat_timeout_threshold ' 'we check the heartbeat.'), - cfg.IntOpt('direct_mandatory_flag', - default=True, - help='Enable/Disable the RabbitMQ mandatory flag ' - 'for direct send. The direct send is used as reply, ' - 'so the MessageUndeliverable exception is raised ' - 'in case the client queue does not exist.'), + cfg.BoolOpt('direct_mandatory_flag', + default=True, + deprecated_for_removal=True, + deprecated_reason='Mandatory flag no longer deactivable.', + help='(DEPRECATED) Enable/Disable the RabbitMQ mandatory ' + 'flag for direct send. The direct send is used as reply, ' + 'so the MessageUndeliverable exception is raised ' + 'in case the client queue does not exist.' + 'This flag is deprecated and it will not be possible to ' + 'deactivate this functionality anymore'), cfg.BoolOpt('enable_cancel_on_failover', default=False, help="Enable x-cancel-on-ha-failover flag so that " @@ -1261,11 +1265,11 @@ class Connection(object): _set_current_channel is responsible to cleanup the cache. """ - queue_indentifier = (exchange.name, routing_key) + queue_identifier = (exchange.name, routing_key) # NOTE(sileht): We only do it once per reconnection # the Connection._set_current_channel() is responsible to clear # this cache - if queue_indentifier not in self._declared_queues: + if queue_identifier not in self._declared_queues: queue = kombu.entity.Queue( channel=self.channel, exchange=exchange, @@ -1279,7 +1283,7 @@ class Connection(object): 'Connection._publish_and_creates_default_queue: ' 'declare queue %(key)s on %(exchange)s exchange', log_info) queue.declare() - self._declared_queues.add(queue_indentifier) + self._declared_queues.add(queue_identifier) self._publish(exchange, msg, routing_key=routing_key, timeout=timeout) diff --git a/oslo_messaging/rpc/server.py b/oslo_messaging/rpc/server.py index 03517c3..78557e2 100644 --- a/oslo_messaging/rpc/server.py +++ b/oslo_messaging/rpc/server.py @@ -168,7 +168,7 @@ class RPCServer(msg_server.MessageHandlingServer): # by another exception raised by a log handler during # LOG.debug(). So keep a copy and delete it later. failure = e.exc_info - LOG.debug(u'Expected exception during message handling (%s)', e) + LOG.debug('Expected exception during message handling (%s)', e) except rpc_dispatcher.NoSuchMethod as e: failure = sys.exc_info() if e.method.endswith('_ignore_errors'): diff --git a/oslo_messaging/tests/test_exception_serialization.py b/oslo_messaging/tests/test_exception_serialization.py index 93b63c5..f4ca495 100644 --- a/oslo_messaging/tests/test_exception_serialization.py +++ b/oslo_messaging/tests/test_exception_serialization.py @@ -198,9 +198,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: NovaStyleException test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: NovaStyleException test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'NovaStyleException', @@ -214,9 +214,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'Exception', @@ -230,9 +230,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: FarcicalError test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: FarcicalError test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'FarcicalError', @@ -246,9 +246,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={'foobar': 'blaa'}, str=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: Exception test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'Exception', @@ -262,9 +262,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase): args=[], kwargs={}, str=("Remote error: SystemExit test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), msg=("Remote error: SystemExit test\n" - "[%r]." % u'traceback\ntraceback\n'), + "[%r]." % 'traceback\ntraceback\n'), remote_name='RemoteError', remote_args=(), remote_kwargs={'exc_type': 'SystemExit', diff --git a/releasenotes/notes/disable-mandatory-flag-a6210a534f3853f0.yaml b/releasenotes/notes/disable-mandatory-flag-a6210a534f3853f0.yaml new file mode 100644 index 0000000..3c14aad --- /dev/null +++ b/releasenotes/notes/disable-mandatory-flag-a6210a534f3853f0.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Deprecating the ``direct_mandatory_flag``. It will not be possible to + deactivate this functionality anymore. diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index f847170..6d444a3 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -27,7 +27,7 @@ # -- Project information -------------------------------------------------- # General information about the project. -copyright = u'2016, oslo.messaging Developers' +copyright = '2016, oslo.messaging Developers' # Release notes do not need a version in the title, they span # multiple versions. @@ -1,6 +1,6 @@ [tox] minversion = 3.1 -envlist = py38,pep8 +envlist = py3,pep8 ignore_basepython_conflict = true [testenv] @@ -12,7 +12,7 @@ passenv = OS_* REQUIREMENTS_PIP_LOCATION install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = stestr run --slowest {posargs} |